@dxos/client-services 0.1.31-next.ea8f0bc → 0.1.32-next.77d513e

package/dist/lib/browser/{chunk-ZIQUYEJS.mjs → chunk-E3FD43YN.mjs}

@@ -587,7 +587,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       file: "identity-manager.ts",
-      line: 63,
+      line: 71,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -606,7 +606,7 @@ var IdentityManager = class {
     assert2(!this._identity, "Identity already exists.");
     log3("creating identity...", {}, {
       file: "identity-manager.ts",
-      line: 78,
+      line: 86,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -615,21 +615,23 @@ var IdentityManager = class {
       identityKey: await this._keyring.createKey(),
       deviceKey: await this._keyring.createKey(),
       haloSpace: {
-        spaceKey: await this._keyring.createKey(),
+        key: await this._keyring.createKey(),
         genesisFeedKey: controlFeedKey,
-        writeControlFeedKey: controlFeedKey,
-        writeDataFeedKey: await this._keyring.createKey()
+        controlFeedKey,
+        dataFeedKey: await this._keyring.createKey()
       }
     };
     const identity = await this._constructIdentity(identityRecord);
     await identity.open();
     {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
+      assert2(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.");
+      assert2(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.");
       const credentials = [
         // Space genesis.
-        ...await generator.createSpaceGenesis(identityRecord.haloSpace.spaceKey, identityRecord.haloSpace.genesisFeedKey),
+        ...await generator.createSpaceGenesis(identityRecord.haloSpace.key, identityRecord.haloSpace.genesisFeedKey),
         // Feed admission.
-        await generator.createFeedAdmission(identityRecord.haloSpace.spaceKey, identityRecord.haloSpace.writeDataFeedKey, AdmittedFeed2.Designation.DATA)
+        await generator.createFeedAdmission(identityRecord.haloSpace.key, identityRecord.haloSpace.dataFeedKey, AdmittedFeed2.Designation.DATA)
       ];
       if (displayName) {
         credentials.push(await generator.createProfileCredential({
@@ -654,7 +656,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       file: "identity-manager.ts",
-      line: 136,
+      line: 143,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -668,7 +670,7 @@ var IdentityManager = class {
       params
     }, {
       file: "identity-manager.ts",
-      line: 144,
+      line: 151,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -677,10 +679,11 @@ var IdentityManager = class {
       identityKey: params.identityKey,
       deviceKey: params.deviceKey,
       haloSpace: {
-        spaceKey: params.haloSpaceKey,
+        key: params.haloSpaceKey,
         genesisFeedKey: params.haloGenesisFeedKey,
-        writeControlFeedKey: params.controlFeedKey,
-        writeDataFeedKey: params.dataFeedKey
+        controlFeedKey: params.controlFeedKey,
+        dataFeedKey: params.dataFeedKey,
+        controlTimeframe: params.controlTimeframe
       }
     };
     const identity = await this._constructIdentity(identityRecord);
@@ -694,7 +697,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       file: "identity-manager.ts",
-      line: 164,
+      line: 172,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -706,14 +709,16 @@ var IdentityManager = class {
       identityRecord
     }, {
       file: "identity-manager.ts",
-      line: 170,
+      line: 178,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    const controlFeed = await this._feedStore.openFeed(identityRecord.haloSpace.writeControlFeedKey, {
+    assert2(identityRecord.haloSpace.controlFeedKey);
+    const controlFeed = await this._feedStore.openFeed(identityRecord.haloSpace.controlFeedKey, {
       writable: true
     });
-    const dataFeed = await this._feedStore.openFeed(identityRecord.haloSpace.writeDataFeedKey, {
+    assert2(identityRecord.haloSpace.dataFeedKey);
+    const dataFeed = await this._feedStore.openFeed(identityRecord.haloSpace.dataFeedKey, {
       writable: true
     });
     const space = await this._constructSpace({
@@ -737,16 +742,19 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       file: "identity-manager.ts",
-      line: 196,
+      line: 206,
       scope: this,
       callSite: (f, a) => f(...a)
     });
+    if (identityRecord.haloSpace.controlTimeframe) {
+      identity.controlPipeline.state.setTargetTimeframe(identityRecord.haloSpace.controlTimeframe);
+    }
     return identity;
   }
   async _constructSpace({ spaceRecord, swarmIdentity, identityKey }) {
     return this._spaceManager.constructSpace({
       metadata: {
-        key: spaceRecord.spaceKey,
+        key: spaceRecord.key,
         genesisFeedKey: spaceRecord.genesisFeedKey
       },
       swarmIdentity,
@@ -862,7 +870,8 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
         return {
           identityKey: identity.identityKey,
           haloSpaceKey: identity.haloSpaceKey,
-          genesisFeedKey: identity.haloGenesisFeedKey
+          genesisFeedKey: identity.haloGenesisFeedKey,
+          controlTimeframe: identity.controlPipeline.state.timeframe
         };
       },
       authenticate: async ({ authenticationCode: code }) => {
@@ -870,7 +879,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
           authenticationCode: code
         }, {
           file: "device-invitations-handler.ts",
-          line: 106,
+          line: 107,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -892,7 +901,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
             guest: credentials.deviceKey
           }, {
             file: "device-invitations-handler.ts",
-            line: 121,
+            line: 122,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -911,7 +920,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
               host: identity.deviceKey
             }, {
               file: "device-invitations-handler.ts",
-              line: 137,
+              line: 138,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -924,7 +933,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
               guest: deviceKey
             }, {
               file: "device-invitations-handler.ts",
-              line: 140,
+              line: 141,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -933,7 +942,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
             if (!observable.cancelled) {
               log4.error("failed", err, {
                 file: "device-invitations-handler.ts",
-                line: 144,
+                line: 145,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -998,22 +1007,22 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
               }
               log4("connected", {}, {
                 file: "device-invitations-handler.ts",
-                line: 215,
+                line: 216,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
               (_b = (_a = observable.callback).onConnected) == null ? void 0 : _b.call(_a, invitation);
               log4("sending admission request", {}, {
                 file: "device-invitations-handler.ts",
-                line: 219,
+                line: 220,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
-              const { identityKey, haloSpaceKey, genesisFeedKey } = await extension.rpc.HaloHostService.requestAdmission();
+              const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = await extension.rpc.HaloHostService.requestAdmission();
               if (invitation.type === void 0 || invitation.type === Invitation.Type.INTERACTIVE) {
                 log4("guest waiting for authentication code...", {}, {
                   file: "device-invitations-handler.ts",
-                  line: 226,
+                  line: 227,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1023,7 +1032,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
                 });
                 log4("sending authentication request", {}, {
                   file: "device-invitations-handler.ts",
-                  line: 229,
+                  line: 230,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1041,7 +1050,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
                 dataFeedKey
               }, {
                 file: "device-invitations-handler.ts",
-                line: 238,
+                line: 239,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1056,14 +1065,15 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
                 haloSpaceKey,
                 haloGenesisFeedKey: genesisFeedKey,
                 controlFeedKey,
-                dataFeedKey
+                dataFeedKey,
+                controlTimeframe
               });
               log4("admitted by host", {
                 guest: identity.deviceKey,
                 identityKey
               }, {
                 file: "device-invitations-handler.ts",
-                line: 257,
+                line: 259,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1072,7 +1082,7 @@ var DeviceInvitationsHandler = class extends AbstractInvitationsHandler {
               if (!observable.cancelled) {
                 log4.warn("auth failed", err, {
                   file: "device-invitations-handler.ts",
-                  line: 261,
+                  line: 263,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1516,6 +1526,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
           };
         },
         requestAdmission: async ({ identityKey, deviceKey, controlFeedKey, dataFeedKey }) => {
+          var _a2;
           try {
             if (isAuthenticationRequired(invitation) && !authenticationPassed) {
               throw new Error("Not authenticated");
@@ -1536,7 +1547,9 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
             await writeMessages2(space.inner.controlPipeline.writer, credentials);
             complete.wake(deviceKey);
             return {
-              credential: spaceMemberCredential
+              credential: spaceMemberCredential,
+              controlTimeframe: space.inner.controlPipeline.state.timeframe,
+              dataTimeframe: (_a2 = space.dataPipeline.pipelineState) == null ? void 0 : _a2.timeframe
             };
           } catch (err) {
             observable.callback.onError(err);
@@ -1551,7 +1564,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                 host: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 191,
+                line: 195,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1564,7 +1577,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                 guest: deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 194,
+                line: 198,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1573,7 +1586,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
               if (!observable.cancelled) {
                 log6.error("failed", err, {
                   file: "space-invitations-handler.ts",
-                  line: 198,
+                  line: 202,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1643,7 +1656,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                 guest: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 271,
+                line: 275,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1652,7 +1665,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                 guest: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 275,
+                line: 279,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1664,7 +1677,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                 response: introductionResponse
               }, {
                 file: "space-invitations-handler.ts",
-                line: 279,
+                line: 283,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1677,7 +1690,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   log6("guest waiting for authentication code...", {}, {
                     file: "space-invitations-handler.ts",
-                    line: 293,
+                    line: 297,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1687,7 +1700,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                   });
                   log6("sending authentication request", {}, {
                     file: "space-invitations-handler.ts",
-                    line: 297,
+                    line: 301,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1705,7 +1718,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                         attempt
                       }, {
                         file: "space-invitations-handler.ts",
-                        line: 307,
+                        line: 311,
                         scope: this,
                         callSite: (f, a) => f(...a)
                       });
@@ -1720,11 +1733,11 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                 guest: this._signingContext.deviceKey
               }, {
                 file: "space-invitations-handler.ts",
-                line: 318,
+                line: 322,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
-              const { credential } = await extension.rpc.SpaceHostService.requestAdmission({
+              const { credential, controlTimeframe, dataTimeframe } = await extension.rpc.SpaceHostService.requestAdmission({
                 identityKey: this._signingContext.identityKey,
                 deviceKey: this._signingContext.deviceKey,
                 controlFeedKey,
@@ -1735,7 +1748,9 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
               assert6(credential.subject.id.equals(this._signingContext.identityKey));
               const space = await this._spaceManager.acceptSpace({
                 spaceKey: assertion.spaceKey,
-                genesisFeedKey: assertion.genesisFeedKey
+                genesisFeedKey: assertion.genesisFeedKey,
+                controlTimeframe,
+                dataTimeframe
               });
               await this._signingContext.recordCredential(credential);
               log6("admitted by host", {
@@ -1743,7 +1758,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
                 spaceKey: space.key
               }, {
                 file: "space-invitations-handler.ts",
-                line: 340,
+                line: 347,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1752,7 +1767,7 @@ var SpaceInvitationsHandler = class extends AbstractInvitationsHandler2 {
               if (!observable.cancelled) {
                 log6.warn("auth failed", err, {
                   file: "space-invitations-handler.ts",
-                  line: 344,
+                  line: 351,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1991,18 +2006,18 @@ var MemoryShellRuntime = class {
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
 import { Trigger as Trigger9 } from "@dxos/async";
-import { log as log16, logInfo as logInfo2 } from "@dxos/log";
+import { log as log17, logInfo as logInfo3 } from "@dxos/log";
 import { MemorySignalManager as MemorySignalManager3, MemorySignalManagerContext as MemorySignalManagerContext3, WebsocketSignalManager as WebsocketSignalManager3 } from "@dxos/messaging";
 import { createWebRTCTransportFactory as createWebRTCTransportFactory2, NetworkManager as NetworkManager3 } from "@dxos/network-manager";
 import { getAsyncValue } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 import assert12 from "@dxos/node-std/assert";
-import { Event as Event6 } from "@dxos/async";
+import { Event as Event7 } from "@dxos/async";
 import { clientServiceBundle, createDefaultModelFactory } from "@dxos/client";
 import { raise as raise3 } from "@dxos/debug";
 import { DataServiceImpl } from "@dxos/echo-pipeline";
-import { log as log14 } from "@dxos/log";
+import { log as log15 } from "@dxos/log";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
 
 // packages/sdk/client-services/src/packlets/deprecated/tracing.ts
@@ -2089,35 +2104,40 @@ var NetworkServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
 import assert10 from "@dxos/node-std/assert";
-import { Event as Event5, synchronized, trackLeaks as trackLeaks2 } from "@dxos/async";
-import { Context as Context7 } from "@dxos/context";
+import { Event as Event6, synchronized, trackLeaks as trackLeaks2 } from "@dxos/async";
+import { SpaceState as SpaceState2 } from "@dxos/client";
+import { cancelWithContext, Context as Context7 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
-import { spaceGenesis, SnapshotManager } from "@dxos/echo-pipeline";
+import { SnapshotManager, spaceGenesis } from "@dxos/echo-pipeline";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log8 } from "@dxos/log";
-import { Presence } from "@dxos/teleport-extension-presence";
+import { log as log9 } from "@dxos/log";
+import { Gossip, Presence } from "@dxos/teleport-extension-gossip";
 import { ComplexMap as ComplexMap3, deferFunction as deferFunction2 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { trackLeaks } from "@dxos/async";
+import { Event as Event5, scheduleTask as scheduleTask4, trackLeaks } from "@dxos/async";
+import { SpaceState } from "@dxos/client";
 import { Context as Context6 } from "@dxos/context";
 import { timed } from "@dxos/debug";
-import { DataPipelineControllerImpl, createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { createMappedFeedWriter, DataPipeline } from "@dxos/echo-pipeline";
+import { CancelledError, SystemError } from "@dxos/errors";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
+import { log as log8 } from "@dxos/log";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { ComplexSet as ComplexSet2 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
 import assert9 from "@dxos/node-std/assert";
-import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, TimeoutError, Trigger as Trigger4 } from "@dxos/async";
-import { Context as Context5 } from "@dxos/context";
+import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, sleep as sleep3, TimeoutError, Trigger as Trigger4 } from "@dxos/async";
+import { Context as Context5, rejectOnDispose } from "@dxos/context";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
 import { schema as schema4 } from "@dxos/protocols";
 import { RpcExtension as RpcExtension3 } from "@dxos/teleport";
 import { ComplexMap as ComplexMap2, ComplexSet, entry } from "@dxos/util";
-var RETRY_TIMEOUT = 1e3;
-var NOTARIZE_TIMEOUT = 1e4;
+var DEFAULT_RETRY_TIMEOUT = 1e3;
+var DEFAULT_SUCCESS_DELAY = 1e3;
+var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
 var NotarizationPlugin = class {
   constructor() {
     this._ctx = new Context5();
@@ -2134,12 +2154,12 @@ var NotarizationPlugin = class {
   /**
   * Request credentials to be notarized.
   */
-  async notarize(credentials) {
+  async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
     log7("notarize", {
       credentials
     }, {
       file: "notarization-plugin.ts",
-      line: 44,
+      line: 85,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2151,7 +2171,7 @@ var NotarizationPlugin = class {
           err
         }, {
           file: "notarization-plugin.ts",
-          line: 53,
+          line: 94,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2159,27 +2179,27 @@ var NotarizationPlugin = class {
         errors.throw(err);
       }
     });
-    scheduleTask3(ctx, () => {
-      log7.warn("Notarization timeout", {}, {
-        file: "notarization-plugin.ts",
-        line: 61,
-        scope: this,
-        callSite: (f, a) => f(...a)
-      });
-      void ctx.dispose();
-      errors.throw(new TimeoutError(NOTARIZE_TIMEOUT, "Notarization timed out"));
-    }, NOTARIZE_TIMEOUT);
+    opCtx == null ? void 0 : opCtx.onDispose(() => ctx.dispose());
+    if (timeout !== 0) {
+      scheduleTask3(ctx, () => {
+        log7.warn("Notarization timeout", {
+          timeout,
+          peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
+        }, {
+          file: "notarization-plugin.ts",
+          line: 106,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+        void ctx.dispose();
+        errors.throw(new TimeoutError(timeout, "Notarization timed out"));
+      }, timeout);
+    }
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
     const peersTried = /* @__PURE__ */ new Set();
     const notarizeTask = new DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
-          log7.warn("No peers to notarize with", {}, {
-            file: "notarization-plugin.ts",
-            line: 76,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
           return;
         }
         const peer = [
@@ -2187,15 +2207,15 @@ var NotarizationPlugin = class {
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
           log7.warn("Exhausted all peers to notarize with", {
-            retryIn: RETRY_TIMEOUT
+            retryIn: retryTimeout
           }, {
             file: "notarization-plugin.ts",
-            line: 83,
+            line: 131,
             scope: this,
             callSite: (f, a) => f(...a)
           });
           peersTried.clear();
-          scheduleTask3(ctx, () => notarizeTask.schedule(), RETRY_TIMEOUT);
+          scheduleTask3(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
@@ -2204,7 +2224,7 @@ var NotarizationPlugin = class {
           credentialId: credentials.map((credential) => credential.id)
         }, {
           file: "notarization-plugin.ts",
-          line: 90,
+          line: 138,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2213,14 +2233,15 @@ var NotarizationPlugin = class {
         });
         log7("success", {}, {
           file: "notarization-plugin.ts",
-          line: 94,
+          line: 142,
           scope: this,
           callSite: (f, a) => f(...a)
         });
+        await sleep3(successDelay);
       } catch (err) {
         log7.warn("error notarizing (recoverable)", err, {
           file: "notarization-plugin.ts",
-          line: 96,
+          line: 145,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2231,12 +2252,13 @@ var NotarizationPlugin = class {
     this._extensionOpened.on(ctx, () => notarizeTask.schedule());
     try {
       await Promise.race([
+        rejectOnDispose(ctx),
         allNotarized,
         errors.wait()
       ]);
       log7("done", {}, {
         file: "notarization-plugin.ts",
-        line: 107,
+        line: 155,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2289,7 +2311,7 @@ var NotarizationPlugin = class {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
-          line: 156,
+          line: 204,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2301,7 +2323,7 @@ var NotarizationPlugin = class {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
-          line: 161,
+          line: 209,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2355,17 +2377,22 @@ var __decorate = function(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var AUTH_TIMEOUT2 = 3e4;
-var CONTROL_PIPELINE_READY_TIMEFRAME = 3e3;
 var DataSpace = class DataSpace2 {
   constructor(params) {
     this._ctx = new Context6();
+    this._state = SpaceState.CLOSED;
+    this.stateUpdate = new Event5();
+    var _a;
     this._inner = params.inner;
+    this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
+    this._gossip = params.gossip;
     this._presence = params.presence;
     this._keyring = params.keyring;
     this._feedStore = params.feedStore;
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
-    this._dataPipelineController = new DataPipelineControllerImpl({
+    this._callbacks = (_a = params.callbacks) != null ? _a : {};
+    this._dataPipeline = new DataPipeline({
       modelFactory: params.modelFactory,
       metadataStore: params.metadataStore,
       snapshotManager: params.snapshotManager,
@@ -2387,15 +2414,15 @@ var DataSpace = class DataSpace2 {
   get isOpen() {
     return this._inner.isOpen;
   }
+  get state() {
+    return this._state;
+  }
   // TODO(burdon): Can we mark this for debugging only?
   get inner() {
     return this._inner;
   }
-  get dataPipelineController() {
-    return this._dataPipelineController;
-  }
-  get stateUpdate() {
-    return this._inner.stateUpdate;
+  get dataPipeline() {
+    return this._dataPipeline;
   }
   get presence() {
     return this._presence;
@@ -2407,26 +2434,102 @@ var DataSpace = class DataSpace2 {
     await this.notarizationPlugin.open();
     await this._notarizationPluginConsumer.open();
     await this._inner.open();
+    this._state = SpaceState.INACTIVE;
   }
   async close() {
+    this._state = SpaceState.CLOSED;
     await this._ctx.dispose();
+    await this._dataPipeline.close();
     await this.authVerifier.close();
     await this._inner.close();
     await this._notarizationPluginConsumer.close();
     await this.notarizationPlugin.close();
     await this._presence.destroy();
   }
+  async postMessage(channel, message) {
+    return this._gossip.postMessage(channel, message);
+  }
+  listen(channel, callback) {
+    return this._gossip.listen(channel, callback);
+  }
+  /**
+  * Initialize the data pipeline in a separate task.
+  */
+  initializeDataPipelineAsync() {
+    scheduleTask4(this._ctx, async () => {
+      try {
+        await this.initializeDataPipeline();
+      } catch (err) {
+        if (err instanceof CancelledError) {
+          log8("Data pipeline initialization cancelled", err, {
+            file: "data-space.ts",
+            line: 178,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          return;
+        }
+        log8.error("Error initializing data pipeline", err, {
+          file: "data-space.ts",
+          line: 182,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+      }
+    });
+  }
   async initializeDataPipeline() {
+    var _a, _b, _c, _d;
+    if (this._state !== SpaceState.INACTIVE) {
+      throw new SystemError("Invalid operation");
+    }
+    this._state = SpaceState.INITIALIZING;
     await this._inner.controlPipeline.state.waitUntilReachedTargetTimeframe({
-      timeout: CONTROL_PIPELINE_READY_TIMEFRAME
+      ctx: this._ctx,
+      breakOnStall: false
     });
     await this._createWritableFeeds();
+    log8("Writable feeds created", {}, {
+      file: "data-space.ts",
+      line: 200,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    this.stateUpdate.emit();
     this.notarizationPlugin.setWriter(createMappedFeedWriter((credential) => ({
       credential: {
         credential
       }
     }), this._inner.controlPipeline.writer));
-    await this._inner.initDataPipeline(this._dataPipelineController);
+    await this._dataPipeline.open({
+      openPipeline: async (start) => {
+        const pipeline = await this._inner.createDataPipeline({
+          start
+        });
+        await pipeline.start();
+        return pipeline;
+      }
+    });
+    log8("waiting for data pipeline to reach target timeframe", {}, {
+      file: "data-space.ts",
+      line: 220,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    await this._dataPipeline.pipelineState.waitUntilReachedTargetTimeframe({
+      ctx: this._ctx,
+      breakOnStall: false
+    });
+    log8("data pipeline ready", {}, {
+      file: "data-space.ts",
+      line: 227,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    await ((_b = (_a = this._callbacks).beforeReady) == null ? void 0 : _b.call(_a));
+    this._state = SpaceState.READY;
+    this.stateUpdate.emit();
+    await ((_d = (_c = this._callbacks).afterReady) == null ? void 0 : _d.call(_c));
   }
   async _createWritableFeeds() {
     const credentials = [];
@@ -2463,7 +2566,11 @@ var DataSpace = class DataSpace2 {
       }));
     }
     if (credentials.length > 0) {
-      await this.notarizationPlugin.notarize(credentials);
+      await this.notarizationPlugin.notarize({
+        ctx: this._ctx,
+        credentials,
+        timeout: 0
+      });
     }
     await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey, this.inner.dataFeedKey);
   }
@@ -2486,7 +2593,6 @@ var __decorate2 = function(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 DATA_PIPELINE_READY_TIMEOUT = 3e3;
 var DataSpaceManager = class DataSpaceManager2 {
   constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _modelFactory, _feedStore, _snapshotStore) {
     this._spaceManager = _spaceManager;
@@ -2498,52 +2604,53 @@ var DataSpaceManager = class DataSpaceManager2 {
     this._feedStore = _feedStore;
     this._snapshotStore = _snapshotStore;
     this._ctx = new Context7();
-    this.updated = new Event5();
+    this.updated = new Event6();
     this._spaces = new ComplexMap3(PublicKey7.hash);
+    this._isOpen = false;
   }
   // TODO(burdon): Remove.
   get spaces() {
     return this._spaces;
   }
   async open() {
+    log9("open", {}, {
+      file: "data-space-manager.ts",
+      line: 80,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     await this._metadataStore.load();
-    log8("metadata loaded", {
+    log9("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
       file: "data-space-manager.ts",
-      line: 67,
+      line: 82,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     for (const spaceMetadata of this._metadataStore.spaces) {
-      log8("load space", {
+      log9("load space", {
         spaceMetadata
       }, {
         file: "data-space-manager.ts",
-        line: 70,
+        line: 85,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       const space = await this._constructSpace(spaceMetadata);
-      await space.initializeDataPipeline();
-      if (spaceMetadata.dataTimeframe) {
-        log8("waiting for latest timeframe", {
-          spaceMetadata
-        }, {
-          file: "data-space-manager.ts",
-          line: 74,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        });
-        await space.dataPipelineController.pipelineState.setTargetTimeframe(spaceMetadata.dataTimeframe);
-      }
-      await space.dataPipelineController.pipelineState.waitUntilReachedTargetTimeframe({
-        timeout: DATA_PIPELINE_READY_TIMEOUT
-      });
-      this._dataServiceSubscriptions.registerSpace(space.key, space.dataPipelineController.databaseBackend.createDataServiceHost());
+      space.initializeDataPipelineAsync();
     }
+    this._isOpen = true;
+    this.updated.emit();
   }
   async close() {
+    log9("close", {}, {
+      file: "data-space-manager.ts",
+      line: 96,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    this._isOpen = false;
     await this._ctx.dispose();
     for (const space of this._spaces.values()) {
       await space.close();
@@ -2553,6 +2660,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
+    assert10(this._isOpen, "Not open.");
     const spaceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const dataFeedKey = await this._keyring.createKey();
@@ -2562,11 +2670,11 @@ var DataSpaceManager = class DataSpaceManager2 {
       controlFeedKey,
       dataFeedKey
     };
-    log8("creating space...", {
+    log9("creating space...", {
       spaceKey
     }, {
       file: "data-space-manager.ts",
-      line: 110,
+      line: 120,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2577,30 +2685,61 @@ var DataSpaceManager = class DataSpaceManager2 {
     assert10(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
     await this._signingContext.recordCredential(memberCredential);
     await space.initializeDataPipeline();
-    this._dataServiceSubscriptions.registerSpace(space.key, space.dataPipelineController.databaseBackend.createDataServiceHost());
     this.updated.emit();
     return space;
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
+    log9("accept space", {
+      opts
+    }, {
+      file: "data-space-manager.ts",
+      line: 139,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    assert10(this._isOpen, "Not open.");
     assert10(!this._spaces.has(opts.spaceKey), "Space already exists.");
     const metadata = {
       key: opts.spaceKey,
-      genesisFeedKey: opts.genesisFeedKey
+      genesisFeedKey: opts.genesisFeedKey,
+      controlTimeframe: opts.controlTimeframe,
+      dataTimeframe: opts.dataTimeframe
     };
     const space = await this._constructSpace(metadata);
     await this._metadataStore.addSpace(metadata);
-    await space.initializeDataPipeline();
-    this._dataServiceSubscriptions.registerSpace(space.key, space.dataPipelineController.databaseBackend.createDataServiceHost());
+    space.initializeDataPipelineAsync();
     this.updated.emit();
     return space;
   }
+  /**
+  * Wait until the space data pipeline is fully initialized.
+  * Used by invitation handler.
+  * TODO(dmaretskyi): Consider removing.
+  */
+  async waitUntilSpaceReady(spaceKey) {
+    await cancelWithContext(this._ctx, this.updated.waitForCondition(() => {
+      const space = this._spaces.get(spaceKey);
+      return !!space && space.state === SpaceState2.READY;
+    }));
+  }
   async _constructSpace(metadata) {
+    log9("construct space", {
+      metadata
+    }, {
+      file: "data-space-manager.ts",
+      line: 175,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    const gossip = new Gossip({
+      localPeerId: this._signingContext.deviceKey
+    });
     const presence = new Presence({
-      localPeerId: this._signingContext.deviceKey,
-      announceInterval: 1e3,
-      offlineTimeout: 1e4,
-      identityKey: this._signingContext.identityKey
+      announceInterval: 500,
+      offlineTimeout: 5e3,
+      identityKey: this._signingContext.identityKey,
+      gossip
     });
     const snapshotManager = new SnapshotManager(this._snapshotStore);
     const controlFeed = metadata.controlFeedKey && await this._feedStore.openFeed(metadata.controlFeedKey, {
@@ -2617,7 +2756,7 @@ var DataSpaceManager = class DataSpaceManager2 {
         credentialAuthenticator: deferFunction2(() => dataSpace.authVerifier.verifier)
       },
       onNetworkConnection: (session) => {
-        session.addExtension("dxos.mesh.teleport.presence", presence.createExtension({
+        session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
         session.addExtension("dxos.mesh.teleport.objectsync", snapshotManager.objectSync.createExtension());
@@ -2631,14 +2770,48 @@ var DataSpaceManager = class DataSpaceManager2 {
       modelFactory: this._modelFactory,
       metadataStore: this._metadataStore,
       snapshotManager,
+      gossip,
       presence,
       memberKey: this._signingContext.identityKey,
       keyring: this._keyring,
       feedStore: this._feedStore,
       signingContext: this._signingContext,
-      snapshotId: metadata.snapshot
+      snapshotId: metadata.snapshot,
+      callbacks: {
+        beforeReady: async () => {
+          log9("before space ready", {
+            space: space.key
+          }, {
+            file: "data-space-manager.ts",
+            line: 224,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          this._dataServiceSubscriptions.registerSpace(space.key, dataSpace.dataPipeline.databaseBackend.createDataServiceHost());
+        },
+        afterReady: async () => {
+          log9("after space ready", {
+            space: space.key,
+            open: this._isOpen
+          }, {
+            file: "data-space-manager.ts",
+            line: 231,
+            scope: this,
+            callSite: (f, a) => f(...a)
+          });
+          if (this._isOpen) {
+            this.updated.emit();
+          }
+        }
+      }
     });
     await dataSpace.open();
+    if (metadata.controlTimeframe) {
+      dataSpace.inner.controlPipeline.state.setTargetTimeframe(metadata.controlTimeframe);
+    }
+    if (metadata.dataTimeframe) {
+      dataSpace.dataPipeline.setTargetTimeframe(metadata.dataTimeframe);
+    }
     this._spaces.set(metadata.key, dataSpace);
     return dataSpace;
   }
@@ -2660,13 +2833,14 @@ DataSpaceManager = __decorate2([
 ], DataSpaceManager);
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
-import { EventSubscriptions as EventSubscriptions3, scheduleTask as scheduleTask4 } from "@dxos/async";
+import { EventSubscriptions as EventSubscriptions3, scheduleTask as scheduleTask5 } from "@dxos/async";
 import { Stream as Stream10 } from "@dxos/codec-protobuf";
 import { raise, todo as todo2 } from "@dxos/debug";
 import { SpaceNotFoundError } from "@dxos/echo-pipeline";
-import { log as log9 } from "@dxos/log";
-import { SpaceMember, SpaceStatus } from "@dxos/protocols/proto/dxos/client/services";
+import { log as log10 } from "@dxos/log";
+import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { humanize } from "@dxos/util";
+var TIMEFRAME_UPDATE_DEBOUNCE_TIME = 500;
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _dataServiceSubscriptions, _getDataSpaceManager) {
     this._identityManager = _identityManager;
@@ -2689,12 +2863,12 @@ var SpacesServiceImpl = class {
     return new Stream10(({ next, ctx }) => {
       const onUpdate = async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const spaces = Array.from(dataSpaceManager.spaces.values()).filter((space) => this._dataServiceSubscriptions.getDataService(space.key)).map((space) => this._transformSpace(space));
-        log9("update", {
+        const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._transformSpace(space));
+        log10("update", {
           spaces
         }, {
           file: "spaces-service.ts",
-          line: 59,
+          line: 60,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2702,28 +2876,27 @@ var SpacesServiceImpl = class {
           spaces
         });
       };
-      setTimeout(async () => {
+      scheduleTask5(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const subscriptions = new EventSubscriptions3();
+        ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
           for (const space of dataSpaceManager.spaces.values()) {
-            if (!this._dataServiceSubscriptions.getDataService(space.key)) {
-              continue;
-            }
             subscriptions.add(space.stateUpdate.on(ctx, onUpdate));
             subscriptions.add(space.presence.updated.on(ctx, onUpdate));
+            space.inner.controlPipeline.state.timeframeUpdate.debounce(TIMEFRAME_UPDATE_DEBOUNCE_TIME).on(ctx, onUpdate);
+            if (space.dataPipeline.pipelineState) {
+              subscriptions.add(space.dataPipeline.pipelineState.timeframeUpdate.debounce(TIMEFRAME_UPDATE_DEBOUNCE_TIME).on(ctx, onUpdate));
+            }
           }
         };
         dataSpaceManager.updated.on(ctx, () => {
           subscribeSpaces();
           void onUpdate();
         });
-        ctx.onDispose(() => subscriptions.clear());
-        scheduleTask4(ctx, () => {
-          subscribeSpaces();
-          void onUpdate();
-        });
+        subscribeSpaces();
+        void onUpdate();
       });
       if (!this._identityManager.identity) {
         next({
@@ -2732,6 +2905,25 @@ var SpacesServiceImpl = class {
       }
     });
   }
+  async postMessage({ spaceKey, channel, message }) {
+    var _a;
+    const dataSpaceManager = await this._getDataSpaceManager();
+    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : raise(new SpaceNotFoundError(spaceKey));
+    await space.postMessage(getChannelId(channel), message);
+  }
+  subscribeMessages({ spaceKey, channel }) {
+    return new Stream10(({ ctx, next }) => {
+      scheduleTask5(ctx, async () => {
+        var _a;
+        const dataSpaceManager = await this._getDataSpaceManager();
+        const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : raise(new SpaceNotFoundError(spaceKey));
+        const handle = space.listen(getChannelId(channel), (message) => {
+          next(message);
+        });
+        ctx.onDispose(() => handle.unsubscribe());
+      });
+    });
+  }
   queryCredentials({ spaceKey }) {
     return new Stream10(({ ctx, next }) => {
       var _a;
@@ -2742,7 +2934,7 @@ var SpacesServiceImpl = class {
         }
       });
       ctx.onDispose(() => processor.close());
-      scheduleTask4(ctx, () => processor.open());
+      scheduleTask5(ctx, () => processor.open());
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
@@ -2757,16 +2949,23 @@ var SpacesServiceImpl = class {
     }
   }
   _transformSpace(space) {
+    var _a, _b;
     return {
       spaceKey: space.key,
-      status: space.isOpen ? SpaceStatus.ACTIVE : SpaceStatus.INACTIVE,
+      state: space.state,
+      pipeline: {
+        targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
+        currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
+        currentDataTimeframe: (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.timeframe,
+        targetDataTimeframe: (_b = space.dataPipeline.pipelineState) == null ? void 0 : _b.targetTimeframe
+      },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
-        var _a, _b, _c;
+        var _a2, _b2, _c;
         return {
           identity: {
             identityKey: member.key,
             profile: {
-              displayName: (_b = (_a = member.assertion.profile) == null ? void 0 : _a.displayName) != null ? _b : humanize(member.key)
+              displayName: (_b2 = (_a2 = member.assertion.profile) == null ? void 0 : _a2.displayName) != null ? _b2 : humanize(member.key)
             }
           },
           presence: ((_c = this._identityManager.identity) == null ? void 0 : _c.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE
@@ -2775,6 +2974,7 @@ var SpacesServiceImpl = class {
     };
   }
 };
+var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/system/system-service.ts
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
@@ -2865,7 +3065,17 @@ var IFrameProxyRuntime = class {
 
 // packages/sdk/client-services/src/packlets/vault/vault-resource-lock.ts
 import { asyncTimeout, Trigger as Trigger5 } from "@dxos/async";
-import { log as log10 } from "@dxos/log";
+import { log as log11, logInfo } from "@dxos/log";
+var __decorate3 = function(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")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        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 Message;
 (function(Message2) {
   Message2["ACQUIRING"] = "acquiring";
@@ -2879,14 +3089,41 @@ var VaultResourceLock = class {
     this._onRelease = onRelease;
     this._broadcastChannel.onmessage = this._onMessage.bind(this);
   }
+  get lockKey() {
+    return this._lockKey;
+  }
   async acquire() {
     this._broadcastChannel.postMessage({
       message: Message.ACQUIRING
     });
     try {
+      log11("aquiring lock...", {}, {
+        file: "vault-resource-lock.ts",
+        line: 44,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
       await asyncTimeout(this._requestLock(), 3e3);
+      log11("acquired lock", {}, {
+        file: "vault-resource-lock.ts",
+        line: 46,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
     } catch (e) {
+      log11("stealing lock...", {}, {
+        file: "vault-resource-lock.ts",
+        line: 48,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
       await this._requestLock(true);
+      log11("stolen lock", {}, {
+        file: "vault-resource-lock.ts",
+        line: 50,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
     }
   }
   async release() {
@@ -2898,11 +3135,11 @@ var VaultResourceLock = class {
     }
   }
   async _requestLock(steal = false) {
-    log10("requesting lock...", {
+    log11("requesting lock...", {
       steal
     }, {
       file: "vault-resource-lock.ts",
-      line: 56,
+      line: 65,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2915,16 +3152,16 @@ var VaultResourceLock = class {
       acquired.wake();
       this._releaseTrigger = new Trigger5();
       await this._releaseTrigger.wait();
-      log10("releasing lock...", {}, {
+      log11("releasing lock...", {}, {
         file: "vault-resource-lock.ts",
-        line: 65,
+        line: 74,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       await ((_b = this._onRelease) == null ? void 0 : _b.call(this));
-      log10("released lock", {}, {
+      log11("released lock", {}, {
         file: "vault-resource-lock.ts",
-        line: 67,
+        line: 76,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -2933,20 +3170,23 @@ var VaultResourceLock = class {
       await ((_a = this._onRelease) == null ? void 0 : _a.call(this));
     });
     await acquired.wait();
-    log10("recieved lock", {
+    log11("recieved lock", {
       steal
     }, {
       file: "vault-resource-lock.ts",
-      line: 74,
+      line: 83,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
 };
+__decorate3([
+  logInfo
+], VaultResourceLock.prototype, "lockKey", null);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
 import { Trigger as Trigger7 } from "@dxos/async";
-import { log as log12 } from "@dxos/log";
+import { log as log13 } from "@dxos/log";
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from "@dxos/messaging";
 import { NetworkManager, WebRTCTransportProxyFactory } from "@dxos/network-manager";
 
@@ -2954,7 +3194,7 @@ import { NetworkManager, WebRTCTransportProxyFactory } from "@dxos/network-manag
 import assert11 from "@dxos/node-std/assert";
 import { asyncTimeout as asyncTimeout2, Trigger as Trigger6 } from "@dxos/async";
 import { iframeServiceBundle as iframeServiceBundle2, workerServiceBundle as workerServiceBundle2 } from "@dxos/client";
-import { log as log11, logInfo } from "@dxos/log";
+import { log as log12, logInfo as logInfo2 } from "@dxos/log";
 import { createProtoRpcPeer as createProtoRpcPeer3 } from "@dxos/rpc";
 import { Callback } from "@dxos/util";
 
@@ -3012,7 +3252,7 @@ var ClientRpcServer = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
-var __decorate3 = function(decorators, target, key, desc) {
+var __decorate4 = function(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")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -3076,7 +3316,7 @@ var WorkerSession = class {
               try {
                 await this.close();
               } catch (err) {
-                log11.catch(err, {}, {
+                log12.catch(err, {}, {
                   file: "worker-session.ts",
                   line: 107,
                   scope: this,
@@ -3094,7 +3334,7 @@ var WorkerSession = class {
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
-    log11.info("opening..", {}, {
+    log12.info("opening..", {}, {
       file: "worker-session.ts",
       line: 121,
       scope: this,
@@ -3112,7 +3352,7 @@ var WorkerSession = class {
       try {
         await this._iframeRpc.rpc.IframeService.heartbeat();
       } catch (err1) {
-        log11.warn("Heartbeat failed", {
+        log12.warn("Heartbeat failed", {
           err: err1
         }, {
           file: "worker-session.ts",
@@ -3123,7 +3363,7 @@ var WorkerSession = class {
         try {
           await this.close();
         } catch (err) {
-          log11.catch(err, {}, {
+          log12.catch(err, {}, {
             file: "worker-session.ts",
             line: 137,
             scope: this,
@@ -3134,7 +3374,7 @@ var WorkerSession = class {
     }, this._options.heartbeatInterval);
   }
   async close() {
-    log11.info("closing..", {}, {
+    log12.info("closing..", {}, {
       file: "worker-session.ts",
       line: 144,
       scope: this,
@@ -3143,7 +3383,7 @@ var WorkerSession = class {
     try {
       await this.onClose.callIfSet();
     } catch (err) {
-      log11.catch(err, {}, {
+      log12.catch(err, {}, {
         file: "worker-session.ts",
         line: 148,
         scope: this,
@@ -3162,7 +3402,7 @@ var WorkerSession = class {
     try {
       await asyncTimeout2(this._shellClientRpc.open(), 1e3);
     } catch (e) {
-      log11.info("No shell connected.", {}, {
+      log12.info("No shell connected.", {}, {
         file: "worker-session.ts",
         line: 162,
         scope: this,
@@ -3171,8 +3411,8 @@ var WorkerSession = class {
     }
   }
 };
-__decorate3([
-  logInfo
+__decorate4([
+  logInfo2
 ], WorkerSession.prototype, "origin", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
@@ -3186,7 +3426,7 @@ var WorkerRuntime = class {
     this._clientServices = new ClientServicesHost();
   }
   async start() {
-    log12("starting...", {}, {
+    log13("starting...", {}, {
       file: "worker-runtime.ts",
       line: 44,
       scope: this,
@@ -3207,7 +3447,7 @@ var WorkerRuntime = class {
       });
       await this._clientServices.open();
       this._ready.wake(void 0);
-      log12("started", {}, {
+      log13("started", {}, {
         file: "worker-runtime.ts",
         line: 61,
         scope: this,
@@ -3215,7 +3455,7 @@ var WorkerRuntime = class {
       });
     } catch (err) {
       this._ready.wake(err);
-      log12.catch(err, {}, {
+      log13.catch(err, {}, {
         file: "worker-runtime.ts",
         line: 64,
         scope: this,
@@ -3273,7 +3513,7 @@ import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore } from "@dxos/echo-pipeline";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { Keyring } from "@dxos/keyring";
-import { log as log13 } from "@dxos/log";
+import { log as log14 } from "@dxos/log";
 var ServiceContext = class {
   // prettier-ignore
   constructor(storage, networkManager, modelFactory) {
@@ -3310,7 +3550,7 @@ var ServiceContext = class {
     });
   }
   async open() {
-    log13("opening...", {}, {
+    log14("opening...", {}, {
       file: "service-context.ts",
       line: 94,
       scope: this,
@@ -3322,7 +3562,7 @@ var ServiceContext = class {
     if (this.identityManager.identity) {
       await this._initialize();
     }
-    log13("opened", {}, {
+    log14("opened", {}, {
       file: "service-context.ts",
       line: 101,
       scope: this,
@@ -3331,7 +3571,7 @@ var ServiceContext = class {
   }
   async close() {
     var _a, _b;
-    log13("closing...", {}, {
+    log14("closing...", {}, {
       file: "service-context.ts",
       line: 105,
       scope: this,
@@ -3344,7 +3584,7 @@ var ServiceContext = class {
     await this.feedStore.close();
     await this.networkManager.close();
     this.dataServiceSubscriptions.clear();
-    log13("closed", {}, {
+    log14("closed", {}, {
       file: "service-context.ts",
       line: 113,
       scope: this,
@@ -3352,7 +3592,7 @@ var ServiceContext = class {
     });
   }
   async reset() {
-    log13("resetting...", {}, {
+    log14("resetting...", {}, {
       file: "service-context.ts",
       line: 117,
       scope: this,
@@ -3360,7 +3600,7 @@ var ServiceContext = class {
     });
     await this.close();
     await this.storage.reset();
-    log13("reset", {}, {
+    log14("reset", {}, {
       file: "service-context.ts",
       line: 120,
       scope: this,
@@ -3380,7 +3620,7 @@ var ServiceContext = class {
   // Called when identity is created.
   async _initialize() {
     var _a;
-    log13("initializing spaces...", {}, {
+    log14("initializing spaces...", {}, {
       file: "service-context.ts",
       line: 139,
       scope: this,
@@ -3414,7 +3654,7 @@ var ServiceContext = class {
           return;
         }
         if (!this.dataSpaceManager) {
-          log13("dataSpaceManager not initialized yet, ignoring space admission", {
+          log14("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
             file: "service-context.ts",
@@ -3425,7 +3665,7 @@ var ServiceContext = class {
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          log13("space already exists, ignoring space admission", {
+          log14("space already exists, ignoring space admission", {
             details: assertion
           }, {
             file: "service-context.ts",
@@ -3436,7 +3676,7 @@ var ServiceContext = class {
           return;
         }
         try {
-          log13("accepting space recorded in halo", {
+          log14("accepting space recorded in halo", {
             details: assertion
           }, {
             file: "service-context.ts",
@@ -3449,7 +3689,7 @@ var ServiceContext = class {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          log13.catch(err, {}, {
+          log14.catch(err, {}, {
             file: "service-context.ts",
             line: 197,
             scope: this,
@@ -3497,7 +3737,8 @@ var ClientServicesHost = class {
     // TODO(wittjosiah): Turn this on by default.
     lockKey
   } = {}) {
-    this._statusUpdate = new Event6();
+    this._statusUpdate = new Event7();
+    this._opening = false;
     this._open = false;
     this._storage = storage;
     this._modelFactory = modelFactory;
@@ -3509,7 +3750,9 @@ var ClientServicesHost = class {
     }
     this._resourceLock = lockKey ? new VaultResourceLock({
       lockKey,
-      onAcquire: () => this.open(),
+      onAcquire: () => {
+        this._opening || this.open();
+      },
       onRelease: () => this.close()
     }) : void 0;
     this._systemService = new SystemServiceImpl({
@@ -3565,20 +3808,23 @@ var ClientServicesHost = class {
     }
   }
   async open() {
-    var _a, _b;
+    var _a, _b, _c;
     if (this._open) {
       return;
     }
     assert12(this._config, "config not set");
     assert12(this._storage, "storage not set");
     assert12(this._networkManager, "network manager not set");
-    log14("opening...", {}, {
+    this._opening = true;
+    log15("opening...", {
+      lockKey: (_a = this._resourceLock) == null ? void 0 : _a.lockKey
+    }, {
       file: "service-host.ts",
-      line: 166,
+      line: 170,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    await ((_a = this._resourceLock) == null ? void 0 : _a.acquire());
+    await ((_b = this._resourceLock) == null ? void 0 : _b.acquire());
     this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._modelFactory);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
@@ -3607,14 +3853,15 @@ var ClientServicesHost = class {
       })
     });
     await this._serviceContext.open();
+    this._opening = false;
     this._open = true;
     this._statusUpdate.emit();
-    const deviceKey = (_b = this._serviceContext.identityManager.identity) == null ? void 0 : _b.deviceKey;
-    log14("opened", {
+    const deviceKey = (_c = this._serviceContext.identityManager.identity) == null ? void 0 : _c.deviceKey;
+    log15("opened", {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 219,
+      line: 224,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3625,11 +3872,11 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    log14("closing...", {
+    log15("closing...", {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 228,
+      line: 233,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3639,11 +3886,11 @@ var ClientServicesHost = class {
     await this._serviceContext.close();
     this._open = false;
     this._statusUpdate.emit();
-    log14("closed", {
+    log15("closed", {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 233,
+      line: 238,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3674,7 +3921,7 @@ var LocalClientServices = class {
 
 // packages/sdk/client-services/src/packlets/services/utils.ts
 import { Config } from "@dxos/config";
-import { log as log15 } from "@dxos/log";
+import { log as log16 } from "@dxos/log";
 import { MemorySignalManager as MemorySignalManager2, MemorySignalManagerContext as MemorySignalManagerContext2, WebsocketSignalManager as WebsocketSignalManager2 } from "@dxos/messaging";
 import { createWebRTCTransportFactory, MemoryTransportFactory, NetworkManager as NetworkManager2 } from "@dxos/network-manager";
 var fromHost = (config = new Config()) => {
@@ -3697,7 +3944,7 @@ var createNetworkManager = (config, options = {}) => {
       transportFactory
     });
   }
-  log15.warn("P2P network is not configured.", {}, {
+  log16.warn("P2P network is not configured.", {}, {
     file: "utils.ts",
     line: 48,
     scope: void 0,
@@ -3710,7 +3957,7 @@ var createNetworkManager = (config, options = {}) => {
 };
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-var __decorate4 = function(decorators, target, key, desc) {
+var __decorate5 = function(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")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -3740,7 +3987,7 @@ var IFrameHostRuntime = class {
   }
   async start() {
     var _a;
-    log16("starting...", {}, {
+    log17("starting...", {}, {
       file: "iframe-host-runtime.ts",
       line: 67,
       scope: this,
@@ -3791,7 +4038,7 @@ var IFrameHostRuntime = class {
         (_a = this._shellRuntime) == null ? void 0 : _a.open()
       ]);
       this._ready.wake(void 0);
-      log16("started", {}, {
+      log17("started", {}, {
         file: "iframe-host-runtime.ts",
         line: 110,
         scope: this,
@@ -3799,7 +4046,7 @@ var IFrameHostRuntime = class {
       });
     } catch (err) {
       this._ready.wake(err);
-      log16.catch(err, {}, {
+      log17.catch(err, {}, {
         file: "iframe-host-runtime.ts",
         line: 113,
         scope: this,
@@ -3809,7 +4056,7 @@ var IFrameHostRuntime = class {
   }
   async stop() {
     var _a;
-    log16("stopping...", {}, {
+    log17("stopping...", {}, {
       file: "iframe-host-runtime.ts",
       line: 118,
       scope: this,
@@ -3818,7 +4065,7 @@ var IFrameHostRuntime = class {
     await this._clientRpc.close();
     await this._clientServices.close();
     await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
-    log16("stopped", {}, {
+    log17("stopped", {}, {
       file: "iframe-host-runtime.ts",
       line: 122,
       scope: this,
@@ -3826,8 +4073,8 @@ var IFrameHostRuntime = class {
     });
   }
 };
-__decorate4([
-  logInfo2
+__decorate5([
+  logInfo3
 ], IFrameHostRuntime.prototype, "origin", void 0);
 
 export {
@@ -3865,4 +4112,4 @@ export {
   LocalClientServices,
   fromHost
 };
-//# sourceMappingURL=chunk-ZIQUYEJS.mjs.map
+//# sourceMappingURL=chunk-E3FD43YN.mjs.map