npm - @dxos/client-services - Versions diffs - 0.5.9-main.b8d8fee → 0.5.9-main.bd9c8b3 - Mend

@dxos/client-services 0.5.9-main.b8d8fee → 0.5.9-main.bd9c8b3

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

Files changed (39) hide show

package/dist/lib/browser/{chunk-2EFXBSRZ.mjs → chunk-KI7FY3ZO.mjs} RENAMED Viewed

@@ -355,7 +355,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-main.b8d8fee";
+var DXOS_VERSION = "0.5.9-main.bd9c8b3";
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -1519,13 +1519,17 @@ IdentityManager = _ts_decorate3([
 ], IdentityManager);
 // packages/sdk/client-services/src/packlets/identity/identity-service.ts
+import { Trigger as Trigger3, sleep } from "@dxos/async";
 import { Stream as Stream8 } from "@dxos/codec-protobuf";
 import { Resource } from "@dxos/context";
 import { signPresentation } from "@dxos/credentials";
 import { todo } from "@dxos/debug";
 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 DEFAULT_SPACE_SEARCH_TIMEOUT = 1e4;
 var IdentityServiceImpl = class extends Resource {
   constructor(_identityManager, _keyring, _dataSpaceManagerProvider, _createIdentity, _onProfileUpdate) {
     super();
@@ -1555,7 +1559,7 @@ var IdentityServiceImpl = class extends Resource {
     const identity = this._identityManager.identity;
     invariant4(identity, void 0, {
       F: __dxlog_file7,
-      L: 54,
+      L: 59,
       S: this,
       A: [
         "identity",
@@ -1589,7 +1593,7 @@ var IdentityServiceImpl = class extends Resource {
   async updateProfile(profile) {
     invariant4(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file7,
-      L: 84,
+      L: 89,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1603,7 +1607,7 @@ var IdentityServiceImpl = class extends Resource {
   async signPresentation({ presentation, nonce }) {
     invariant4(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file7,
-      L: 91,
+      L: 96,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -1619,20 +1623,43 @@ var IdentityServiceImpl = class extends Resource {
     });
   }
   async _fixIdentityWithoutDefaultSpace(identity) {
-    let hasDefaultSpace = false;
+    let recodedDefaultSpace = false;
+    let foundDefaultSpace = false;
     const dataSpaceManager = this._dataSpaceManagerProvider();
-    for (const space of dataSpaceManager.spaces.values()) {
+    const recordedDefaultSpaceTrigger = new Trigger3();
+    const allProcessed = safeAwaitAll(dataSpaceManager.spaces.values(), async (space) => {
       if (space.state === SpaceState.CLOSED) {
         await space.open();
-        await space.initializeDataPipeline();
+        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === SpaceState.REQUIRES_MIGRATION);
+        await Promise.race([
+          space.initializeDataPipeline(),
+          requiresMigration
+        ]);
       }
       if (await dataSpaceManager.isDefaultSpace(space)) {
+        if (foundDefaultSpace) {
+          log6.warn("Multiple default spaces found. Using the first one.", {
+            duplicate: space.id
+          }, {
+            F: __dxlog_file7,
+            L: 127,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return;
+        }
+        foundDefaultSpace = true;
         await identity.updateDefaultSpace(space.id);
-        hasDefaultSpace = true;
-        break;
+        recodedDefaultSpace = true;
+        recordedDefaultSpaceTrigger.wake();
       }
-    }
-    if (!hasDefaultSpace) {
+    });
+    await Promise.race([
+      allProcessed,
+      recordedDefaultSpaceTrigger.wait(),
+      sleep(DEFAULT_SPACE_SEARCH_TIMEOUT)
+    ]);
+    if (!recodedDefaultSpace) {
       await this._createDefaultSpace(dataSpaceManager);
     }
   }
@@ -1756,7 +1783,7 @@ import { ContextDisposedError as ContextDisposedError2 } from "@dxos/context";
 import { createKeyPair, sign } from "@dxos/crypto";
 import { invariant as invariant9 } from "@dxos/invariant";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
+import { log as log10 } from "@dxos/log";
 import { createTeleportProtocolFactory } from "@dxos/network-manager";
 import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace5 } from "@dxos/protocols";
 import { Invitation as Invitation4 } from "@dxos/protocols/proto/dxos/client/services";
@@ -1765,10 +1792,10 @@ import { Options as Options4 } from "@dxos/protocols/proto/dxos/halo/invitations
 import { ComplexSet as ComplexSet3 } from "@dxos/util";
 // packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts
-import { Trigger as Trigger3 } from "@dxos/async";
+import { Trigger as Trigger4 } from "@dxos/async";
 import { cancelWithContext as cancelWithContext2, Context as Context4 } from "@dxos/context";
 import { invariant as invariant6 } from "@dxos/invariant";
-import { log as log6 } from "@dxos/log";
+import { log as log7 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError, schema as schema2 } from "@dxos/protocols";
 import { Options } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension } from "@dxos/teleport";
@@ -1808,7 +1835,7 @@ var InvitationGuestExtension = class extends RpcExtension {
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new Context4();
-    this._remoteOptionsTrigger = new Trigger3();
+    this._remoteOptionsTrigger = new Trigger4();
     this._invitationFlowLock = null;
   }
   hasFlowLock() {
@@ -1845,14 +1872,14 @@ var InvitationGuestExtension = class extends RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      log6("guest acquire lock", void 0, {
+      log7("guest acquire lock", void 0, {
         F: __dxlog_file9,
         L: 84,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      log6("guest lock acquired", void 0, {
+      log7("guest lock acquired", void 0, {
         F: __dxlog_file9,
         L: 86,
         S: this,
@@ -1861,7 +1888,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       await cancelWithContext2(this._ctx, this.rpc.InvitationHostService.options({
         role: Options.Role.GUEST
       }));
-      log6("options sent", void 0, {
+      log7("options sent", void 0, {
         F: __dxlog_file9,
         L: 88,
         S: this,
@@ -1870,7 +1897,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       await cancelWithContext2(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      log6("options received", void 0, {
+      log7("options received", void 0, {
         F: __dxlog_file9,
         L: 90,
         S: this,
@@ -1904,7 +1931,7 @@ var InvitationGuestExtension = class extends RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
-      log6("invitation flow lock released", void 0, {
+      log7("invitation flow lock released", void 0, {
         F: __dxlog_file9,
         L: 123,
         S: this,
@@ -1915,12 +1942,12 @@ var InvitationGuestExtension = class extends RpcExtension {
 };
 // packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts
-import { Trigger as Trigger4, scheduleTask as scheduleTask2 } from "@dxos/async";
+import { Trigger as Trigger5, scheduleTask as scheduleTask2 } from "@dxos/async";
 import { cancelWithContext as cancelWithContext3, Context as Context5 } from "@dxos/context";
 import { randomBytes, verify } from "@dxos/crypto";
 import { invariant as invariant7, InvariantViolation } from "@dxos/invariant";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
-import { log as log7 } from "@dxos/log";
+import { log as log8 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, schema as schema3, trace as trace4 } from "@dxos/protocols";
 import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse, Options as Options2 } from "@dxos/protocols/proto/dxos/halo/invitations";
@@ -1941,12 +1968,12 @@ var InvitationHostExtension = class extends RpcExtension2 {
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new Context5();
-    this._remoteOptionsTrigger = new Trigger4();
+    this._remoteOptionsTrigger = new Trigger5();
     this._challenge = void 0;
     this.guestProfile = void 0;
     this.authenticationPassed = false;
     this.authenticationRetry = 0;
-    this.completedTrigger = new Trigger4();
+    this.completedTrigger = new Trigger5();
     this._invitationFlowLock = null;
   }
   hasFlowLock() {
@@ -1973,7 +2000,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
         introduce: async (request) => {
           const { profile, invitationId } = request;
           const traceId = PublicKey5.random().toHex();
-          log7.trace("dxos.sdk.invitation-handler.host.introduce", trace4.begin({
+          log8.trace("dxos.sdk.invitation-handler.host.introduce", trace4.begin({
             id: traceId
           }), {
             F: __dxlog_file10,
@@ -1984,7 +2011,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           const invitation = this._requireActiveInvitation();
           this._assertInvitationState(Invitation3.State.CONNECTED);
           if (invitationId !== invitation?.invitationId) {
-            log7.warn("incorrect invitationId", {
+            log8.warn("incorrect invitationId", {
               expected: invitation.invitationId,
               actual: invitationId
             }, {
@@ -1999,7 +2026,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               authMethod: Invitation3.AuthMethod.NONE
             };
           }
-          log7("guest introduced themselves", {
+          log8("guest introduced themselves", {
             guestProfile: profile
           }, {
             F: __dxlog_file10,
@@ -2010,7 +2037,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           this.guestProfile = profile;
           this._callbacks.onStateUpdate(Invitation3.State.READY_FOR_AUTHENTICATION);
           this._challenge = invitation.authMethod === Invitation3.AuthMethod.KNOWN_PUBLIC_KEY ? randomBytes(32) : void 0;
-          log7.trace("dxos.sdk.invitation-handler.host.introduce", trace4.end({
+          log8.trace("dxos.sdk.invitation-handler.host.introduce", trace4.end({
             id: traceId
           }), {
             F: __dxlog_file10,
@@ -2025,7 +2052,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
         },
         authenticate: async ({ authCode: code, signedChallenge }) => {
           const traceId = PublicKey5.random().toHex();
-          log7.trace("dxos.sdk.invitation-handler.host.authenticate", trace4.begin({
+          log8.trace("dxos.sdk.invitation-handler.host.authenticate", trace4.begin({
             id: traceId
           }), {
             F: __dxlog_file10,
@@ -2034,7 +2061,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          log7("received authentication request", {
+          log8("received authentication request", {
             authCode: code
           }, {
             F: __dxlog_file10,
@@ -2050,7 +2077,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           this._callbacks.onStateUpdate(Invitation3.State.AUTHENTICATING);
           switch (invitation.authMethod) {
             case Invitation3.AuthMethod.NONE: {
-              log7("authentication not required", void 0, {
+              log8("authentication not required", void 0, {
                 F: __dxlog_file10,
                 L: 152,
                 S: this,
@@ -2086,7 +2113,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               break;
             }
             default: {
-              log7.error("invalid authentication method", {
+              log8.error("invalid authentication method", {
                 authMethod: invitation.authMethod
               }, {
                 F: __dxlog_file10,
@@ -2108,7 +2135,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               status
             };
           }
-          log7.trace("dxos.sdk.invitation-handler.host.authenticate", trace4.end({
+          log8.trace("dxos.sdk.invitation-handler.host.authenticate", trace4.end({
             id: traceId,
             data: {
               status
@@ -2125,7 +2152,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
         },
         admit: async (request) => {
           const traceId = PublicKey5.random().toHex();
-          log7.trace("dxos.sdk.invitation-handler.host.admit", trace4.begin({
+          log8.trace("dxos.sdk.invitation-handler.host.admit", trace4.begin({
             id: traceId
           }), {
             F: __dxlog_file10,
@@ -2142,7 +2169,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               }
             }
             const response = await this._callbacks.admit(request);
-            log7.trace("dxos.sdk.invitation-handler.host.admit", trace4.end({
+            log8.trace("dxos.sdk.invitation-handler.host.admit", trace4.end({
               id: traceId
             }), {
               F: __dxlog_file10,
@@ -2162,14 +2189,14 @@ var InvitationHostExtension = class extends RpcExtension2 {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      log7("host acquire lock", void 0, {
+      log8("host acquire lock", void 0, {
         F: __dxlog_file10,
         L: 237,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      log7("host lock acquired", void 0, {
+      log8("host lock acquired", void 0, {
         F: __dxlog_file10,
         L: 239,
         S: this,
@@ -2180,7 +2207,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
       await this.rpc.InvitationHostService.options({
         role: Options2.Role.HOST
       });
-      log7("options sent", void 0, {
+      log8("options sent", void 0, {
         F: __dxlog_file10,
         L: 243,
         S: this,
@@ -2189,7 +2216,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
       await cancelWithContext3(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT2
       }));
-      log7("options received", void 0, {
+      log8("options received", void 0, {
         F: __dxlog_file10,
         L: 245,
         S: this,
@@ -2243,7 +2270,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
-      log7("invitation flow lock released", void 0, {
+      log8("invitation flow lock released", void 0, {
         F: __dxlog_file10,
         L: 300,
         S: this,
@@ -2257,7 +2284,7 @@ var isAuthenticationRequired = (invitation) => invitation.authMethod !== Invitat
 // packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts
 import { invariant as invariant8 } from "@dxos/invariant";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
-import { log as log8 } from "@dxos/log";
+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";
@@ -2299,7 +2326,7 @@ var InvitationTopology = class {
     const firstUnknownPeer = candidates.find((peerId) => !this._seenPeers.has(peerId));
     this._seenPeers = new ComplexSet2(PublicKey6.hash, allPeers.filter((peerId) => this._seenPeers.has(peerId)));
     if (firstUnknownPeer != null) {
-      log8("invitation connect", {
+      log9("invitation connect", {
         ownPeerId,
         remotePeerId: firstUnknownPeer
       }, {
@@ -2384,7 +2411,7 @@ var InvitationsHandler = class {
           scheduleTask3(connectionCtx, async () => {
             const traceId = PublicKey7.random().toHex();
             try {
-              log9.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.begin({
+              log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.begin({
                 id: traceId
               }), {
                 F: __dxlog_file12,
@@ -2392,7 +2419,7 @@ var InvitationsHandler = class {
                 S: this,
                 C: (f, a) => f(...a)
               });
-              log9("connected", {
+              log10("connected", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
@@ -2403,7 +2430,7 @@ var InvitationsHandler = class {
               const deviceKey = await extension.completedTrigger.wait({
                 timeout: invitation.timeout
               });
-              log9("admitted guest", {
+              log10("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
@@ -2413,7 +2440,7 @@ var InvitationsHandler = class {
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, Invitation4.State.SUCCESS);
-              log9.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.end({
+              log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.end({
                 id: traceId
               }), {
                 F: __dxlog_file12,
@@ -2428,7 +2455,7 @@ var InvitationsHandler = class {
             } catch (err) {
               if (err instanceof TimeoutError) {
                 if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-                  log9("timeout", {
+                  log10("timeout", {
                     ...protocol.toJSON()
                   }, {
                     F: __dxlog_file12,
@@ -2439,7 +2466,7 @@ var InvitationsHandler = class {
                 }
               } else {
                 if (guardedState.error(extension, err)) {
-                  log9.error("failed", err, {
+                  log10.error("failed", err, {
                     F: __dxlog_file12,
                     L: 133,
                     S: this,
@@ -2447,7 +2474,7 @@ var InvitationsHandler = class {
                   });
                 }
               }
-              log9.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.error({
+              log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.error({
                 id: traceId,
                 error: err
               }), {
@@ -2462,7 +2489,7 @@ var InvitationsHandler = class {
         },
         onError: (err) => {
           if (err instanceof InvalidInvitationExtensionRoleError3) {
-            log9("invalid role", {
+            log10("invalid role", {
               ...err.context
             }, {
               F: __dxlog_file12,
@@ -2474,7 +2501,7 @@ var InvitationsHandler = class {
           }
           if (err instanceof TimeoutError) {
             if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-              log9("timeout", {
+              log10("timeout", {
                 err
               }, {
                 F: __dxlog_file12,
@@ -2485,7 +2512,7 @@ var InvitationsHandler = class {
             }
           } else {
             if (guardedState.error(extension, err)) {
-              log9.error("failed", err, {
+              log10.error("failed", err, {
                 F: __dxlog_file12,
                 L: 153,
                 S: this,
@@ -2499,7 +2526,7 @@ var InvitationsHandler = class {
     };
     if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
-        log9.warn("invitation has already expired", void 0, {
+        log10.warn("invitation has already expired", void 0, {
           F: __dxlog_file12,
           L: 164,
           S: this,
@@ -2536,7 +2563,7 @@ var InvitationsHandler = class {
     const guardedState = this._createGuardedState(ctx, invitation, stream);
     const shouldCancelInvitationFlow = (extension) => {
       const isLockedByAnotherConnection = guardedState.mutex.isLocked() && !extension.hasFlowLock();
-      log9("should cancel invitation flow", {
+      log10("should cancel invitation flow", {
         isLockedByAnotherConnection,
         invitationType: Invitation4.Type.DELEGATED,
         triedPeers: triedPeersIds.size
@@ -2564,7 +2591,7 @@ var InvitationsHandler = class {
             return;
           }
           connectionCtx.onDispose(async () => {
-            log9("extension disposed", {
+            log10("extension disposed", {
               admitted,
               currentState: guardedState.current.state
             }, {
@@ -2583,7 +2610,7 @@ var InvitationsHandler = class {
           scheduleTask3(connectionCtx, async () => {
             const traceId = PublicKey7.random().toHex();
             try {
-              log9.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.begin({
+              log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.begin({
                 id: traceId
               }), {
                 F: __dxlog_file12,
@@ -2595,7 +2622,7 @@ var InvitationsHandler = class {
                 guardedState.set(extension, Invitation4.State.TIMEOUT);
                 extensionCtx.close();
               }, timeout);
-              log9("connected", {
+              log10("connected", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
@@ -2604,7 +2631,7 @@ var InvitationsHandler = class {
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, Invitation4.State.CONNECTED);
-              log9("introduce", {
+              log10("introduce", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
@@ -2616,7 +2643,7 @@ var InvitationsHandler = class {
                 invitationId: invitation.invitationId,
                 ...protocol.createIntroduction()
               });
-              log9("introduce response", {
+              log10("introduce response", {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
@@ -2638,7 +2665,7 @@ var InvitationsHandler = class {
                     break;
                 }
               }
-              log9("request admission", {
+              log10("request admission", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
@@ -2650,7 +2677,7 @@ var InvitationsHandler = class {
               const admissionResponse = await extension.rpc.InvitationHostService.admit(admissionRequest);
               admitted = true;
               const result = await protocol.accept(admissionResponse, admissionRequest);
-              log9("admitted by host", {
+              log10("admitted by host", {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file12,
@@ -2663,7 +2690,7 @@ var InvitationsHandler = class {
                 ...result,
                 state: Invitation4.State.SUCCESS
               });
-              log9.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.end({
+              log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.end({
                 id: traceId
               }), {
                 F: __dxlog_file12,
@@ -2673,7 +2700,7 @@ var InvitationsHandler = class {
               });
             } catch (err) {
               if (err instanceof TimeoutError) {
-                log9("timeout", {
+                log10("timeout", {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file12,
@@ -2683,7 +2710,7 @@ var InvitationsHandler = class {
                 });
                 guardedState.set(extension, Invitation4.State.TIMEOUT);
               } else {
-                log9("auth failed", err, {
+                log10("auth failed", err, {
                   F: __dxlog_file12,
                   L: 314,
                   S: this,
@@ -2692,7 +2719,7 @@ var InvitationsHandler = class {
                 guardedState.error(extension, err);
               }
               extensionCtx.close(err);
-              log9.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.error({
+              log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.error({
                 id: traceId,
                 error: err
               }), {
@@ -2709,7 +2736,7 @@ var InvitationsHandler = class {
             return;
           }
           if (err instanceof TimeoutError) {
-            log9("timeout", {
+            log10("timeout", {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file12,
@@ -2719,7 +2746,7 @@ var InvitationsHandler = class {
             });
             guardedState.set(extension, Invitation4.State.TIMEOUT);
           } else {
-            log9("auth failed", err, {
+            log10("auth failed", err, {
               F: __dxlog_file12,
               L: 330,
               S: this,
@@ -2832,7 +2859,7 @@ var InvitationsHandler = class {
     };
   }
   _logStateUpdate(invitation, actor, newState) {
-    log9("invitation state update", {
+    log10("invitation state update", {
       actor: actor?.constructor.name,
       newState: stateToString(newState),
       oldState: stateToString(invitation.state)
@@ -2854,7 +2881,7 @@ var InvitationsHandler = class {
   }
   async _handleGuestOtpAuth(extension, setState, authenticated, options) {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
-      log9("guest waiting for authentication code...", void 0, {
+      log10("guest waiting for authentication code...", void 0, {
         F: __dxlog_file12,
         L: 462,
         S: this,
@@ -2862,7 +2889,7 @@ var InvitationsHandler = class {
       });
       setState(Invitation4.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
-      log9("sending authentication request", void 0, {
+      log10("sending authentication request", void 0, {
         F: __dxlog_file12,
         L: 466,
         S: this,
@@ -2879,7 +2906,7 @@ var InvitationsHandler = class {
         if (attempt === MAX_OTP_ATTEMPTS) {
           throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
         } else {
-          log9("retrying invalid code", {
+          log10("retrying invalid code", {
             attempt
           }, {
             F: __dxlog_file12,
@@ -2899,7 +2926,7 @@ var InvitationsHandler = class {
     if (introductionResponse.challenge == null) {
       throw new Error("challenge missing in the introduction");
     }
-    log9("sending authentication request", void 0, {
+    log10("sending authentication request", void 0, {
       F: __dxlog_file12,
       L: 496,
       S: this,
@@ -3024,7 +3051,7 @@ var InvitationsServiceImpl = class {
 import { createAdmissionCredentials, 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 log10 } from "@dxos/log";
+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";
@@ -3094,7 +3121,7 @@ var SpaceInvitationProtocol = class {
     if (space.inner.spaceState.getMemberRole(identityKey) !== SpaceMember2.Role.REMOVED) {
       throw new AlreadyJoinedError2();
     }
-    log10("writing guest credentials", {
+    log11("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: deviceKey
     }, {
@@ -3162,7 +3189,7 @@ var SpaceInvitationProtocol = class {
         ]
       });
     }
-    log10("writing delegate space invitation", {
+    log11("writing delegate space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
@@ -3223,7 +3250,7 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    log10("cancelling delegated space invitation", {
+    log11("cancelling delegated space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
@@ -3318,14 +3345,14 @@ var SpaceInvitationProtocol = class {
 };
 // packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts
-import { Event as Event3, PushStream, TimeoutError as TimeoutError2, Trigger as Trigger5 } from "@dxos/async";
+import { Event as Event3, PushStream, TimeoutError as TimeoutError2, Trigger as Trigger6 } from "@dxos/async";
 import { AuthenticatingInvitation, AUTHENTICATION_CODE_LENGTH, CancellableInvitation, INVITATION_TIMEOUT as INVITATION_TIMEOUT2 } from "@dxos/client-protocol";
 import { Context as Context6 } from "@dxos/context";
 import { generatePasscode } from "@dxos/credentials";
 import { hasInvitationExpired } from "@dxos/echo-pipeline";
 import { invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
-import { log as log11 } from "@dxos/log";
+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";
@@ -3370,7 +3397,7 @@ var InvitationsManager = class {
     try {
       await this._persistIfRequired(handler, stream, invitation);
     } catch (err) {
-      log11.catch(err, void 0, {
+      log12.catch(err, void 0, {
         F: __dxlog_file14,
         L: 82,
         S: this,
@@ -3412,7 +3439,7 @@ var InvitationsManager = class {
         invitations: cInvitations.map((invitation) => invitation.get())
       };
     } catch (err) {
-      log11.catch(err, void 0, {
+      log12.catch(err, void 0, {
         F: __dxlog_file14,
         L: 110,
         S: this,
@@ -3444,7 +3471,7 @@ var InvitationsManager = class {
     return invitation;
   }
   async authenticate({ invitationId, authCode }) {
-    log11("authenticating...", void 0, {
+    log12("authenticating...", void 0, {
       F: __dxlog_file14,
       L: 140,
       S: this,
@@ -3461,7 +3488,7 @@ var InvitationsManager = class {
     });
     const observable = this._acceptInvitations.get(invitationId);
     if (!observable) {
-      log11.warn("invalid invitation", {
+      log12.warn("invalid invitation", {
         invitationId
       }, {
         F: __dxlog_file14,
@@ -3474,7 +3501,7 @@ var InvitationsManager = class {
     }
   }
   async cancelInvitation({ invitationId }) {
-    log11("cancelInvitation...", {
+    log12("cancelInvitation...", {
       invitationId
     }, {
       F: __dxlog_file14,
@@ -3559,7 +3586,7 @@ var InvitationsManager = class {
       }
     });
     ctx.onDispose(() => {
-      log11("complete", {
+      log12("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file14,
@@ -3587,12 +3614,12 @@ var InvitationsManager = class {
     };
   }
   _createObservableAcceptingInvitation(handler, initialState) {
-    const otpEnteredTrigger = new Trigger5();
+    const otpEnteredTrigger = new Trigger6();
     const stream = new PushStream();
     const ctx = new Context6({
       onError: (err) => {
         if (err instanceof TimeoutError2) {
-          log11("timeout", {
+          log12("timeout", {
             ...handler.toJSON()
           }, {
             F: __dxlog_file14,
@@ -3605,7 +3632,7 @@ var InvitationsManager = class {
             state: Invitation6.State.TIMEOUT
           });
         } else {
-          log11.warn("auth failed", err, {
+          log12.warn("auth failed", err, {
             F: __dxlog_file14,
             L: 264,
             S: this,
@@ -3620,7 +3647,7 @@ var InvitationsManager = class {
       }
     });
     ctx.onDispose(() => {
-      log11("complete", {
+      log12("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file14,
@@ -3667,7 +3694,7 @@ var InvitationsManager = class {
     try {
       await this._metadataStore.removeInvitation(invitation.invitationId);
     } catch (err) {
-      log11.catch(err, void 0, {
+      log12.catch(err, void 0, {
         F: __dxlog_file14,
         L: 307,
         S: this,
@@ -3683,33 +3710,40 @@ var InvitationsManager = class {
 };
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { Event as Event6, asyncTimeout as asyncTimeout2, scheduleTask as scheduleTask5, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
+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 cancelWithContext4 } from "@dxos/context";
+import { Context as Context8, ContextDisposedError as ContextDisposedError3, cancelWithContext as cancelWithContext5 } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
-import { AutomergeDocumentLoaderImpl, createIdFromSpaceKey, createMappedFeedWriter } from "@dxos/echo-pipeline";
-import { TYPE_PROPERTIES } from "@dxos/echo-schema";
-import { failedInvariant, invariant as invariant13 } from "@dxos/invariant";
+import { createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { SpaceDocVersion } from "@dxos/echo-protocol";
+import { failedInvariant } from "@dxos/invariant";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
-import { log as log13 } from "@dxos/log";
+import { log as log15 } from "@dxos/log";
 import { CancelledError, SystemError } from "@dxos/protocols";
-import { CreateEpochRequest, SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
+import { SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
 import { AdmittedFeed as AdmittedFeed3, SpaceMember as SpaceMember4 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 import { trace as trace6 } from "@dxos/tracing";
-import { ComplexSet as ComplexSet5, assignDeep } from "@dxos/util";
+import { ComplexSet as ComplexSet5 } from "@dxos/util";
 // packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
 import { Event as Event4 } from "@dxos/async";
+import { Resource as Resource2 } from "@dxos/context";
 import { checkCredentialType } from "@dxos/credentials";
-var AutomergeSpaceState = class {
+var AutomergeSpaceState = class extends Resource2 {
   constructor(_onNewRoot) {
+    super();
     this._onNewRoot = _onNewRoot;
     this.rootUrl = void 0;
     this.lastEpoch = void 0;
     this.onNewEpoch = new Event4();
     this._isProcessingRootDocs = false;
   }
+  async _open(ctx) {
+  }
+  async _close(ctx) {
+    this._isProcessingRootDocs = false;
+  }
   async processCredential(credential) {
     if (!checkCredentialType(credential, "dxos.halo.credentials.Epoch")) {
       return;
@@ -3737,16 +3771,162 @@ var AutomergeSpaceState = class {
   }
 };
+// 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 { 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 runEpochMigration = async (ctx, context) => {
+  switch (context.migration) {
+    case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+      const document = context.repo.create();
+      await context.repo.flush();
+      return {
+        newRoot: document.url
+      };
+    }
+    case CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY: {
+      if (!context.currentRoot) {
+        throw new Error("Space does not have an automerge root");
+      }
+      const rootHandle = context.repo.find(context.currentRoot);
+      await cancelWithContext4(ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
+      const newRoot = context.repo.create(rootHandle.docSync());
+      await context.repo.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
+      log13.info("Fragmenting", void 0, {
+        F: __dxlog_file15,
+        L: 63,
+        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 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,
+        S: void 0,
+        A: [
+          "properties",
+          "'Properties not found'"
+        ]
+      });
+      const newSpaceDoc = {
+        ...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,
+        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);
+        });
+      });
+      await context.repo.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));
+      invariant12(rootHandle.docSync(), "Root doc not found", {
+        F: __dxlog_file15,
+        L: 100,
+        S: void 0,
+        A: [
+          "rootHandle.docSync()",
+          "'Root doc not found'"
+        ]
+      });
+      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,
+        A: [
+          "context.newAutomergeRoot",
+          ""
+        ]
+      });
+      await context.repo.flush();
+      return {
+        newRoot: context.newAutomergeRoot
+      };
+    }
+  }
+  return {};
+};
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-import { DeferredTask, Event as Event5, scheduleTask as scheduleTask4, sleep, TimeoutError as TimeoutError3, Trigger as Trigger6 } from "@dxos/async";
+import { DeferredTask, Event as Event5, scheduleTask as scheduleTask4, sleep as sleep2, TimeoutError as TimeoutError3, Trigger as Trigger7 } from "@dxos/async";
 import { Context as Context7, rejectOnDispose } from "@dxos/context";
-import { invariant as invariant12 } from "@dxos/invariant";
+import { invariant as invariant13 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
-import { log as log12 } from "@dxos/log";
+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_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
 var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
@@ -3771,16 +3951,16 @@ var NotarizationPlugin = class {
   * Request credentials to be notarized.
   */
   async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
-    log12("notarize", {
+    log14("notarize", {
       credentials
     }, {
-      F: __dxlog_file15,
+      F: __dxlog_file16,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant12(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file15,
+    invariant13(credentials.every((credential) => credential.id), "Credentials must have an id", {
+      F: __dxlog_file16,
       L: 91,
       S: this,
       A: [
@@ -3788,13 +3968,13 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new Trigger6();
+    const errors = new Trigger7();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        log12.warn("Notarization error", {
+        log14.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -3806,11 +3986,11 @@ var NotarizationPlugin = class {
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
       scheduleTask4(ctx, () => {
-        log12.warn("Notarization timeout", {
+        log14.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 111,
           S: this,
           C: (f, a) => f(...a)
@@ -3830,10 +4010,10 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          log12.info("Exhausted all peers to notarize with", {
+          log14.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file15,
+            F: __dxlog_file16,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
@@ -3843,11 +4023,11 @@ var NotarizationPlugin = class {
           return;
         }
         peersTried.add(peer);
-        log12("try notarizing", {
+        log14("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -3855,17 +4035,17 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        log12("success", void 0, {
-          F: __dxlog_file15,
+        log14("success", void 0, {
+          F: __dxlog_file16,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
-        await sleep(successDelay);
+        await sleep2(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          log12.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file15,
+          log14.info("error notarizing (recoverable)", err, {
+            F: __dxlog_file16,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -3882,8 +4062,8 @@ var NotarizationPlugin = class {
         allNotarized,
         errors.wait()
       ]);
-      log12("done", void 0, {
-        F: __dxlog_file15,
+      log14("done", void 0, {
+        F: __dxlog_file16,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -3904,8 +4084,8 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    invariant12(!this._writer, "Writer already set.", {
-      F: __dxlog_file15,
+    invariant13(!this._writer, "Writer already set.", {
+      F: __dxlog_file16,
       L: 181,
       S: this,
       A: [
@@ -3919,7 +4099,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger6()).value.wait();
+    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger7()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -3929,8 +4109,8 @@ var NotarizationPlugin = class {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
     for (const credential of request.credentials ?? []) {
-      invariant12(credential.id, "Credential must have an id", {
-        F: __dxlog_file15,
+      invariant13(credential.id, "Credential must have an id", {
+        F: __dxlog_file16,
         L: 200,
         S: this,
         A: [
@@ -3947,10 +4127,10 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        log12("extension opened", {
+        log14("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -3959,10 +4139,10 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        log12("extension closed", {
+        log14("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file16,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -4016,7 +4196,70 @@ function _ts_decorate4(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+function _using_ctx() {
+  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
+    var err = new Error();
+    err.name = "SuppressedError";
+    err.suppressed = suppressed;
+    err.error = error;
+    return err;
+  }, empty = {}, stack = [];
+  function using(isAwait, value) {
+    if (value != null) {
+      if (Object(value) !== value) {
+        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
+      }
+      if (isAwait) {
+        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
+      }
+      if (dispose == null) {
+        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
+      }
+      if (typeof dispose !== "function") {
+        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
+      }
+      stack.push({
+        v: value,
+        d: dispose,
+        a: isAwait
+      });
+    } else if (isAwait) {
+      stack.push({
+        d: value,
+        a: isAwait
+      });
+    }
+    return value;
+  }
+  return {
+    e: empty,
+    u: using.bind(null, false),
+    a: using.bind(null, true),
+    d: function() {
+      var error = this.e;
+      function next() {
+        while (resource = stack.pop()) {
+          try {
+            var resource, disposalResult = resource.d && resource.d.call(resource.v);
+            if (resource.a) {
+              return Promise.resolve(disposalResult).then(next, err);
+            }
+          } catch (e) {
+            return err(e);
+          }
+        }
+        if (error !== empty)
+          throw error;
+      }
+      function err(e) {
+        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
+        return next();
+      }
+      return next();
+    }
+  };
+}
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
     this._ctx = new Context8();
@@ -4024,7 +4267,9 @@ var DataSpace = class {
     this._cache = void 0;
     // TODO(dmaretskyi): Move into Space?
     this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
+    this._epochProcessingMutex = new Mutex2();
     this._state = SpaceState2.CLOSED;
+    this._databaseRoot = null;
     /**
     * Error for _state === SpaceState.ERROR.
     */
@@ -4048,11 +4293,11 @@ var DataSpace = class {
     });
     this._cache = params.cache;
     this._state = params.initialState;
-    log13("new state", {
+    log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file16,
-      L: 143,
+      F: __dxlog_file17,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4085,6 +4330,9 @@ var DataSpace = class {
   get automergeSpaceState() {
     return this._automergeSpaceState;
   }
+  get databaseRoot() {
+    return this._databaseRoot;
+  }
   get _automergeInfo() {
     return {
       rootUrl: this._automergeSpaceState.rootUrl,
@@ -4101,14 +4349,15 @@ var DataSpace = class {
     await this._gossip.open();
     await this._notarizationPlugin.open();
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
+    await this._automergeSpaceState.open();
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new Context8());
     this._state = SpaceState2.CONTROL_ONLY;
-    log13("new state", {
+    log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file16,
-      L: 209,
+      F: __dxlog_file17,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4122,11 +4371,11 @@ var DataSpace = class {
   async _close() {
     await this._callbacks.beforeClose?.();
     this._state = SpaceState2.CLOSED;
-    log13("new state", {
+    log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file16,
-      L: 223,
+      F: __dxlog_file17,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4135,6 +4384,7 @@ var DataSpace = class {
     await this.authVerifier.close();
     await this._inner.close();
     await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
+    await this._automergeSpaceState.close();
     await this._inner.spaceState.removeCredentialProcessor(this._notarizationPlugin);
     await this._notarizationPlugin.close();
     await this._presence.close();
@@ -4156,26 +4406,26 @@ var DataSpace = class {
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof CancelledError || err instanceof ContextDisposedError3) {
-          log13("data pipeline initialization cancelled", err, {
-            F: __dxlog_file16,
-            L: 256,
+          log15("data pipeline initialization cancelled", err, {
+            F: __dxlog_file17,
+            L: 265,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
-        log13.error("Error initializing data pipeline", err, {
-          F: __dxlog_file16,
-          L: 260,
+        log15.error("Error initializing data pipeline", err, {
+          F: __dxlog_file17,
+          L: 269,
           S: this,
           C: (f, a) => f(...a)
         });
         this._state = SpaceState2.ERROR;
-        log13("new state", {
+        log15("new state", {
           state: SpaceState2[this._state]
         }, {
-          F: __dxlog_file16,
-          L: 262,
+          F: __dxlog_file17,
+          L: 271,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4191,31 +4441,28 @@ var DataSpace = class {
       throw new SystemError("Invalid operation");
     }
     this._state = SpaceState2.INITIALIZING;
-    log13("new state", {
+    log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file16,
-      L: 278,
+      F: __dxlog_file17,
+      L: 287,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
-    await sleep2(1);
+    await sleep3(1);
+    const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState2.READY);
     this._automergeSpaceState.startProcessingRootDocs();
-    await cancelWithContext4(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
-    log13("data pipeline ready", void 0, {
-      F: __dxlog_file16,
-      L: 290,
-      S: this,
-      C: (f, a) => f(...a)
-    });
+    await ready;
+  }
+  async _enterReadyState() {
     await this._callbacks.beforeReady?.();
     this._state = SpaceState2.READY;
-    log13("new state", {
+    log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file16,
-      L: 294,
+      F: __dxlog_file17,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4229,9 +4476,9 @@ var DataSpace = class {
     });
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
-    log13("writable feeds created", void 0, {
-      F: __dxlog_file16,
-      L: 310,
+    log15("writable feeds created", void 0, {
+      F: __dxlog_file17,
+      L: 322,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4289,57 +4536,66 @@ var DataSpace = class {
     }
   }
   _onNewAutomergeRoot(rootUrl) {
-    log13("loading automerge root doc for space", {
+    log15("loading automerge root doc for space", {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file16,
-      L: 376,
+      F: __dxlog_file17,
+      L: 388,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._echoHost.replicateDocument(rootUrl);
     const handle = this._echoHost.automergeRepo.find(rootUrl);
     queueMicrotask(async () => {
       try {
-        await warnAfterTimeout(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
-          await cancelWithContext4(this._ctx, handle.whenReady());
-        });
-        if (this._ctx.disposed) {
-          return;
-        }
-        const doc = handle.docSync() ?? failedInvariant();
-        if (!doc.access?.spaceKey) {
-          handle.change((doc2) => {
-            doc2.access = {
-              spaceKey: this.key.toHex()
-            };
-          });
-        }
-        if (!this._echoHost.roots.has(handle.documentId)) {
-          await this._echoHost.openSpaceRoot(handle.url);
-        } else {
-          log13.warn("echo database root already exists", {
-            space: this.key,
-            rootUrl
-          }, {
-            F: __dxlog_file16,
-            L: 403,
-            S: this,
-            C: (f, a) => f(...a)
+        try {
+          var _usingCtx = _using_ctx();
+          await warnAfterTimeout(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
+            await cancelWithContext5(this._ctx, handle.whenReady());
           });
+          if (this._ctx.disposed) {
+            return;
+          }
+          const _guard = (
+            // Ensure only one root is processed at a time.
+            _usingCtx.u(await this._epochProcessingMutex.acquire())
+          );
+          const doc = handle.docSync() ?? failedInvariant();
+          if (!doc.access?.spaceKey) {
+            handle.change((doc2) => {
+              doc2.access = {
+                spaceKey: this.key.toHex()
+              };
+            });
+          }
+          const root = await this._echoHost.openSpaceRoot(handle.url);
+          this._databaseRoot = root;
+          if (root.getVersion() !== SpaceDocVersion.CURRENT) {
+            if (this._state !== SpaceState2.REQUIRES_MIGRATION) {
+              this._state = SpaceState2.REQUIRES_MIGRATION;
+              this.stateUpdate.emit();
+            }
+          } else {
+            if (this._state !== SpaceState2.READY) {
+              await this._enterReadyState();
+            }
+          }
+        } catch (_) {
+          _usingCtx.e = _;
+        } finally {
+          _usingCtx.d();
         }
       } catch (err) {
         if (err instanceof ContextDisposedError3) {
           return;
         }
-        log13.warn("error loading automerge root doc", {
+        log15.warn("error loading automerge root doc", {
           space: this.key,
           rootUrl,
           err
         }, {
-          F: __dxlog_file16,
-          L: 409,
+          F: __dxlog_file17,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4362,148 +4618,34 @@ var DataSpace = class {
     });
   }
   async createEpoch(options) {
-    let epoch;
-    switch (options?.migration) {
-      case void 0:
-      case CreateEpochRequest.Migration.NONE:
-        {
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe3(),
-            automergeRoot: this._automergeSpaceState.lastEpoch?.subject.assertion?.automergeRoot
-          };
-        }
-        break;
-      case CreateEpochRequest.Migration.INIT_AUTOMERGE:
-        {
-          const document = this._echoHost.automergeRepo.create();
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe3(),
-            automergeRoot: document.url
-          };
-        }
-        break;
-      case CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY:
-        {
-          const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
-          await cancelWithContext4(this._ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
-          const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
-          await this._echoHost.automergeRepo.flush([
-            newRoot.documentId
-          ]);
-          invariant13(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file16,
-            L: 460,
-            S: this,
-            A: [
-              "typeof newRoot.url === 'string' && newRoot.url.length > 0",
-              ""
-            ]
-          });
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe3(),
-            automergeRoot: newRoot.url
-          };
-        }
-        break;
-      case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT:
-        {
-          log13.info("Fragmenting", void 0, {
-            F: __dxlog_file16,
-            L: 472,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          const currentRootUrl = this._automergeSpaceState.rootUrl;
-          const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
-          await cancelWithContext4(this._ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
-          const objects = Object.entries(rootHandle.docSync().objects);
-          const properties = findPropertiesObject(rootHandle.docSync());
-          const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
-          invariant13(properties, "Properties not found", {
-            F: __dxlog_file16,
-            L: 482,
-            S: this,
-            A: [
-              "properties",
-              "'Properties not found'"
-            ]
-          });
-          const newSpaceDoc = {
-            ...rootHandle.docSync(),
-            objects: Object.fromEntries([
-              properties
-            ])
-          };
-          const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
-          invariant13(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file16,
-            L: 487,
-            S: this,
-            A: [
-              "typeof newRoot.url === 'string' && newRoot.url.length > 0",
-              ""
-            ]
-          });
-          const docLoader = new AutomergeDocumentLoaderImpl(await createIdFromSpaceKey(this.key), this._echoHost.automergeRepo, this.key);
-          await docLoader.loadSpaceRootDocHandle(this._ctx, {
-            rootUrl: newRoot.url
-          });
-          otherObjects.forEach(([key, value]) => {
-            const handle = docLoader.createDocumentForObject(key);
-            handle.change((doc) => {
-              assignDeep(doc, [
-                "objects",
-                key
-              ], value);
-            });
-          });
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe3(),
-            automergeRoot: newRoot.url
-          };
-        }
-        break;
-      case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT:
-        {
-          invariant13(options.newAutomergeRoot, void 0, {
-            F: __dxlog_file16,
-            L: 517,
-            S: this,
-            A: [
-              "options.newAutomergeRoot",
-              ""
-            ]
-          });
-          epoch = {
-            previousId: this._automergeSpaceState.lastEpoch?.id,
-            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
-            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe3(),
-            automergeRoot: options.newAutomergeRoot
-          };
-        }
-        break;
-    }
-    if (!epoch) {
-      return;
+    const ctx = this._ctx.derive();
+    if (!options?.migration) {
+      return null;
     }
+    const { newRoot } = await runEpochMigration(ctx, {
+      repo: this._echoHost.automergeRepo,
+      spaceId: this.id,
+      spaceKey: this.key,
+      migration: options.migration,
+      currentRoot: this._automergeSpaceState.rootUrl ?? null,
+      newAutomergeRoot: options.newAutomergeRoot
+    });
+    const epoch = {
+      previousId: this._automergeSpaceState.lastEpoch?.id,
+      number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+      timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe3(),
+      automergeRoot: newRoot ?? this._automergeSpaceState.rootUrl
+    };
+    const credential = await this._signingContext.credentialSigner.createCredential({
+      subject: this.key,
+      assertion: {
+        "@type": "dxos.halo.credentials.Epoch",
+        ...epoch
+      }
+    });
     const receipt = await this.inner.controlPipeline.writer.write({
       credential: {
-        credential: await this._signingContext.credentialSigner.createCredential({
-          subject: this.key,
-          assertion: {
-            "@type": "dxos.halo.credentials.Epoch",
-            ...epoch
-          }
-        })
+        credential
       }
     });
     await this.inner.controlPipeline.state.waitUntilTimeframe(new Timeframe3([
@@ -4513,6 +4655,7 @@ var DataSpace = class {
       ]
     ]));
     await this._echoHost.updateIndexes();
+    return credential;
   }
   async activate() {
     if (![
@@ -4534,11 +4677,11 @@ var DataSpace = class {
       await this._close();
     }
     this._state = SpaceState2.INACTIVE;
-    log13("new state", {
+    log15("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file16,
-      L: 571,
+      F: __dxlog_file17,
+      L: 512,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4593,36 +4736,25 @@ DataSpace = _ts_decorate4([
   trackLeaks("open", "close"),
   trace6.resource()
 ], DataSpace);
-var findPropertiesObject = (spaceDoc) => {
-  for (const id in spaceDoc.objects ?? {}) {
-    const obj = spaceDoc.objects[id];
-    if (obj.system.type?.itemId === TYPE_PROPERTIES) {
-      return [
-        id,
-        obj
-      ];
-    }
-  }
-  return void 0;
-};
 // 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 { cancelWithContext as cancelWithContext5, Context as Context9 } from "@dxos/context";
+import { Context as Context9, cancelWithContext as cancelWithContext6 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
+import { convertLegacyReferences as convertLegacyReferences2, findInlineObjectOfType as findInlineObjectOfType2 } from "@dxos/echo-db";
 import { AuthStatus } from "@dxos/echo-pipeline";
-import { encodeReference } from "@dxos/echo-protocol";
-import { getTypeReference } from "@dxos/echo-schema";
+import { LEGACY_TYPE_PROPERTIES, SpaceDocVersion as SpaceDocVersion2, encodeReference } from "@dxos/echo-protocol";
+import { TYPE_PROPERTIES as TYPE_PROPERTIES2, generateEchoId, getTypeReference } from "@dxos/echo-schema";
 import { invariant as invariant14 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
-import { log as log14 } from "@dxos/log";
+import { log as log16 } from "@dxos/log";
 import { trace as Trace2 } 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 { assignDeep as assignDeep2, ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
+import { ComplexMap as ComplexMap3, assignDeep as assignDeep2, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
 import { createCredential } from "@dxos/credentials";
@@ -4705,7 +4837,7 @@ function _ts_decorate5(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
+var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DEFAULT_SPACE_KEY = "__DEFAULT__";
@@ -4732,7 +4864,7 @@ var DataSpaceManager = class {
           const rootUrl = space.automergeSpaceState.rootUrl;
           const rootHandle = rootUrl ? this._echoHost.automergeRepo.find(rootUrl) : void 0;
           const rootDoc = rootHandle?.docSync();
-          const properties = rootDoc && findPropertiesObject(rootDoc);
+          const properties = rootDoc && findInlineObjectOfType2(rootDoc, TYPE_PROPERTIES2);
           return {
             key: space.key.toHex(),
             state: SpaceState3[space.state],
@@ -4752,46 +4884,46 @@ var DataSpaceManager = class {
     return this._spaces;
   }
   async open() {
-    log14("open", void 0, {
-      F: __dxlog_file17,
-      L: 140,
+    log16("open", void 0, {
+      F: __dxlog_file18,
+      L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
-    log14.trace("dxos.echo.data-space-manager.open", Trace2.begin({
+    log16.trace("dxos.echo.data-space-manager.open", Trace2.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file17,
-      L: 141,
+      F: __dxlog_file18,
+      L: 147,
       S: this,
       C: (f, a) => f(...a)
     });
-    log14("metadata loaded", {
+    log16("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file17,
-      L: 142,
+      F: __dxlog_file18,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
     await forEachAsync(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
-        log14("load space", {
+        log16("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file17,
-          L: 146,
+          F: __dxlog_file18,
+          L: 152,
           S: this,
           C: (f, a) => f(...a)
         });
         await this._constructSpace(spaceMetadata);
       } catch (err) {
-        log14.error("Error loading space", {
+        log16.error("Error loading space", {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file17,
-          L: 149,
+          F: __dxlog_file18,
+          L: 155,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4799,19 +4931,19 @@ var DataSpaceManager = class {
     });
     this._isOpen = true;
     this.updated.emit();
-    log14.trace("dxos.echo.data-space-manager.open", Trace2.end({
+    log16.trace("dxos.echo.data-space-manager.open", Trace2.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file17,
-      L: 156,
+      F: __dxlog_file18,
+      L: 162,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    log14("close", void 0, {
-      F: __dxlog_file17,
-      L: 161,
+    log16("close", void 0, {
+      F: __dxlog_file18,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4827,8 +4959,8 @@ var DataSpaceManager = class {
   */
   async createSpace() {
     invariant14(this._isOpen, "Not open.", {
-      F: __dxlog_file17,
-      L: 175,
+      F: __dxlog_file18,
+      L: 181,
       S: this,
       A: [
         "this._isOpen",
@@ -4845,11 +4977,11 @@ var DataSpaceManager = class {
       dataFeedKey,
       state: SpaceState3.ACTIVE
     };
-    log14("creating space...", {
+    log16("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file17,
-      L: 187,
+      F: __dxlog_file18,
+      L: 193,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4860,8 +4992,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_file17,
-      L: 197,
+      F: __dxlog_file18,
+      L: 203,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -4874,9 +5006,31 @@ var DataSpaceManager = class {
     return space;
   }
   async isDefaultSpace(space) {
-    const rootDoc = await this._getSpaceRootDocument(space);
-    const [_, properties] = findPropertiesObject(rootDoc.docSync()) ?? [];
-    return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
+    if (!space.databaseRoot) {
+      return false;
+    }
+    switch (space.databaseRoot.getVersion()) {
+      case SpaceDocVersion2.CURRENT: {
+        const [_, properties] = findInlineObjectOfType2(space.databaseRoot.docSync(), TYPE_PROPERTIES2) ?? [];
+        return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
+      }
+      case SpaceDocVersion2.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();
+      }
+      default:
+        log16.warn("unknown space version", {
+          version: space.databaseRoot.getVersion(),
+          spaceId: space.id
+        }, {
+          F: __dxlog_file18,
+          L: 228,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return false;
+    }
   }
   async createDefaultSpace() {
     const space = await this.createSpace();
@@ -4892,7 +5046,7 @@ var DataSpaceManager = class {
         keys: []
       }
     };
-    const propertiesId = PublicKey11.random().toHex();
+    const propertiesId = generateEchoId();
     document.change((doc) => {
       assignDeep2(doc, [
         "objects",
@@ -4905,8 +5059,8 @@ var DataSpaceManager = class {
   async _getSpaceRootDocument(space) {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant14(automergeIndex, void 0, {
-      F: __dxlog_file17,
-      L: 240,
+      F: __dxlog_file18,
+      L: 261,
       S: this,
       A: [
         "automergeIndex",
@@ -4919,17 +5073,17 @@ var DataSpaceManager = class {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    log14("accept space", {
+    log16("accept space", {
       opts
     }, {
-      F: __dxlog_file17,
-      L: 249,
+      F: __dxlog_file18,
+      L: 270,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant14(this._isOpen, "Not open.", {
-      F: __dxlog_file17,
-      L: 250,
+      F: __dxlog_file18,
+      L: 271,
       S: this,
       A: [
         "this._isOpen",
@@ -4937,8 +5091,8 @@ var DataSpaceManager = class {
       ]
     });
     invariant14(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file17,
-      L: 251,
+      F: __dxlog_file18,
+      L: 272,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -4964,17 +5118,17 @@ var DataSpaceManager = class {
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await cancelWithContext5(this._ctx, this.updated.waitForCondition(() => {
+    await cancelWithContext6(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
       return !!space && space.state === SpaceState3.READY;
     }));
   }
   async _constructSpace(metadata) {
-    log14("construct space", {
+    log16("construct space", {
       metadata
     }, {
-      F: __dxlog_file17,
-      L: 285,
+      F: __dxlog_file18,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5010,9 +5164,9 @@ var DataSpaceManager = class {
         session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
       },
       onAuthFailure: () => {
-        log14.warn("auth failure", void 0, {
-          F: __dxlog_file17,
-          L: 322,
+        log16.warn("auth failure", void 0, {
+          F: __dxlog_file18,
+          L: 343,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5041,22 +5195,22 @@ var DataSpaceManager = class {
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
-          log14("before space ready", {
+          log16("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file17,
-            L: 349,
+            F: __dxlog_file18,
+            L: 370,
             S: this,
             C: (f, a) => f(...a)
           });
         },
         afterReady: async () => {
-          log14("after space ready", {
+          log16("after space ready", {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file17,
-            L: 352,
+            F: __dxlog_file18,
+            L: 373,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5071,11 +5225,11 @@ var DataSpaceManager = class {
           }
         },
         beforeClose: async () => {
-          log14("before space close", {
+          log16("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file17,
-            L: 360,
+            F: __dxlog_file18,
+            L: 381,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5106,17 +5260,17 @@ var DataSpaceManager = class {
         return (s && member.role === SpaceMember6.Role.REMOVED !== (s.authStatus === AuthStatus.FAILURE)) ?? false;
       });
       sessionsToClose.forEach((session) => {
-        void session.close().catch(log14.error);
+        void session.close().catch(log16.error);
       });
       closedSessions += sessionsToClose.length;
     }
-    log14("processed member role changes", {
+    log16("processed member role changes", {
       roleChangeCount: memberInfo.length,
       peersOnline: presence.getPeersOnline().length,
       closedSessions
     }, {
-      F: __dxlog_file17,
-      L: 396,
+      F: __dxlog_file18,
+      L: 417,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5127,15 +5281,15 @@ var DataSpaceManager = class {
     if (role === SpaceMember6.Role.REMOVED) {
       const session = peerState.peerId && space.protocol.sessions.get(peerState.peerId);
       if (session != null) {
-        log14("closing a session with a removed peer", {
+        log16("closing a session with a removed peer", {
           peerId: peerState.peerId
         }, {
-          F: __dxlog_file17,
-          L: 410,
+          F: __dxlog_file18,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
-        void session.close().catch(log14.error);
+        void session.close().catch(log16.error);
       }
     }
   }
@@ -5198,11 +5352,11 @@ import { createAdmissionCredentials as createAdmissionCredentials2, getCredentia
 import { raise as raise2 } from "@dxos/debug";
 import { writeMessages as writeMessages3 } from "@dxos/feed-store";
 import { invariant as invariant15 } from "@dxos/invariant";
-import { log as log15 } from "@dxos/log";
+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_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _getDataSpaceManager) {
     this._identityManager = _identityManager;
@@ -5246,8 +5400,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_file18,
-      L: 97,
+      F: __dxlog_file19,
+      L: 98,
       S: this,
       A: [
         "credentials[0].credential",
@@ -5256,8 +5410,8 @@ var SpacesServiceImpl = class {
     });
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant15(getCredentialAssertion4(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file18,
-      L: 99,
+      F: __dxlog_file19,
+      L: 100,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -5271,11 +5425,11 @@ var SpacesServiceImpl = class {
       const scheduler = new UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        log15("update", {
+        log17("update", {
           spaces
         }, {
-          F: __dxlog_file18,
-          L: 110,
+          F: __dxlog_file19,
+          L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5293,7 +5447,15 @@ var SpacesServiceImpl = class {
         const subscribeSpaces = () => {
           subscriptions.clear();
           for (const space of dataSpaceManager.spaces.values()) {
-            subscriptions.add(space.stateUpdate.on(ctx, () => scheduler.forceTrigger()));
+            let lastState;
+            subscriptions.add(space.stateUpdate.on(ctx, () => {
+              if (space.state !== lastState) {
+                scheduler.forceTrigger();
+              } else {
+                scheduler.trigger();
+              }
+              lastState = space.state;
+            }));
             subscriptions.add(space.presence.updated.on(ctx, () => scheduler.trigger()));
             subscriptions.add(space.automergeSpaceState.onNewEpoch.on(ctx, () => scheduler.trigger()));
             subscriptions.add(space.inner.controlPipeline.state.timeframeUpdate.on(ctx, () => scheduler.trigger()));
@@ -5358,8 +5520,8 @@ var SpacesServiceImpl = class {
         });
       } else {
         invariant15(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file18,
-          L: 198,
+          F: __dxlog_file19,
+          L: 209,
           S: this,
           A: [
             "!credential.id",
@@ -5367,8 +5529,8 @@ var SpacesServiceImpl = class {
           ]
         });
         invariant15(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file18,
-          L: 199,
+          F: __dxlog_file19,
+          L: 210,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -5377,8 +5539,8 @@ var SpacesServiceImpl = class {
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant15(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file18,
-          L: 201,
+          F: __dxlog_file19,
+          L: 212,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -5400,10 +5562,13 @@ var SpacesServiceImpl = class {
   async createEpoch({ spaceKey, migration, automergeRootUrl }) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise2(new SpaceNotFoundError2(spaceKey));
-    await space.createEpoch({
+    const credential = await space.createEpoch({
       migration,
       newAutomergeRoot: automergeRootUrl
     });
+    return {
+      epochCredential: credential ?? void 0
+    };
   }
   _serializeSpace(space) {
     return {
@@ -5466,8 +5631,8 @@ var SpacesServiceImpl = class {
 var getChannelId = (channel) => `user-channel/${channel}`;
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-import { Trigger as Trigger7 } from "@dxos/async";
-import { Context as Context10, Resource as Resource2 } from "@dxos/context";
+import { Trigger as Trigger8 } from "@dxos/async";
+import { Context as Context10, Resource as Resource3 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion5 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { EchoHost } from "@dxos/echo-db";
@@ -5476,7 +5641,7 @@ import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { invariant as invariant16 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
-import { log as log16 } from "@dxos/log";
+import { log as log18 } from "@dxos/log";
 import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace9 } from "@dxos/protocols";
 import { Invitation as Invitation8 } from "@dxos/protocols/proto/dxos/client/services";
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
@@ -5492,8 +5657,8 @@ function _ts_decorate6(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class extends Resource2 {
+var __dxlog_file20 = "/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();
     this.storage = storage;
@@ -5501,7 +5666,7 @@ var ServiceContext = class extends Resource2 {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
-    this.initialized = new Trigger7();
+    this.initialized = new Trigger8();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = PublicKey12.random().toHex();
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
@@ -5527,8 +5692,7 @@ var ServiceContext = class extends Resource2 {
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
     this.echoHost = new EchoHost({
-      kv: this.level,
-      storage: this.storage
+      kv: this.level
     });
     this.invitations = new InvitationsHandler(this.networkManager, _runtimeParams?.invitationConnectionDefaultParams);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
@@ -5536,17 +5700,17 @@ var ServiceContext = class extends Resource2 {
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    log16("opening...", void 0, {
-      F: __dxlog_file19,
-      L: 152,
+    log18("opening...", void 0, {
+      F: __dxlog_file20,
+      L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
-    log16.trace("dxos.sdk.service-context.open", trace9.begin({
+    log18.trace("dxos.sdk.service-context.open", trace9.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file19,
-      L: 153,
+      F: __dxlog_file20,
+      L: 150,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5560,33 +5724,33 @@ var ServiceContext = class extends Resource2 {
       await this._initialize(ctx);
     }
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
-    log16("loaded persistent invitations", {
+    log18("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file19,
-      L: 166,
+      F: __dxlog_file20,
+      L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
-    log16.trace("dxos.sdk.service-context.open", trace9.end({
+    log18.trace("dxos.sdk.service-context.open", trace9.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file19,
-      L: 168,
+      F: __dxlog_file20,
+      L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
-    log16("opened", void 0, {
-      F: __dxlog_file19,
-      L: 169,
+    log18("opened", void 0, {
+      F: __dxlog_file20,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    log16("closing...", void 0, {
-      F: __dxlog_file19,
-      L: 173,
+    log18("closing...", void 0, {
+      F: __dxlog_file20,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5601,9 +5765,9 @@ var ServiceContext = class extends Resource2 {
     await this.echoHost.close(ctx);
     await this.networkManager.close();
     await this.signalManager.close();
-    log16("closed", void 0, {
-      F: __dxlog_file19,
-      L: 185,
+    log18("closed", void 0, {
+      F: __dxlog_file20,
+      L: 182,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5616,8 +5780,8 @@ var ServiceContext = class extends Resource2 {
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant16(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file19,
-      L: 196,
+      F: __dxlog_file20,
+      L: 193,
       S: this,
       A: [
         "factory",
@@ -5647,9 +5811,9 @@ var ServiceContext = class extends Resource2 {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    log16("initializing spaces...", void 0, {
-      F: __dxlog_file19,
-      L: 227,
+    log18("initializing spaces...", void 0, {
+      F: __dxlog_file20,
+      L: 224,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5671,8 +5835,8 @@ var ServiceContext = class extends Resource2 {
     await this.dataSpaceManager.open();
     this._handlerFactories.set(Invitation8.Kind.SPACE, (invitation) => {
       invariant16(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file19,
-        L: 252,
+        F: __dxlog_file20,
+        L: 249,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -5692,33 +5856,33 @@ var ServiceContext = class extends Resource2 {
           return;
         }
         if (!this.dataSpaceManager) {
-          log16("dataSpaceManager not initialized yet, ignoring space admission", {
+          log18("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file19,
-            L: 268,
+            F: __dxlog_file20,
+            L: 265,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          log16("space already exists, ignoring space admission", {
+          log18("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file19,
-            L: 272,
+            F: __dxlog_file20,
+            L: 269,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         try {
-          log16("accepting space recorded in halo", {
+          log18("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file19,
-            L: 277,
+            F: __dxlog_file20,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5727,9 +5891,9 @@ var ServiceContext = class extends Resource2 {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          log16.catch(err, void 0, {
-            F: __dxlog_file19,
-            L: 283,
+          log18.catch(err, void 0, {
+            F: __dxlog_file20,
+            L: 280,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5775,9 +5939,9 @@ var ServiceRegistry = class {
 };
 // packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout as asyncTimeout3, Trigger as Trigger8 } from "@dxos/async";
+import { asyncTimeout as asyncTimeout3, Trigger as Trigger9 } from "@dxos/async";
 import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
-import { log as log17, logInfo } from "@dxos/log";
+import { log as log19, logInfo } from "@dxos/log";
 function _ts_decorate7(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -5788,7 +5952,7 @@ function _ts_decorate7(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
+var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
 var Message;
 (function(Message2) {
   Message2["ACQUIRING"] = "acquiring";
@@ -5796,7 +5960,7 @@ var Message;
 var Lock = class {
   constructor({ lockKey, onAcquire, onRelease }) {
     this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
-    this._releaseTrigger = new Trigger8();
+    this._releaseTrigger = new Trigger9();
     this._lockKey = lockKey;
     this._onAcquire = onAcquire;
     this._onRelease = onRelease;
@@ -5810,29 +5974,29 @@ var Lock = class {
       message: "acquiring"
     });
     try {
-      log17("aquiring lock...", void 0, {
-        F: __dxlog_file20,
+      log19("aquiring lock...", void 0, {
+        F: __dxlog_file21,
         L: 42,
         S: this,
         C: (f, a) => f(...a)
       });
       await asyncTimeout3(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
-      log17("acquired lock", void 0, {
-        F: __dxlog_file20,
+      log19("acquired lock", void 0, {
+        F: __dxlog_file21,
         L: 44,
         S: this,
         C: (f, a) => f(...a)
       });
     } catch {
-      log17("stealing lock...", void 0, {
-        F: __dxlog_file20,
+      log19("stealing lock...", void 0, {
+        F: __dxlog_file21,
         L: 46,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._requestLock(true);
-      log17("stolen lock", void 0, {
-        F: __dxlog_file20,
+      log19("stolen lock", void 0, {
+        F: __dxlog_file21,
         L: 48,
         S: this,
         C: (f, a) => f(...a)
@@ -5848,31 +6012,31 @@ var Lock = class {
     }
   }
   async _requestLock(steal = false) {
-    log17("requesting lock...", {
+    log19("requesting lock...", {
       steal
     }, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 63,
       S: this,
       C: (f, a) => f(...a)
     });
-    const acquired = new Trigger8();
+    const acquired = new Trigger9();
     void navigator.locks.request(this._lockKey, {
       steal
     }, async () => {
       await this._onAcquire?.();
       acquired.wake();
-      this._releaseTrigger = new Trigger8();
+      this._releaseTrigger = new Trigger9();
       await this._releaseTrigger.wait();
-      log17("releasing lock...", void 0, {
-        F: __dxlog_file20,
+      log19("releasing lock...", void 0, {
+        F: __dxlog_file21,
         L: 72,
         S: this,
         C: (f, a) => f(...a)
       });
       await this._onRelease?.();
-      log17("released lock", void 0, {
-        F: __dxlog_file20,
+      log19("released lock", void 0, {
+        F: __dxlog_file21,
         L: 74,
         S: this,
         C: (f, a) => f(...a)
@@ -5881,10 +6045,10 @@ var Lock = class {
       await this._onRelease?.();
     });
     await acquired.wait();
-    log17("recieved lock", {
+    log19("recieved lock", {
       steal
     }, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 81,
       S: this,
       C: (f, a) => f(...a)
@@ -5978,7 +6142,7 @@ import { clientServiceBundle } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
 import { invariant as invariant18 } from "@dxos/invariant";
 import { PublicKey as PublicKey16 } from "@dxos/keys";
-import { log as log19 } from "@dxos/log";
+import { log as log21 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
 import { SwarmNetworkManager, createSimplePeerTransportFactory } from "@dxos/network-manager";
 import { trace as trace10 } from "@dxos/protocols";
@@ -5991,7 +6155,7 @@ import { EventSubscriptions as EventSubscriptions3 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
 import { invariant as invariant17 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -6009,7 +6173,7 @@ var DevicesServiceImpl = class {
           });
         } else {
           invariant17(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file21,
+            F: __dxlog_file22,
             L: 32,
             S: this,
             A: [
@@ -6119,7 +6283,7 @@ var findConfigs = () => {
 import { Event as Event8 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
 import { PublicKey as PublicKey15 } from "@dxos/keys";
-import { getContextFromEntry, log as log18 } from "@dxos/log";
+import { getContextFromEntry, log as log20 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
 var LoggingServiceImpl = class {
@@ -6132,11 +6296,11 @@ var LoggingServiceImpl = class {
     };
   }
   async open() {
-    log18.runtimeConfig.processors.push(this._logProcessor);
+    log20.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = log18.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    log18.runtimeConfig.processors.splice(index, 1);
+    const index = log20.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    log20.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
@@ -6340,7 +6504,7 @@ function _ts_decorate8(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -6429,7 +6593,7 @@ var ClientServicesHost = class {
   */
   initialize({ config, ...options }) {
     invariant18(!this._open, "service host is open", {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 186,
       S: this,
       A: [
@@ -6437,15 +6601,15 @@ var ClientServicesHost = class {
         "'service host is open'"
       ]
     });
-    log19("initializing...", void 0, {
-      F: __dxlog_file22,
+    log21("initializing...", void 0, {
+      F: __dxlog_file23,
       L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       invariant18(!this._config, "config already set", {
-        F: __dxlog_file22,
+        F: __dxlog_file23,
         L: 190,
         S: this,
         A: [
@@ -6459,8 +6623,8 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      log19.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file22,
+      log21.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file23,
         L: 198,
         S: this,
         C: (f, a) => f(...a)
@@ -6471,7 +6635,7 @@ var ClientServicesHost = class {
     }), signalManager = new WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
     invariant18(!this._networkManager, "network manager already set", {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 209,
       S: this,
       A: [
@@ -6484,8 +6648,8 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager
     });
-    log19("initialized", void 0, {
-      F: __dxlog_file22,
+    log21("initialized", void 0, {
+      F: __dxlog_file23,
       L: 216,
       S: this,
       C: (f, a) => f(...a)
@@ -6496,16 +6660,16 @@ var ClientServicesHost = class {
       return;
     }
     const traceId = PublicKey16.random().toHex();
-    log19.trace("dxos.client-services.host.open", trace10.begin({
+    log21.trace("dxos.client-services.host.open", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant18(this._config, "config not set", {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 229,
       S: this,
       A: [
@@ -6514,7 +6678,7 @@ var ClientServicesHost = class {
       ]
     });
     invariant18(this._storage, "storage not set", {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 230,
       S: this,
       A: [
@@ -6523,7 +6687,7 @@ var ClientServicesHost = class {
       ]
     });
     invariant18(this._signalManager, "signal manager not set", {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 231,
       S: this,
       A: [
@@ -6532,7 +6696,7 @@ var ClientServicesHost = class {
       ]
     });
     invariant18(this._networkManager, "network manager not set", {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 232,
       S: this,
       A: [
@@ -6541,10 +6705,10 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    log19("opening...", {
+    log21("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 235,
       S: this,
       C: (f, a) => f(...a)
@@ -6595,18 +6759,18 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log19("opened", {
+    log21("opened", {
       deviceKey
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 314,
       S: this,
       C: (f, a) => f(...a)
     });
-    log19.trace("dxos.client-services.host.open", trace10.end({
+    log21.trace("dxos.client-services.host.open", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 315,
       S: this,
       C: (f, a) => f(...a)
@@ -6617,10 +6781,10 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log19("closing...", {
+    log21("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 326,
       S: this,
       C: (f, a) => f(...a)
@@ -6635,10 +6799,10 @@ var ClientServicesHost = class {
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    log19("closed", {
+    log21("closed", {
       deviceKey
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 335,
       S: this,
       C: (f, a) => f(...a)
@@ -6646,32 +6810,32 @@ var ClientServicesHost = class {
   }
   async reset() {
     const traceId = PublicKey16.random().toHex();
-    log19.trace("dxos.sdk.client-services-host.reset", trace10.begin({
+    log21.trace("dxos.sdk.client-services-host.reset", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 340,
       S: this,
       C: (f, a) => f(...a)
     });
-    log19.info("resetting...", void 0, {
-      F: __dxlog_file22,
+    log21.info("resetting...", void 0, {
+      F: __dxlog_file23,
       L: 342,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    log19.info("reset", void 0, {
-      F: __dxlog_file22,
+    log21.info("reset", void 0, {
+      F: __dxlog_file23,
       L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
-    log19.trace("dxos.sdk.client-services-host.reset", trace10.end({
+    log21.trace("dxos.sdk.client-services-host.reset", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 346,
       S: this,
       C: (f, a) => f(...a)
@@ -6730,7 +6894,6 @@ export {
   SpaceInvitationProtocol,
   InvitationsManager,
   DataSpace,
-  findPropertiesObject,
   DataSpaceManager,
   SpacesServiceImpl,
   ServiceContext,
@@ -6743,4 +6906,4 @@ export {
   ClientServicesProviderResource,
   DiagnosticsCollector
 };
-//# sourceMappingURL=chunk-2EFXBSRZ.mjs.map
+//# sourceMappingURL=chunk-KI7FY3ZO.mjs.map