@dxos/client-services 0.1.41 → 0.1.45-next.45667d4

package/dist/lib/browser/{chunk-T73F4MV4.mjs → chunk-IHSMRQ3L.mjs}

@@ -8,9 +8,6 @@ import { PublicKey } from "@dxos/keys";
 import { ComplexMap } from "@dxos/util";
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new Stream(({ next }) => {
-    if ((feedKeys == null ? void 0 : feedKeys.length) === 0) {
-      return;
-    }
     const subscriptions = new EventSubscriptions();
     const feedMap = new ComplexMap(PublicKey.hash);
     const update = () => {
@@ -19,13 +16,14 @@ var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
         if (!feedMap.has(feed.key)) {
           feedMap.set(feed.key, feed);
           feed.on("close", update);
-          subscriptions.add(feed.off("close", update));
+          subscriptions.add(() => feed.off("close", update));
         }
       });
       next({
         feeds: Array.from(feedMap.values()).map((feed) => ({
           feedKey: feed.key,
-          length: feed.properties.length
+          length: feed.properties.length,
+          diskUsage: feed.core.byteLength
         }))
       });
     };
@@ -79,10 +77,10 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
 import { Stream as Stream2 } from "@dxos/codec-protobuf";
 import { Context } from "@dxos/context";
 import { PublicKey as PublicKey2 } from "@dxos/keys";
-var subscribeToNetworkStatus = ({ networkManager }) => new Stream2(({ next, close }) => {
+var subscribeToNetworkStatus = ({ signalManager }) => new Stream2(({ next, close }) => {
   const update = () => {
     try {
-      const status = networkManager.signalManager.getStatus();
+      const status = signalManager.getStatus();
       next({
         servers: status
       });
@@ -90,12 +88,12 @@ var subscribeToNetworkStatus = ({ networkManager }) => new Stream2(({ next, clos
       close(err);
     }
   };
-  networkManager.signalManager.statusChanged.on(update);
+  signalManager.statusChanged.on(() => update());
   update();
 });
-var subscribeToSignal = ({ networkManager }) => new Stream2(({ next }) => {
+var subscribeToSignal = ({ signalManager }) => new Stream2(({ next }) => {
   const ctx = new Context();
-  networkManager.signalManager.onMessage.on(ctx, (message) => {
+  signalManager.onMessage.on(ctx, (message) => {
     next({
       message: {
         author: message.author.asUint8Array(),
@@ -105,7 +103,7 @@ var subscribeToSignal = ({ networkManager }) => new Stream2(({ next }) => {
       receivedAt: new Date()
     });
   });
-  networkManager.signalManager.swarmEvent.on(ctx, (swarmEvent) => {
+  signalManager.swarmEvent.on(ctx, (swarmEvent) => {
     next({
       swarmEvent: swarmEvent.swarmEvent,
       receivedAt: new Date()
@@ -204,16 +202,16 @@ import { Event as AsyncEvent } from "@dxos/async";
 import { Stream as Stream5 } from "@dxos/codec-protobuf";
 
 // packages/sdk/client-services/src/packlets/devtools/keys.ts
+import { scheduleTask } from "@dxos/async";
 import { Stream as Stream4 } from "@dxos/codec-protobuf";
-var subscribeToKeyringKeys = ({ keyring }) => new Stream4(({ next }) => {
-  const update = () => {
+var subscribeToKeyringKeys = ({ keyring }) => new Stream4(({ next, ctx }) => {
+  const update = async () => {
     next({
-      keys: keyring.list()
+      keys: await keyring.list()
     });
   };
-  const unsubscribe = keyring.keysUpdate.on(update);
-  update();
-  return unsubscribe;
+  keyring.keysUpdate.on(ctx, update);
+  scheduleTask(ctx, update);
 });
 
 // packages/sdk/client-services/src/packlets/devtools/devtools.ts
@@ -238,6 +236,24 @@ var DevtoolsServiceImpl = class {
   getConfig(request) {
     throw new Error();
   }
+  async getStorageInfo() {
+    var _a, _b, _c, _d, _e;
+    const storageUsage = (_c = await ((_b = (_a = this.params.context.storage).getDiskInfo) == null ? void 0 : _b.call(_a))) != null ? _c : {
+      used: 0
+    };
+    const navigatorInfo = typeof navigator === "object" ? await navigator.storage.estimate() : void 0;
+    return {
+      type: this.params.context.storage.type,
+      storageUsage: storageUsage.used,
+      originUsage: (_d = navigatorInfo == null ? void 0 : navigatorInfo.usage) != null ? _d : 0,
+      usageQuota: (_e = navigatorInfo == null ? void 0 : navigatorInfo.quota) != null ? _e : 0
+    };
+  }
+  async getSnapshots() {
+    return {
+      snapshots: await this.params.context.snapshotStore.listSnapshots()
+    };
+  }
   resetStorage(request) {
     throw new Error();
   }
@@ -288,12 +304,12 @@ var DevtoolsServiceImpl = class {
   }
   subscribeToSignalStatus(request) {
     return subscribeToNetworkStatus({
-      networkManager: this.params.context.networkManager
+      signalManager: this.params.context.signalManager
     });
   }
   subscribeToSignal() {
     return subscribeToSignal({
-      networkManager: this.params.context.networkManager
+      signalManager: this.params.context.signalManager
     });
   }
   subscribeToSwarmInfo() {
@@ -578,19 +594,18 @@ var IdentityManager = class {
     this._feedStore = _feedStore;
     this._spaceManager = _spaceManager;
     this.stateUpdate = new Event2();
-    this._instanceId = PublicKey3.random().toHex();
   }
   get identity() {
     return this._identity;
   }
   async open() {
     var _a;
-    log3.trace("dxos.halo.identity-manager", trace.begin({
-      id: this._instanceId,
-      parentId: this._traceParent
+    const traceId = PublicKey3.random().toHex();
+    log3.trace("dxos.halo.identity-manager.open", trace.begin({
+      id: traceId
     }), {
       file: "identity-manager.ts",
-      line: 72,
+      line: 70,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -600,7 +615,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       file: "identity-manager.ts",
-      line: 76,
+      line: 74,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -613,31 +628,31 @@ var IdentityManager = class {
         displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
       }, {
         file: "identity-manager.ts",
-        line: 81,
+        line: 79,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       this.stateUpdate.emit();
     }
-  }
-  async close() {
-    var _a;
-    await ((_a = this._identity) == null ? void 0 : _a.close());
-    log3.trace("dxos.halo.identity-manager", trace.end({
-      id: this._instanceId
+    log3.trace("dxos.halo.identity-manager.open", trace.end({
+      id: traceId
     }), {
       file: "identity-manager.ts",
-      line: 91,
+      line: 85,
       scope: this,
       callSite: (f, a) => f(...a)
     });
   }
+  async close() {
+    var _a;
+    await ((_a = this._identity) == null ? void 0 : _a.close());
+  }
   async createIdentity({ displayName } = {}) {
     var _a;
     assert2(!this._identity, "Identity already exists.");
     log3("creating identity...", {}, {
       file: "identity-manager.ts",
-      line: 96,
+      line: 94,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -686,7 +701,7 @@ var IdentityManager = class {
       displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
     }, {
       file: "identity-manager.ts",
-      line: 151,
+      line: 149,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -696,7 +711,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       file: "identity-manager.ts",
-      line: 157,
+      line: 155,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -711,7 +726,7 @@ var IdentityManager = class {
       params
     }, {
       file: "identity-manager.ts",
-      line: 165,
+      line: 163,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -737,7 +752,7 @@ var IdentityManager = class {
       displayName: (_a = this._identity.profileDocument) == null ? void 0 : _a.displayName
     }, {
       file: "identity-manager.ts",
-      line: 185,
+      line: 183,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -747,7 +762,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       file: "identity-manager.ts",
-      line: 191,
+      line: 189,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -759,7 +774,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       file: "identity-manager.ts",
-      line: 197,
+      line: 195,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -792,7 +807,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       file: "identity-manager.ts",
-      line: 225,
+      line: 223,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -809,7 +824,8 @@ var IdentityManager = class {
       },
       swarmIdentity,
       onNetworkConnection: () => {
-      }
+      },
+      memberKey: identityKey
     });
   }
 };
@@ -929,8 +945,8 @@ var DeviceInvitationProtocol = class {
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
 import assert6 from "@dxos/node-std/assert";
-import { PushStream, scheduleTask, sleep, TimeoutError, Trigger as Trigger3 } from "@dxos/async";
-import { AuthenticatingInvitationObservable, AUTHENTICATION_CODE_LENGTH, CancellableInvitationObservable, INVITATION_TIMEOUT, ON_CLOSE_DELAY } from "@dxos/client";
+import { PushStream, scheduleTask as scheduleTask2, sleep, TimeoutError, Trigger as Trigger3 } from "@dxos/async";
+import { AuthenticatingInvitationObservable, AUTHENTICATION_CODE_LENGTH, CancellableInvitationObservable, INVITATION_TIMEOUT, ON_CLOSE_DELAY } from "@dxos/client-protocol";
 import { Context as Context4 } from "@dxos/context";
 import { generatePasscode } from "@dxos/credentials";
 import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2 } from "@dxos/errors";
@@ -979,11 +995,10 @@ var InvitationHostExtension = class extends RpcExtension {
         introduce: async (request) => {
           const traceId = PublicKey4.random().toHex();
           log4.trace("dxos.sdk.invitation-handler.host.introduce", trace2.begin({
-            id: traceId,
-            parentId: this._traceParent
+            id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 78,
+            line: 76,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -992,7 +1007,7 @@ var InvitationHostExtension = class extends RpcExtension {
             id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 83,
+            line: 78,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1001,11 +1016,10 @@ var InvitationHostExtension = class extends RpcExtension {
         authenticate: async (request) => {
           const traceId = PublicKey4.random().toHex();
           log4.trace("dxos.sdk.invitation-handler.host.authenticate", trace2.begin({
-            id: traceId,
-            parentId: this._traceParent
+            id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 89,
+            line: 84,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1017,7 +1031,7 @@ var InvitationHostExtension = class extends RpcExtension {
             }
           }), {
             file: "invitation-extension.ts",
-            line: 94,
+            line: 86,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1026,11 +1040,10 @@ var InvitationHostExtension = class extends RpcExtension {
         admit: async (request) => {
           const traceId = PublicKey4.random().toHex();
           log4.trace("dxos.sdk.invitation-handler.host.admit", trace2.begin({
-            id: traceId,
-            parentId: this._traceParent
+            id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 100,
+            line: 92,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1039,7 +1052,7 @@ var InvitationHostExtension = class extends RpcExtension {
             id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 105,
+            line: 94,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1113,7 +1126,7 @@ var InvitationGuestExtension = class extends RpcExtension {
     try {
       log4("begin options", {}, {
         file: "invitation-extension.ts",
-        line: 189,
+        line: 178,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1125,7 +1138,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       }));
       log4("end options", {}, {
         file: "invitation-extension.ts",
-        line: 192,
+        line: 181,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1139,7 +1152,7 @@ var InvitationGuestExtension = class extends RpcExtension {
     } catch (err) {
       log4("openError", err, {
         file: "invitation-extension.ts",
-        line: 202,
+        line: 191,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1149,7 +1162,7 @@ var InvitationGuestExtension = class extends RpcExtension {
   async onClose() {
     log4("onClose", {}, {
       file: "invitation-extension.ts",
-      line: 208,
+      line: 197,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1160,6 +1173,9 @@ var InvitationGuestExtension = class extends RpcExtension {
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
 var MAX_OTP_ATTEMPTS = 3;
 var InvitationsHandler = class {
+  /**
+  * @internal
+  */
   constructor(_networkManager) {
     this._networkManager = _networkManager;
   }
@@ -1190,7 +1206,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 99,
+        line: 98,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1208,7 +1224,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             file: "invitations-handler.ts",
-            line: 112,
+            line: 111,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1227,7 +1243,7 @@ var InvitationsHandler = class {
             authCode: code
           }, {
             file: "invitations-handler.ts",
-            line: 131,
+            line: 130,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1236,7 +1252,7 @@ var InvitationsHandler = class {
             case Invitation2.AuthMethod.NONE: {
               log5("authentication not required", {}, {
                 file: "invitations-handler.ts",
-                line: 136,
+                line: 135,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1261,7 +1277,7 @@ var InvitationsHandler = class {
                 authMethod: invitation.authMethod
               }, {
                 file: "invitations-handler.ts",
-                line: 154,
+                line: 153,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1290,15 +1306,14 @@ var InvitationsHandler = class {
           }
         },
         onOpen: () => {
-          scheduleTask(ctx, async () => {
+          scheduleTask2(ctx, async () => {
             const traceId = PublicKey5.random().toHex();
             try {
               log5.trace("dxos.sdk.invitations-handler.host.onOpen", trace3.begin({
-                id: traceId,
-                parentId: this._traceParent
+                id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 189,
+                line: 188,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1306,7 +1321,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 193,
+                line: 189,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1322,7 +1337,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 196,
+                line: 192,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1334,7 +1349,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 198,
+                line: 194,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1344,7 +1359,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 201,
+                  line: 197,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1355,7 +1370,7 @@ var InvitationsHandler = class {
               } else {
                 log5.error("failed", err, {
                   file: "invitations-handler.ts",
-                  line: 204,
+                  line: 200,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1366,7 +1381,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 207,
+                line: 203,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1387,7 +1402,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               file: "invitations-handler.ts",
-              line: 221,
+              line: 217,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1398,7 +1413,7 @@ var InvitationsHandler = class {
           } else {
             log5.error("failed", err, {
               file: "invitations-handler.ts",
-              line: 224,
+              line: 220,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1406,10 +1421,9 @@ var InvitationsHandler = class {
           }
         }
       });
-      extension._traceParent = this._traceParent;
       return extension;
     };
-    scheduleTask(ctx, async () => {
+    scheduleTask2(ctx, async () => {
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
         topic,
@@ -1459,7 +1473,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             file: "invitations-handler.ts",
-            line: 279,
+            line: 274,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1469,7 +1483,7 @@ var InvitationsHandler = class {
         } else {
           log5.warn("auth failed", err, {
             file: "invitations-handler.ts",
-            line: 282,
+            line: 277,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1483,7 +1497,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 290,
+        line: 285,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1498,7 +1512,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               file: "invitations-handler.ts",
-              line: 300,
+              line: 295,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1506,27 +1520,26 @@ var InvitationsHandler = class {
               stream.error(new Error("Remote peer disconnected."));
             }
           });
-          scheduleTask(ctx, async () => {
+          scheduleTask2(ctx, async () => {
             const traceId = PublicKey5.random().toHex();
             try {
               log5.trace("dxos.sdk.invitations-handler.guest.onOpen", trace3.begin({
-                id: traceId,
-                parentId: this._traceParent
+                id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 309,
+                line: 304,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
               if (++connectionCount > 1) {
                 throw new Error(`multiple connections detected: ${connectionCount}`);
               }
-              scheduleTask(ctx, () => ctx.raise(new TimeoutError(timeout)), timeout);
+              scheduleTask2(ctx, () => ctx.raise(new TimeoutError(timeout)), timeout);
               log5("connected", {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 320,
+                line: 312,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1537,7 +1550,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 324,
+                line: 316,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1547,7 +1560,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 file: "invitations-handler.ts",
-                line: 328,
+                line: 320,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1559,7 +1572,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   log5("guest waiting for authentication code...", {}, {
                     file: "invitations-handler.ts",
-                    line: 337,
+                    line: 329,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1571,7 +1584,7 @@ var InvitationsHandler = class {
                   });
                   log5("sending authentication request", {}, {
                     file: "invitations-handler.ts",
-                    line: 341,
+                    line: 333,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1592,7 +1605,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         file: "invitations-handler.ts",
-                        line: 352,
+                        line: 344,
                         scope: this,
                         callSite: (f, a) => f(...a)
                       });
@@ -1609,7 +1622,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 363,
+                line: 355,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1620,7 +1633,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 371,
+                line: 363,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1632,7 +1645,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 373,
+                line: 365,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1642,7 +1655,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 376,
+                  line: 368,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1652,7 +1665,7 @@ var InvitationsHandler = class {
               } else {
                 log5("auth failed", err, {
                   file: "invitations-handler.ts",
-                  line: 379,
+                  line: 371,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1663,7 +1676,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 382,
+                line: 374,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1681,7 +1694,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               file: "invitations-handler.ts",
-              line: 393,
+              line: 385,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1691,7 +1704,7 @@ var InvitationsHandler = class {
           } else {
             log5("auth failed", err, {
               file: "invitations-handler.ts",
-              line: 396,
+              line: 388,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1701,7 +1714,7 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    scheduleTask(ctx, async () => {
+    scheduleTask2(ctx, async () => {
       assert6(invitation.swarmKey);
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
@@ -1940,7 +1953,7 @@ var SpaceInvitationProtocol = class {
       guest: deviceKey
     }, {
       file: "space-invitation-protocol.ts",
-      line: 51,
+      line: 50,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1993,353 +2006,60 @@ var SpaceInvitationProtocol = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/storage/storage.ts
-import { InvalidConfigError } from "@dxos/errors";
-import { Runtime } from "@dxos/protocols/proto/dxos/config";
-import { createStorage, StorageType } from "@dxos/random-access-storage";
-var StorageDriver = Runtime.Client.Storage.StorageDriver;
-var createStorageObjects = (config) => {
-  const { path = "dxos/storage", storageType, keyStorage, persistent = false } = config != null ? config : {};
-  if (persistent && storageType === StorageDriver.RAM) {
-    throw new InvalidConfigError("RAM storage cannot be used in persistent mode.");
-  }
-  if (!persistent && storageType !== void 0 && storageType !== StorageDriver.RAM) {
-    throw new InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
-  }
-  if (persistent && keyStorage === StorageDriver.RAM) {
-    throw new InvalidConfigError("RAM key storage cannot be used in persistent mode.");
-  }
-  if (!persistent && keyStorage !== StorageDriver.RAM && keyStorage !== void 0) {
-    throw new InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
-  }
-  return {
-    storage: createStorage({
-      type: persistent ? toStorageType(storageType) : StorageType.RAM,
-      root: `${path}/`
-    })
-  };
-};
-var toStorageType = (type) => {
-  switch (type) {
-    case void 0:
-      return void 0;
-    case StorageDriver.RAM:
-      return StorageType.RAM;
-    case StorageDriver.CHROME:
-      return StorageType.CHROME;
-    case StorageDriver.FIREFOX:
-      return StorageType.FIREFOX;
-    case StorageDriver.IDB:
-      return StorageType.IDB;
-    case StorageDriver.NODE:
-      return StorageType.NODE;
-    case StorageDriver.WEBFS:
-      return StorageType.WEBFS;
-    default:
-      throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
-  }
-};
+// packages/sdk/client-services/src/packlets/spaces/data-space.ts
+import { Event as Event5, scheduleTask as scheduleTask4, trackLeaks } from "@dxos/async";
+import { cancelWithContext as cancelWithContext2, Context as Context6 } from "@dxos/context";
+import { timed } from "@dxos/debug";
+import { createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { CancelledError, SystemError } from "@dxos/errors";
+import { PublicKey as PublicKey7 } from "@dxos/keys";
+import { log as log9 } from "@dxos/log";
+import { SpaceState } from "@dxos/protocols/proto/dxos/client/services";
+import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { ComplexSet as ComplexSet2 } from "@dxos/util";
 
-// packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
+// packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
 import assert9 from "@dxos/node-std/assert";
-import { Event as Event4 } from "@dxos/async";
-import { appServiceBundle, shellServiceBundle } from "@dxos/client";
-import { ShellLayout } from "@dxos/protocols/proto/dxos/iframe";
-import { createProtoRpcPeer } from "@dxos/rpc";
-var ShellRuntimeImpl = class {
-  constructor(_port) {
-    this._port = _port;
-    this.layoutUpdate = new Event4();
-    this._layout = ShellLayout.DEFAULT;
-  }
-  get layout() {
-    return this._layout;
-  }
-  get invitationCode() {
-    return this._invitationCode;
-  }
-  get spaceKey() {
-    return this._spaceKey;
-  }
-  setLayout(layout, options = {}) {
-    this._layout = layout;
-    this._invitationCode = options.invitationCode;
-    this._spaceKey = options.spaceKey;
-    this.layoutUpdate.emit({
-      layout,
-      ...options
-    });
-  }
-  async setAppContext(context) {
-    assert9(this._appRpc, "runtime not open");
-    await this._appRpc.rpc.AppService.setContext(context);
+import { DeferredTask, Event as Event4, scheduleTask as scheduleTask3, sleep as sleep2, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
+import { Context as Context5, rejectOnDispose } from "@dxos/context";
+import { PublicKey as PublicKey6 } from "@dxos/keys";
+import { log as log8 } from "@dxos/log";
+import { schema as schema3 } from "@dxos/protocols";
+import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
+import { ComplexMap as ComplexMap2, ComplexSet, entry } from "@dxos/util";
+var DEFAULT_RETRY_TIMEOUT = 1e3;
+var DEFAULT_SUCCESS_DELAY = 1e3;
+var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
+var NotarizationPlugin = class {
+  constructor() {
+    this._ctx = new Context5();
+    this._extensionOpened = new Event4();
+    this._extensions = /* @__PURE__ */ new Set();
+    this._processedCredentials = new ComplexSet(PublicKey6.hash);
+    this._processCredentialsTriggers = new ComplexMap2(PublicKey6.hash);
   }
   async open() {
-    this._appRpc = createProtoRpcPeer({
-      requested: appServiceBundle,
-      exposed: shellServiceBundle,
-      handlers: {
-        ShellService: {
-          setLayout: async (request) => {
-            this._layout = request.layout;
-            this._invitationCode = request.invitationCode;
-            this._spaceKey = request.spaceKey;
-            this.layoutUpdate.emit(request);
-          }
-        }
-      },
-      port: this._port
-    });
-    await this._appRpc.open();
   }
   async close() {
-    var _a;
-    await ((_a = this._appRpc) == null ? void 0 : _a.close());
-    this._appRpc = void 0;
-  }
-};
-var MemoryShellRuntime = class {
-  constructor({ layout, invitationCode, spaceKey } = {}) {
-    this.layoutUpdate = new Event4();
-    this.contextUpdate = new Event4();
-    this._layout = layout != null ? layout : ShellLayout.DEFAULT;
-    this._invitationCode = invitationCode;
-    this._spaceKey = spaceKey;
-  }
-  get layout() {
-    return this._layout;
-  }
-  get invitationCode() {
-    return this._invitationCode;
-  }
-  get spaceKey() {
-    return this._spaceKey;
+    await this._ctx.dispose();
   }
-  setLayout(layout, options = {}) {
-    this._layout = layout;
-    this._invitationCode = options.invitationCode;
-    this._spaceKey = options.spaceKey;
-    this.layoutUpdate.emit({
-      layout,
-      ...options
+  /**
+  * Request credentials to be notarized.
+  */
+  async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
+    log8("notarize", {
+      credentials
+    }, {
+      file: "notarization-plugin.ts",
+      line: 85,
+      scope: this,
+      callSite: (f, a) => f(...a)
     });
-  }
-  async setAppContext(context) {
-    this.contextUpdate.emit(context);
-  }
-};
-
-// packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-import { Trigger as Trigger9 } from "@dxos/async";
-import { log as log20, 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 as getAsyncValue2 } from "@dxos/util";
-
-// packages/sdk/client-services/src/packlets/services/service-host.ts
-import assert14 from "@dxos/node-std/assert";
-import { Event as Event9 } from "@dxos/async";
-import { clientServiceBundle, createDefaultModelFactory, PublicKey as PublicKey10 } from "@dxos/client";
-import { DataServiceImpl } from "@dxos/echo-pipeline";
-import { log as log18 } from "@dxos/log";
-import { trace as trace6 } from "@dxos/protocols";
-import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
-
-// packages/sdk/client-services/src/packlets/devices/devices-service.ts
-import { EventSubscriptions as EventSubscriptions2 } from "@dxos/async";
-import { Stream as Stream8 } from "@dxos/codec-protobuf";
-import { DeviceKind } from "@dxos/protocols/proto/dxos/client/services";
-var DevicesServiceImpl = class {
-  constructor(_identityManager) {
-    this._identityManager = _identityManager;
-  }
-  updateDevice(request) {
-    throw new Error("Method not implemented.");
-  }
-  queryDevices() {
-    return new Stream8(({ next }) => {
-      const update = () => {
-        var _a;
-        const deviceKeys = (_a = this._identityManager.identity) == null ? void 0 : _a.authorizedDeviceKeys;
-        if (!deviceKeys) {
-          next({
-            devices: []
-          });
-        } else {
-          next({
-            devices: Array.from(deviceKeys.values()).map((key) => {
-              var _a2;
-              return {
-                deviceKey: key,
-                kind: ((_a2 = this._identityManager.identity) == null ? void 0 : _a2.deviceKey.equals(key)) ? DeviceKind.CURRENT : DeviceKind.TRUSTED
-              };
-            })
-          });
-        }
-      };
-      const subscriptions = new EventSubscriptions2();
-      subscriptions.add(this._identityManager.stateUpdate.on(() => {
-        update();
-        if (this._identityManager.identity) {
-          subscriptions.add(this._identityManager.identity.stateUpdate.on(() => {
-            update();
-          }));
-        }
-      }));
-      update();
-      return () => subscriptions.clear();
-    });
-  }
-};
-
-// packages/sdk/client-services/src/packlets/logging/logging-service.ts
-import { Event as Event5 } from "@dxos/async";
-import { Stream as Stream9 } from "@dxos/codec-protobuf";
-import { log as log8, shouldLog } from "@dxos/log";
-var LoggingServiceImpl = class {
-  constructor() {
-    this._logs = new Event5();
-    this._logProcessor = (_config, entry2) => {
-      this._logs.emit(entry2);
-    };
-  }
-  async open() {
-    log8.runtimeConfig.processors.push(this._logProcessor);
-  }
-  async close() {
-    const index = log8.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    log8.runtimeConfig.processors.splice(index, 1);
-  }
-  queryLogs(request) {
-    var _a;
-    const filters = ((_a = request.filters) == null ? void 0 : _a.length) ? request.filters : void 0;
-    return new Stream9(({ ctx, next }) => {
-      const handler = (entry2) => {
-        var _a2;
-        if (((_a2 = entry2.meta) == null ? void 0 : _a2.file.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
-          return;
-        }
-        if (shouldLog(entry2, filters)) {
-          next(jsonify(entry2));
-        }
-      };
-      ctx.onDispose(() => {
-        this._logs.off(handler);
-      });
-      this._logs.on(handler);
-    });
-  }
-};
-var jsonify = (value) => {
-  if (typeof value === "function") {
-    return null;
-  } else if (typeof value === "object" && value !== null) {
-    if (Array.isArray(value)) {
-      return value.map(jsonify);
-    } else {
-      if (typeof value.toJSON === "function") {
-        return value.toJSON();
-      }
-      const res = {};
-      for (const key of Object.keys(value)) {
-        res[key] = jsonify(value[key]);
-      }
-      return res;
-    }
-  } else {
-    return value;
-  }
-};
-
-// packages/sdk/client-services/src/packlets/network/network-service.ts
-import { Stream as Stream10 } from "@dxos/codec-protobuf";
-var NetworkServiceImpl = class {
-  constructor(networkManager) {
-    this.networkManager = networkManager;
-  }
-  subscribeToNetworkStatus() {
-    return new Stream10(({ next }) => {
-      const unsubscribe = this.networkManager.connectionStateChanged.on((state) => next({
-        state
-      }));
-      next({
-        state: this.networkManager.connectionState
-      });
-      return unsubscribe;
-    });
-  }
-  async setNetworkOptions(request) {
-    await this.networkManager.setConnectionState(request.state);
-  }
-};
-
-// packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-import assert11 from "@dxos/node-std/assert";
-import { Event as Event8, synchronized, trackLeaks as trackLeaks2 } from "@dxos/async";
-import { SpaceState as SpaceState2 } from "@dxos/client";
-import { cancelWithContext as cancelWithContext2, Context as Context7 } from "@dxos/context";
-import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
-import { SnapshotManager, spaceGenesis } from "@dxos/echo-pipeline";
-import { PublicKey as PublicKey8 } from "@dxos/keys";
-import { log as log11 } from "@dxos/log";
-import { trace as trace4 } from "@dxos/protocols";
-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 { Event as Event7, scheduleTask as scheduleTask3, trackLeaks } from "@dxos/async";
-import { SpaceState } from "@dxos/client";
-import { Context as Context6 } from "@dxos/context";
-import { timed } from "@dxos/debug";
-import { createMappedFeedWriter, DataPipeline } from "@dxos/echo-pipeline";
-import { CancelledError, SystemError } from "@dxos/errors";
-import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log10 } 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 assert10 from "@dxos/node-std/assert";
-import { DeferredTask, Event as Event6, scheduleTask as scheduleTask2, sleep as sleep2, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
-import { Context as Context5, rejectOnDispose } from "@dxos/context";
-import { PublicKey as PublicKey6 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
-import { schema as schema3 } from "@dxos/protocols";
-import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
-import { ComplexMap as ComplexMap2, ComplexSet, entry } from "@dxos/util";
-var DEFAULT_RETRY_TIMEOUT = 1e3;
-var DEFAULT_SUCCESS_DELAY = 1e3;
-var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
-var NotarizationPlugin = class {
-  constructor() {
-    this._ctx = new Context5();
-    this._extensionOpened = new Event6();
-    this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new ComplexSet(PublicKey6.hash);
-    this._processCredentialsTriggers = new ComplexMap2(PublicKey6.hash);
-  }
-  async open() {
-  }
-  async close() {
-    await this._ctx.dispose();
-  }
-  /**
-  * Request credentials to be notarized.
-  */
-  async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
-    log9("notarize", {
-      credentials
-    }, {
-      file: "notarization-plugin.ts",
-      line: 85,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    assert10(credentials.every((credential) => credential.id), "Credentials must have an id");
+    assert9(credentials.every((credential) => credential.id), "Credentials must have an id");
     const errors = new Trigger4();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        log9.warn("Notarization error", {
+        log8.warn("Notarization error", {
           err
         }, {
           file: "notarization-plugin.ts",
@@ -2353,8 +2073,8 @@ var NotarizationPlugin = class {
     });
     opCtx == null ? void 0 : opCtx.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      scheduleTask2(ctx, () => {
-        log9.warn("Notarization timeout", {
+      scheduleTask3(ctx, () => {
+        log8.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
@@ -2378,7 +2098,7 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          log9.warn("Exhausted all peers to notarize with", {
+          log8.warn("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
             file: "notarization-plugin.ts",
@@ -2387,11 +2107,11 @@ var NotarizationPlugin = class {
             callSite: (f, a) => f(...a)
           });
           peersTried.clear();
-          scheduleTask2(ctx, () => notarizeTask.schedule(), retryTimeout);
+          scheduleTask3(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
-        log9("try notarizing", {
+        log8("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
@@ -2403,7 +2123,7 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        log9("success", {}, {
+        log8("success", {}, {
           file: "notarization-plugin.ts",
           line: 142,
           scope: this,
@@ -2411,7 +2131,7 @@ var NotarizationPlugin = class {
         });
         await sleep2(successDelay);
       } catch (err) {
-        log9.warn("error notarizing (recoverable)", err, {
+        log8.warn("error notarizing (recoverable)", err, {
           file: "notarization-plugin.ts",
           line: 145,
           scope: this,
@@ -2428,7 +2148,7 @@ var NotarizationPlugin = class {
         allNotarized,
         errors.wait()
       ]);
-      log9("done", {}, {
+      log8("done", {}, {
         file: "notarization-plugin.ts",
         line: 155,
         scope: this,
@@ -2451,7 +2171,7 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    assert10(!this._writer, "Writer already set.");
+    assert9(!this._writer, "Writer already set.");
     this._writer = writer;
   }
   async _waitUntilProcessed(id) {
@@ -2469,7 +2189,7 @@ var NotarizationPlugin = class {
       throw new Error("Writer not set");
     }
     for (const credential of (_a = request.credentials) != null ? _a : []) {
-      assert10(credential.id, "Credential must have an id");
+      assert9(credential.id, "Credential must have an id");
       if (this._processedCredentials.has(credential.id)) {
         continue;
       }
@@ -2479,7 +2199,7 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        log9("extension opened", {
+        log8("extension opened", {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
@@ -2491,7 +2211,7 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        log9("extension closed", {
+        log8("extension closed", {
           peer: extension.localPeerId
         }, {
           file: "notarization-plugin.ts",
@@ -2553,7 +2273,12 @@ var DataSpace = class DataSpace2 {
   constructor(params) {
     this._ctx = new Context6();
     this._state = SpaceState.CLOSED;
-    this.stateUpdate = new Event7();
+    /**
+    * Error for _state === SpaceState.ERROR.
+    */
+    this.error = void 0;
+    this.stateUpdate = new Event5();
+    this.metrics = {};
     var _a;
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
@@ -2564,21 +2289,13 @@ var DataSpace = class DataSpace2 {
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
     this._callbacks = (_a = params.callbacks) != null ? _a : {};
-    this._dataPipeline = new DataPipeline({
-      modelFactory: params.modelFactory,
-      metadataStore: params.metadataStore,
-      snapshotManager: params.snapshotManager,
-      memberKey: params.memberKey,
-      spaceKey: this._inner.key,
-      feedInfoProvider: (feedKey) => this._inner.spaceState.feeds.get(feedKey),
-      snapshotId: params.snapshotId
-    });
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => new ComplexSet2(PublicKey7.hash, Array.from(this._inner.spaceState.members.keys())),
       update: this._inner.stateUpdate,
       authTimeout: AUTH_TIMEOUT2
     });
     this._notarizationPluginConsumer = this._inner.spaceState.registerProcessor(new NotarizationPlugin());
+    this._cache = params.cache;
   }
   get key() {
     return this._inner.key;
@@ -2594,7 +2311,7 @@ var DataSpace = class DataSpace2 {
     return this._inner;
   }
   get dataPipeline() {
-    return this._dataPipeline;
+    return this._inner.dataPipeline;
   }
   get presence() {
     return this._presence;
@@ -2602,16 +2319,19 @@ var DataSpace = class DataSpace2 {
   get notarizationPlugin() {
     return this._notarizationPluginConsumer.processor;
   }
+  get cache() {
+    return this._cache;
+  }
   async open() {
     await this.notarizationPlugin.open();
     await this._notarizationPluginConsumer.open();
     await this._inner.open();
     this._state = SpaceState.INACTIVE;
+    this.metrics.open = new Date();
   }
   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();
@@ -2628,25 +2348,31 @@ var DataSpace = class DataSpace2 {
   * Initialize the data pipeline in a separate task.
   */
   initializeDataPipelineAsync() {
-    scheduleTask3(this._ctx, async () => {
+    scheduleTask4(this._ctx, async () => {
       try {
+        this.metrics.pipelineInitBegin = new Date();
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof CancelledError) {
-          log10("Data pipeline initialization cancelled", err, {
+          log9("Data pipeline initialization cancelled", err, {
             file: "data-space.ts",
-            line: 178,
+            line: 173,
             scope: this,
             callSite: (f, a) => f(...a)
           });
           return;
         }
-        log10.error("Error initializing data pipeline", err, {
+        log9.error("Error initializing data pipeline", err, {
           file: "data-space.ts",
-          line: 182,
+          line: 177,
           scope: this,
           callSite: (f, a) => f(...a)
         });
+        this._state = SpaceState.ERROR;
+        this.error = err;
+        this.stateUpdate.emit();
+      } finally {
+        this.metrics.ready = new Date();
       }
     });
   }
@@ -2660,10 +2386,11 @@ var DataSpace = class DataSpace2 {
       ctx: this._ctx,
       breakOnStall: false
     });
+    this.metrics.controlPipelineReady = new Date();
     await this._createWritableFeeds();
-    log10("Writable feeds created", {}, {
+    log9("Writable feeds created", {}, {
       file: "data-space.ts",
-      line: 200,
+      line: 202,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2673,28 +2400,23 @@ var DataSpace = class DataSpace2 {
         credential
       }
     }), this._inner.controlPipeline.writer));
-    await this._dataPipeline.open({
-      openPipeline: async (start) => {
-        const pipeline = await this._inner.createDataPipeline({
-          start
-        });
-        await pipeline.start();
-        return pipeline;
-      }
-    });
-    log10("waiting for data pipeline to reach target timeframe", {}, {
+    await this._inner.initializeDataPipeline();
+    this.metrics.dataPipelineOpen = new Date();
+    await cancelWithContext2(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
+    log9("waiting for data pipeline to reach target timeframe", {}, {
       file: "data-space.ts",
-      line: 220,
+      line: 221,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    await this._dataPipeline.pipelineState.waitUntilReachedTargetTimeframe({
+    await this._inner.dataPipeline.pipelineState.waitUntilReachedTargetTimeframe({
       ctx: this._ctx,
       breakOnStall: false
     });
-    log10("data pipeline ready", {}, {
+    this.metrics.dataPipelineReady = new Date();
+    log9("data pipeline ready", {}, {
       file: "data-space.ts",
-      line: 227,
+      line: 230,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2746,6 +2468,27 @@ var DataSpace = class DataSpace2 {
     }
     await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey, this.inner.dataFeedKey);
   }
+  async createEpoch() {
+    var _a, _b;
+    const epoch = await this.dataPipeline.createEpoch();
+    await this.inner.controlPipeline.writer.write({
+      credential: {
+        credential: await this._signingContext.credentialSigner.createCredential({
+          subject: this.key,
+          assertion: {
+            "@type": "dxos.halo.credentials.Epoch",
+            ...epoch
+          }
+        })
+      }
+    });
+    for (const feed of (_b = (_a = this.inner.dataPipeline.pipelineState) == null ? void 0 : _a.feeds) != null ? _b : []) {
+      const indexBeforeEpoch = epoch.timeframe.get(feed.key);
+      if (indexBeforeEpoch) {
+        await feed.clear(0, indexBeforeEpoch + 1);
+      }
+    }
+  }
 };
 __decorate([
   timed(1e4)
@@ -2754,6 +2497,88 @@ DataSpace = __decorate([
   trackLeaks("open", "close")
 ], DataSpace);
 
+// packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
+import assert10 from "@dxos/node-std/assert";
+import { Event as Event6, synchronized, trackLeaks as trackLeaks2 } from "@dxos/async";
+import { cancelWithContext as cancelWithContext3, Context as Context7 } from "@dxos/context";
+import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
+import { PublicKey as PublicKey8 } from "@dxos/keys";
+import { log as log10 } from "@dxos/log";
+import { trace as trace4 } from "@dxos/protocols";
+import { SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
+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/genesis.ts
+import { createCredential } from "@dxos/credentials";
+import { failUndefined as failUndefined2 } from "@dxos/debug";
+import { AdmittedFeed as AdmittedFeed4, SpaceMember } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { Timeframe } from "@dxos/timeframe";
+var spaceGenesis = async (keyring, signingContext, space) => {
+  var _a, _b, _c, _d;
+  const credentials = [
+    await createCredential({
+      signer: keyring,
+      issuer: space.key,
+      subject: space.key,
+      assertion: {
+        "@type": "dxos.halo.credentials.SpaceGenesis",
+        spaceKey: space.key
+      }
+    }),
+    await createCredential({
+      signer: keyring,
+      issuer: space.key,
+      subject: signingContext.identityKey,
+      assertion: {
+        "@type": "dxos.halo.credentials.SpaceMember",
+        spaceKey: space.key,
+        role: SpaceMember.Role.ADMIN,
+        profile: signingContext.profile,
+        genesisFeedKey: (_a = space.controlFeedKey) != null ? _a : failUndefined2()
+      }
+    }),
+    await signingContext.credentialSigner.createCredential({
+      subject: (_b = space.controlFeedKey) != null ? _b : failUndefined2(),
+      assertion: {
+        "@type": "dxos.halo.credentials.AdmittedFeed",
+        spaceKey: space.key,
+        identityKey: signingContext.identityKey,
+        deviceKey: signingContext.deviceKey,
+        designation: AdmittedFeed4.Designation.CONTROL
+      }
+    }),
+    await signingContext.credentialSigner.createCredential({
+      subject: (_c = space.dataFeedKey) != null ? _c : failUndefined2(),
+      assertion: {
+        "@type": "dxos.halo.credentials.AdmittedFeed",
+        spaceKey: space.key,
+        identityKey: signingContext.identityKey,
+        deviceKey: signingContext.deviceKey,
+        designation: AdmittedFeed4.Designation.DATA
+      }
+    }),
+    await signingContext.credentialSigner.createCredential({
+      subject: (_d = space.key) != null ? _d : failUndefined2(),
+      assertion: {
+        "@type": "dxos.halo.credentials.Epoch",
+        number: 0,
+        previousId: void 0,
+        timeframe: new Timeframe(),
+        snapshotCid: void 0
+      }
+    })
+  ];
+  for (const credential of credentials) {
+    await space.controlPipeline.writer.write({
+      credential: {
+        credential
+      }
+    });
+  }
+  return credentials;
+};
+
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
 var __decorate2 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -2766,17 +2591,15 @@ var __decorate2 = function(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var DataSpaceManager = class DataSpaceManager2 {
-  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _modelFactory, _feedStore, _snapshotStore) {
+  constructor(_spaceManager, _metadataStore, _dataServiceSubscriptions, _keyring, _signingContext, _feedStore) {
     this._spaceManager = _spaceManager;
     this._metadataStore = _metadataStore;
     this._dataServiceSubscriptions = _dataServiceSubscriptions;
     this._keyring = _keyring;
     this._signingContext = _signingContext;
-    this._modelFactory = _modelFactory;
     this._feedStore = _feedStore;
-    this._snapshotStore = _snapshotStore;
     this._ctx = new Context7();
-    this.updated = new Event8();
+    this.updated = new Event6();
     this._spaces = new ComplexMap3(PublicKey8.hash);
     this._isOpen = false;
     this._instanceId = PublicKey8.random().toHex();
@@ -2786,49 +2609,48 @@ var DataSpaceManager = class DataSpaceManager2 {
     return this._spaces;
   }
   async open() {
-    log11("open", {}, {
+    log10("open", {}, {
       file: "data-space-manager.ts",
-      line: 83,
+      line: 80,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    log11.trace("dxos.echo.data-space-manager", trace4.begin({
-      id: this._instanceId,
-      parentId: this._traceParent
+    log10.trace("dxos.echo.data-space-manager.open", trace4.begin({
+      id: this._instanceId
     }), {
       file: "data-space-manager.ts",
-      line: 84,
+      line: 81,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._metadataStore.load();
-    log11("metadata loaded", {
+    log10("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
       file: "data-space-manager.ts",
-      line: 86,
+      line: 83,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     for (const spaceMetadata of this._metadataStore.spaces) {
       try {
-        log11("load space", {
+        log10("load space", {
           spaceMetadata
         }, {
           file: "data-space-manager.ts",
-          line: 90,
+          line: 87,
           scope: this,
           callSite: (f, a) => f(...a)
         });
         const space = await this._constructSpace(spaceMetadata);
         space.initializeDataPipelineAsync();
       } catch (err) {
-        log11.error("Error loading space", {
+        log10.error("Error loading space", {
           spaceMetadata,
           err
         }, {
           file: "data-space-manager.ts",
-          line: 94,
+          line: 91,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2836,11 +2658,19 @@ var DataSpaceManager = class DataSpaceManager2 {
     }
     this._isOpen = true;
     this.updated.emit();
+    log10.trace("dxos.echo.data-space-manager.open", trace4.end({
+      id: this._instanceId
+    }), {
+      file: "data-space-manager.ts",
+      line: 97,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
   }
   async close() {
-    log11("close", {}, {
+    log10("close", {}, {
       file: "data-space-manager.ts",
-      line: 104,
+      line: 102,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2849,20 +2679,12 @@ var DataSpaceManager = class DataSpaceManager2 {
     for (const space of this._spaces.values()) {
       await space.close();
     }
-    log11.trace("dxos.echo.data-space-manager", trace4.end({
-      id: this._instanceId
-    }), {
-      file: "data-space-manager.ts",
-      line: 110,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
   }
   /**
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    assert11(this._isOpen, "Not open.");
+    assert10(this._isOpen, "Not open.");
     const spaceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const dataFeedKey = await this._keyring.createKey();
@@ -2872,11 +2694,11 @@ var DataSpaceManager = class DataSpaceManager2 {
       controlFeedKey,
       dataFeedKey
     };
-    log11("creating space...", {
+    log10("creating space...", {
       spaceKey
     }, {
       file: "data-space-manager.ts",
-      line: 129,
+      line: 126,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2884,7 +2706,7 @@ var DataSpaceManager = class DataSpaceManager2 {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    assert11(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
+    assert10(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
     await this._signingContext.recordCredential(memberCredential);
     await space.initializeDataPipeline();
     this.updated.emit();
@@ -2892,16 +2714,16 @@ var DataSpaceManager = class DataSpaceManager2 {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    log11("accept space", {
+    log10("accept space", {
       opts
     }, {
       file: "data-space-manager.ts",
-      line: 148,
+      line: 145,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    assert11(this._isOpen, "Not open.");
-    assert11(!this._spaces.has(opts.spaceKey), "Space already exists.");
+    assert10(this._isOpen, "Not open.");
+    assert10(!this._spaces.has(opts.spaceKey), "Space already exists.");
     const metadata = {
       key: opts.spaceKey,
       genesisFeedKey: opts.genesisFeedKey,
@@ -2920,17 +2742,17 @@ var DataSpaceManager = class DataSpaceManager2 {
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await cancelWithContext2(this._ctx, this.updated.waitForCondition(() => {
+    await cancelWithContext3(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
       return !!space && space.state === SpaceState2.READY;
     }));
   }
   async _constructSpace(metadata) {
-    log11("construct space", {
+    log10("construct space", {
       metadata
     }, {
       file: "data-space-manager.ts",
-      line: 184,
+      line: 181,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2943,7 +2765,6 @@ var DataSpaceManager = class DataSpaceManager2 {
       identityKey: this._signingContext.identityKey,
       gossip
     });
-    const snapshotManager = new SnapshotManager(this._snapshotStore);
     const controlFeed = metadata.controlFeedKey && await this._feedStore.openFeed(metadata.controlFeedKey, {
       writable: true
     });
@@ -2961,43 +2782,40 @@ var DataSpaceManager = class DataSpaceManager2 {
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
-        session.addExtension("dxos.mesh.teleport.objectsync", snapshotManager.objectSync.createExtension());
+        session.addExtension("dxos.mesh.teleport.objectsync", space.snapshotManager.objectSync.createExtension());
         session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
-      }
+      },
+      memberKey: this._signingContext.identityKey
     });
     controlFeed && space.setControlFeed(controlFeed);
     dataFeed && space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
-      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,
       callbacks: {
         beforeReady: async () => {
-          log11("before space ready", {
+          log10("before space ready", {
             space: space.key
           }, {
             file: "data-space-manager.ts",
-            line: 233,
+            line: 226,
             scope: this,
             callSite: (f, a) => f(...a)
           });
-          this._dataServiceSubscriptions.registerSpace(space.key, dataSpace.dataPipeline.databaseBackend.createDataServiceHost());
+          this._dataServiceSubscriptions.registerSpace(space.key, dataSpace.dataPipeline.databaseHost.createDataServiceHost());
         },
         afterReady: async () => {
-          log11("after space ready", {
+          log10("after space ready", {
             space: space.key,
             open: this._isOpen
           }, {
             file: "data-space-manager.ts",
-            line: 240,
+            line: 233,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3005,182 +2823,490 @@ var DataSpaceManager = class DataSpaceManager2 {
             this.updated.emit();
           }
         }
-      }
+      },
+      cache: metadata.cache
     });
     await dataSpace.open();
     if (metadata.controlTimeframe) {
       dataSpace.inner.controlPipeline.state.setTargetTimeframe(metadata.controlTimeframe);
     }
-    if (metadata.dataTimeframe) {
-      dataSpace.dataPipeline.setTargetTimeframe(metadata.dataTimeframe);
+    if (metadata.dataTimeframe) {
+      dataSpace.dataPipeline.setTargetTimeframe(metadata.dataTimeframe);
+    }
+    this._spaces.set(metadata.key, dataSpace);
+    return dataSpace;
+  }
+};
+__decorate2([
+  synchronized
+], DataSpaceManager.prototype, "open", null);
+__decorate2([
+  synchronized
+], DataSpaceManager.prototype, "close", null);
+__decorate2([
+  synchronized
+], DataSpaceManager.prototype, "createSpace", null);
+__decorate2([
+  synchronized
+], DataSpaceManager.prototype, "acceptSpace", null);
+DataSpaceManager = __decorate2([
+  trackLeaks2("open", "close")
+], DataSpaceManager);
+
+// packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
+import { EventSubscriptions as EventSubscriptions2, scheduleTask as scheduleTask5 } from "@dxos/async";
+import { Stream as Stream8 } from "@dxos/codec-protobuf";
+import { raise, todo as todo2 } from "@dxos/debug";
+import { SpaceNotFoundError } from "@dxos/echo-pipeline";
+import { log as log11 } from "@dxos/log";
+import { encodeError } from "@dxos/protocols";
+import { SpaceMember as SpaceMember2 } 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;
+    this._spaceManager = _spaceManager;
+    this._dataServiceSubscriptions = _dataServiceSubscriptions;
+    this._getDataSpaceManager = _getDataSpaceManager;
+  }
+  async createSpace() {
+    if (!this._identityManager.identity) {
+      throw new Error("This device has no HALO identity available. See https://docs.dxos.org/guide/halo");
+    }
+    const dataSpaceManager = await this._getDataSpaceManager();
+    const space = await dataSpaceManager.createSpace();
+    return this._transformSpace(space);
+  }
+  async updateSpace(request) {
+    todo2();
+  }
+  querySpaces() {
+    return new Stream8(({ next, ctx }) => {
+      const onUpdate = async () => {
+        const dataSpaceManager = await this._getDataSpaceManager();
+        const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._transformSpace(space));
+        log11("update", {
+          spaces
+        }, {
+          file: "spaces-service.ts",
+          line: 62,
+          scope: this,
+          callSite: (f, a) => f(...a)
+        });
+        next({
+          spaces
+        });
+      };
+      scheduleTask5(ctx, async () => {
+        const dataSpaceManager = await this._getDataSpaceManager();
+        const subscriptions = new EventSubscriptions2();
+        ctx.onDispose(() => subscriptions.clear());
+        const subscribeSpaces = () => {
+          subscriptions.clear();
+          for (const space of dataSpaceManager.spaces.values()) {
+            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();
+        });
+        subscribeSpaces();
+        void onUpdate();
+      });
+      if (!this._identityManager.identity) {
+        next({
+          spaces: []
+        });
+      }
+    });
+  }
+  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 Stream8(({ 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 Stream8(({ ctx, next }) => {
+      var _a;
+      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : raise(new SpaceNotFoundError(spaceKey));
+      const processor = space.spaceState.registerProcessor({
+        process: async (credential) => {
+          next(credential);
+        }
+      });
+      ctx.onDispose(() => processor.close());
+      scheduleTask5(ctx, () => processor.open());
+    });
+  }
+  async writeCredentials({ spaceKey, credentials }) {
+    var _a;
+    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : raise(new SpaceNotFoundError(spaceKey));
+    for (const credential of credentials != null ? credentials : []) {
+      await space.controlPipeline.writer.write({
+        credential: {
+          credential
+        }
+      });
+    }
+  }
+  async createEpoch({ spaceKey }) {
+    var _a;
+    const dataSpaceManager = await this._getDataSpaceManager();
+    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : raise(new SpaceNotFoundError(spaceKey));
+    await space.createEpoch();
+  }
+  _transformSpace(space) {
+    var _a, _b, _c, _d, _e;
+    return {
+      spaceKey: space.key,
+      state: space.state,
+      error: space.error ? encodeError(space.error) : void 0,
+      pipeline: {
+        controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
+        currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
+        targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
+        totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
+        dataFeeds: (_b = (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.feeds.map((feed) => feed.key)) != null ? _b : [],
+        currentDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.timeframe,
+        targetDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.targetTimeframe,
+        totalDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.endTimeframe
+      },
+      members: Array.from(space.inner.spaceState.members.values()).map((member) => {
+        var _a2, _b2, _c2;
+        return {
+          identity: {
+            identityKey: member.key,
+            profile: {
+              displayName: (_b2 = (_a2 = member.assertion.profile) == null ? void 0 : _a2.displayName) != null ? _b2 : humanize(member.key)
+            }
+          },
+          presence: ((_c2 = this._identityManager.identity) == null ? void 0 : _c2.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember2.PresenceState.ONLINE : SpaceMember2.PresenceState.OFFLINE
+        };
+      }),
+      cache: space.cache,
+      metrics: space.metrics
+    };
+  }
+};
+var getChannelId = (channel) => `user-channel/${channel}`;
+
+// packages/sdk/client-services/src/packlets/storage/storage.ts
+import { InvalidConfigError } from "@dxos/errors";
+import { Runtime } from "@dxos/protocols/proto/dxos/config";
+import { createStorage, StorageType } from "@dxos/random-access-storage";
+var StorageDriver = Runtime.Client.Storage.StorageDriver;
+var createStorageObjects = (config) => {
+  const { path = "dxos/storage", storageType, keyStorage, persistent = false } = config != null ? config : {};
+  if (persistent && storageType === StorageDriver.RAM) {
+    throw new InvalidConfigError("RAM storage cannot be used in persistent mode.");
+  }
+  if (!persistent && storageType !== void 0 && storageType !== StorageDriver.RAM) {
+    throw new InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+  }
+  if (persistent && keyStorage === StorageDriver.RAM) {
+    throw new InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+  }
+  if (!persistent && keyStorage !== StorageDriver.RAM && keyStorage !== void 0) {
+    throw new InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+  }
+  return {
+    storage: createStorage({
+      type: persistent ? toStorageType(storageType) : StorageType.RAM,
+      root: `${path}/`
+    })
+  };
+};
+var toStorageType = (type) => {
+  switch (type) {
+    case void 0:
+      return void 0;
+    case StorageDriver.RAM:
+      return StorageType.RAM;
+    case StorageDriver.CHROME:
+      return StorageType.CHROME;
+    case StorageDriver.FIREFOX:
+      return StorageType.FIREFOX;
+    case StorageDriver.IDB:
+      return StorageType.IDB;
+    case StorageDriver.NODE:
+      return StorageType.NODE;
+    case StorageDriver.WEBFS:
+      return StorageType.WEBFS;
+    default:
+      throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
+  }
+};
+
+// packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
+import assert11 from "@dxos/node-std/assert";
+import { Event as Event7 } from "@dxos/async";
+import { appServiceBundle, shellServiceBundle } from "@dxos/client-protocol";
+import { ShellLayout } from "@dxos/protocols/proto/dxos/iframe";
+import { createProtoRpcPeer } from "@dxos/rpc";
+var ShellRuntimeImpl = class {
+  constructor(_port) {
+    this._port = _port;
+    this.layoutUpdate = new Event7();
+    this._layout = ShellLayout.DEFAULT;
+  }
+  get layout() {
+    return this._layout;
+  }
+  get invitationCode() {
+    return this._invitationCode;
+  }
+  get spaceKey() {
+    return this._spaceKey;
+  }
+  setLayout(layout, options = {}) {
+    this._layout = layout;
+    this._invitationCode = options.invitationCode;
+    this._spaceKey = options.spaceKey;
+    this.layoutUpdate.emit({
+      layout,
+      ...options
+    });
+  }
+  async setAppContext(context) {
+    assert11(this._appRpc, "runtime not open");
+    await this._appRpc.rpc.AppService.setContext(context);
+  }
+  async open() {
+    this._appRpc = createProtoRpcPeer({
+      requested: appServiceBundle,
+      exposed: shellServiceBundle,
+      handlers: {
+        ShellService: {
+          setLayout: async (request) => {
+            this._layout = request.layout;
+            this._invitationCode = request.invitationCode;
+            this._spaceKey = request.spaceKey;
+            this.layoutUpdate.emit(request);
+          }
+        }
+      },
+      port: this._port
+    });
+    await this._appRpc.open();
+  }
+  async close() {
+    var _a;
+    await ((_a = this._appRpc) == null ? void 0 : _a.close());
+    this._appRpc = void 0;
+  }
+};
+var MemoryShellRuntime = class {
+  constructor({ layout, invitationCode, spaceKey } = {}) {
+    this.layoutUpdate = new Event7();
+    this.contextUpdate = new Event7();
+    this._layout = layout != null ? layout : ShellLayout.DEFAULT;
+    this._invitationCode = invitationCode;
+    this._spaceKey = spaceKey;
+  }
+  get layout() {
+    return this._layout;
+  }
+  get invitationCode() {
+    return this._invitationCode;
+  }
+  get spaceKey() {
+    return this._spaceKey;
+  }
+  setLayout(layout, options = {}) {
+    this._layout = layout;
+    this._invitationCode = options.invitationCode;
+    this._spaceKey = options.spaceKey;
+    this.layoutUpdate.emit({
+      layout,
+      ...options
+    });
+  }
+  async setAppContext(context) {
+    this.contextUpdate.emit(context);
+  }
+};
+
+// packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
+import { Trigger as Trigger10 } from "@dxos/async";
+import { log as log19, logInfo as logInfo3 } from "@dxos/log";
+import { MemorySignalManager as MemorySignalManager2, MemorySignalManagerContext as MemorySignalManagerContext2, WebsocketSignalManager as WebsocketSignalManager3 } from "@dxos/messaging";
+import { createWebRTCTransportFactory as createWebRTCTransportFactory2 } from "@dxos/network-manager";
+import { getAsyncValue as getAsyncValue2 } from "@dxos/util";
+
+// packages/sdk/client-services/src/packlets/services/service-host.ts
+import assert14 from "@dxos/node-std/assert";
+import { Event as Event9 } from "@dxos/async";
+import { clientServiceBundle, createDefaultModelFactory } from "@dxos/client-protocol";
+import { DataServiceImpl } from "@dxos/echo-pipeline";
+import { PublicKey as PublicKey10 } from "@dxos/keys";
+import { log as log18 } from "@dxos/log";
+import { WebsocketSignalManager as WebsocketSignalManager2 } from "@dxos/messaging";
+import { createWebRTCTransportFactory, NetworkManager } from "@dxos/network-manager";
+import { trace as trace6 } from "@dxos/protocols";
+import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
+
+// packages/sdk/client-services/src/packlets/devices/devices-service.ts
+import { EventSubscriptions as EventSubscriptions3 } from "@dxos/async";
+import { Stream as Stream9 } from "@dxos/codec-protobuf";
+import { DeviceKind } from "@dxos/protocols/proto/dxos/client/services";
+var DevicesServiceImpl = class {
+  constructor(_identityManager) {
+    this._identityManager = _identityManager;
+  }
+  updateDevice(request) {
+    throw new Error("Method not implemented.");
+  }
+  queryDevices() {
+    return new Stream9(({ next }) => {
+      const update = () => {
+        var _a;
+        const deviceKeys = (_a = this._identityManager.identity) == null ? void 0 : _a.authorizedDeviceKeys;
+        if (!deviceKeys) {
+          next({
+            devices: []
+          });
+        } else {
+          next({
+            devices: Array.from(deviceKeys.values()).map((key) => {
+              var _a2;
+              return {
+                deviceKey: key,
+                kind: ((_a2 = this._identityManager.identity) == null ? void 0 : _a2.deviceKey.equals(key)) ? DeviceKind.CURRENT : DeviceKind.TRUSTED
+              };
+            })
+          });
+        }
+      };
+      const subscriptions = new EventSubscriptions3();
+      subscriptions.add(this._identityManager.stateUpdate.on(() => {
+        update();
+        if (this._identityManager.identity) {
+          subscriptions.add(this._identityManager.identity.stateUpdate.on(() => {
+            update();
+          }));
+        }
+      }));
+      update();
+      return () => subscriptions.clear();
+    });
+  }
+};
+
+// packages/sdk/client-services/src/packlets/logging/logging-service.ts
+import { Event as Event8 } from "@dxos/async";
+import { Stream as Stream10 } from "@dxos/codec-protobuf";
+import { log as log12, shouldLog } from "@dxos/log";
+var LoggingServiceImpl = class {
+  constructor() {
+    this._logs = new Event8();
+    this._logProcessor = (_config, entry2) => {
+      this._logs.emit(entry2);
+    };
+  }
+  async open() {
+    log12.runtimeConfig.processors.push(this._logProcessor);
+  }
+  async close() {
+    const index = log12.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    log12.runtimeConfig.processors.splice(index, 1);
+  }
+  queryLogs(request) {
+    var _a;
+    const filters = ((_a = request.filters) == null ? void 0 : _a.length) ? request.filters : void 0;
+    return new Stream10(({ ctx, next }) => {
+      const handler = (entry2) => {
+        var _a2;
+        if (((_a2 = entry2.meta) == null ? void 0 : _a2.file.includes("logging-service")) || entry2.context && Object.values(entry2.context).some((value) => typeof value === "string" && value.includes("LoggingService"))) {
+          return;
+        }
+        if (shouldLog(entry2, filters)) {
+          next(jsonify(entry2));
+        }
+      };
+      ctx.onDispose(() => {
+        this._logs.off(handler);
+      });
+      this._logs.on(handler);
+    });
+  }
+};
+var jsonify = (value, handles = /* @__PURE__ */ new WeakSet()) => {
+  if (typeof value === "function") {
+    return null;
+  } else if (typeof value === "object" && value !== null) {
+    if (handles.has(value)) {
+      return null;
+    }
+    handles.add(value);
+    if (Array.isArray(value)) {
+      return value.map((x) => jsonify(x, handles));
+    } else {
+      if (typeof value.toJSON === "function") {
+        return value.toJSON();
+      }
+      const res = {};
+      for (const key of Object.keys(value)) {
+        res[key] = jsonify(value[key], handles);
+      }
+      return res;
     }
-    this._spaces.set(metadata.key, dataSpace);
-    return dataSpace;
+  } else {
+    return value;
   }
 };
-__decorate2([
-  synchronized
-], DataSpaceManager.prototype, "open", null);
-__decorate2([
-  synchronized
-], DataSpaceManager.prototype, "close", null);
-__decorate2([
-  synchronized
-], DataSpaceManager.prototype, "createSpace", null);
-__decorate2([
-  synchronized
-], DataSpaceManager.prototype, "acceptSpace", null);
-DataSpaceManager = __decorate2([
-  trackLeaks2("open", "close")
-], DataSpaceManager);
 
-// packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
-import { EventSubscriptions as EventSubscriptions3, scheduleTask as scheduleTask4 } from "@dxos/async";
+// packages/sdk/client-services/src/packlets/network/network-service.ts
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
-import { raise, todo as todo2 } from "@dxos/debug";
-import { SpaceNotFoundError } from "@dxos/echo-pipeline";
-import { log as log12 } 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;
-    this._spaceManager = _spaceManager;
-    this._dataServiceSubscriptions = _dataServiceSubscriptions;
-    this._getDataSpaceManager = _getDataSpaceManager;
-  }
-  async createSpace() {
-    if (!this._identityManager.identity) {
-      throw new Error("This device has no HALO identity available. See https://docs.dxos.org/guide/halo");
-    }
-    const dataSpaceManager = await this._getDataSpaceManager();
-    const space = await dataSpaceManager.createSpace();
-    return this._transformSpace(space);
-  }
-  async updateSpace(request) {
-    todo2();
+var NetworkServiceImpl = class {
+  constructor(networkManager, signalManager) {
+    this.networkManager = networkManager;
+    this.signalManager = signalManager;
   }
-  querySpaces() {
-    return new Stream11(({ next, ctx }) => {
-      const onUpdate = async () => {
-        const dataSpaceManager = await this._getDataSpaceManager();
-        const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._transformSpace(space));
-        log12("update", {
-          spaces
-        }, {
-          file: "spaces-service.ts",
-          line: 60,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        });
+  queryStatus() {
+    return new Stream11(({ next }) => {
+      const update = () => {
         next({
-          spaces
+          swarm: this.networkManager.connectionState,
+          signaling: this.signalManager.getStatus().map(({ host, state }) => ({
+            server: host,
+            state
+          }))
         });
       };
-      scheduleTask4(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()) {
-            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();
-        });
-        subscribeSpaces();
-        void onUpdate();
-      });
-      if (!this._identityManager.identity) {
-        next({
-          spaces: []
-        });
-      }
-    });
-  }
-  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 Stream11(({ ctx, next }) => {
-      scheduleTask4(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 Stream11(({ ctx, next }) => {
-      var _a;
-      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : raise(new SpaceNotFoundError(spaceKey));
-      const processor = space.spaceState.registerProcessor({
-        process: async (credential) => {
-          next(credential);
-        }
-      });
-      ctx.onDispose(() => processor.close());
-      scheduleTask4(ctx, () => processor.open());
+      const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
+      const unsubscribeSignal = this.signalManager.statusChanged.on(() => update());
+      update();
+      return () => {
+        unsubscribeSwarm();
+        unsubscribeSignal();
+      };
     });
   }
-  async writeCredentials({ spaceKey, credentials }) {
-    var _a;
-    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : raise(new SpaceNotFoundError(spaceKey));
-    for (const credential of credentials != null ? credentials : []) {
-      await space.controlPipeline.writer.write({
-        credential: {
-          credential
-        }
-      });
-    }
-  }
-  _transformSpace(space) {
-    var _a, _b, _c, _d, _e;
-    return {
-      spaceKey: space.key,
-      state: space.state,
-      pipeline: {
-        controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
-        currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
-        targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
-        totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe,
-        dataFeeds: (_b = (_a = space.dataPipeline.pipelineState) == null ? void 0 : _a.feeds.map((feed) => feed.key)) != null ? _b : [],
-        currentDataTimeframe: (_c = space.dataPipeline.pipelineState) == null ? void 0 : _c.timeframe,
-        targetDataTimeframe: (_d = space.dataPipeline.pipelineState) == null ? void 0 : _d.targetTimeframe,
-        totalDataTimeframe: (_e = space.dataPipeline.pipelineState) == null ? void 0 : _e.endTimeframe
-      },
-      members: Array.from(space.inner.spaceState.members.values()).map((member) => {
-        var _a2, _b2, _c2;
-        return {
-          identity: {
-            identityKey: member.key,
-            profile: {
-              displayName: (_b2 = (_a2 = member.assertion.profile) == null ? void 0 : _a2.displayName) != null ? _b2 : humanize(member.key)
-            }
-          },
-          presence: ((_c2 = this._identityManager.identity) == null ? void 0 : _c2.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE
-        };
-      })
-    };
+  async updateConfig(request) {
+    await this.networkManager.setConnectionState(request.swarm);
   }
 };
-var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/system/system-service.ts
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
@@ -3221,7 +3347,8 @@ var SystemServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
-import { iframeServiceBundle, workerServiceBundle } from "@dxos/client";
+import { Trigger as Trigger5 } from "@dxos/async";
+import { iframeServiceBundle, workerServiceBundle } from "@dxos/client-protocol";
 import { RemoteServiceConnectionError } from "@dxos/errors";
 import { log as log13 } from "@dxos/log";
 import { WebRTCTransportService } from "@dxos/network-manager";
@@ -3229,6 +3356,8 @@ import { createProtoRpcPeer as createProtoRpcPeer2 } from "@dxos/rpc";
 import { getAsyncValue } from "@dxos/util";
 var IFrameProxyRuntime = class {
   constructor({ config, systemPort, shellPort }) {
+    this._id = String(Math.floor(Math.random() * 1e6));
+    this._release = new Trigger5();
     this._configProvider = config;
     this._systemPort = systemPort;
     this._shellPort = shellPort;
@@ -3249,24 +3378,32 @@ var IFrameProxyRuntime = class {
       requested: workerServiceBundle,
       exposed: iframeServiceBundle,
       handlers: {
-        BridgeService: this._transportService,
-        IframeService: {
-          async heartbeat() {
-          }
-        }
+        BridgeService: this._transportService
       },
       port: this._systemPort,
       timeout: 200
     });
+    let lockKey;
+    if (typeof navigator !== "undefined") {
+      lockKey = this._lockKey(origin);
+      this._release = new Trigger5();
+      const ready = new Trigger5();
+      void navigator.locks.request(lockKey, async () => {
+        ready.wake();
+        await this._release.wait();
+      });
+      await ready.wait();
+    }
     try {
       await this._systemRpc.open();
       await this._systemRpc.rpc.WorkerService.start({
-        origin
+        origin,
+        lockKey
       });
     } catch (err) {
       log13.catch(err, {}, {
         file: "iframe-proxy-runtime.ts",
-        line: 74,
+        line: 85,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3276,14 +3413,18 @@ var IFrameProxyRuntime = class {
   }
   async close() {
     var _a;
+    this._release.wake();
     await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
     await this._systemRpc.rpc.WorkerService.stop();
     await this._systemRpc.close();
   }
+  _lockKey(origin) {
+    return `${origin}-${this._id}`;
+  }
 };
 
 // packages/sdk/client-services/src/packlets/vault/vault-resource-lock.ts
-import { asyncTimeout, Trigger as Trigger5 } from "@dxos/async";
+import { asyncTimeout, Trigger as Trigger6 } from "@dxos/async";
 import { log as log14, 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;
@@ -3302,7 +3443,7 @@ var Message;
 var VaultResourceLock = class {
   constructor({ lockKey, onAcquire, onRelease }) {
     this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
-    this._releaseTrigger = new Trigger5();
+    this._releaseTrigger = new Trigger6();
     this._lockKey = lockKey;
     this._onAcquire = onAcquire;
     this._onRelease = onRelease;
@@ -3362,14 +3503,14 @@ var VaultResourceLock = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    const acquired = new Trigger5();
+    const acquired = new Trigger6();
     void navigator.locks.request(this._lockKey, {
       steal
     }, async () => {
       var _a, _b;
       await ((_a = this._onAcquire) == null ? void 0 : _a.call(this));
       acquired.wake();
-      this._releaseTrigger = new Trigger5();
+      this._releaseTrigger = new Trigger6();
       await this._releaseTrigger.wait();
       log14("releasing lock...", {}, {
         file: "vault-resource-lock.ts",
@@ -3404,15 +3545,15 @@ __decorate3([
 ], VaultResourceLock.prototype, "lockKey", null);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
-import { Trigger as Trigger7 } from "@dxos/async";
+import { Trigger as Trigger8 } from "@dxos/async";
 import { log as log16 } from "@dxos/log";
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from "@dxos/messaging";
-import { NetworkManager, WebRTCTransportProxyFactory } from "@dxos/network-manager";
+import { WebRTCTransportProxyFactory } from "@dxos/network-manager";
 
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
 import assert12 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 { asyncTimeout as asyncTimeout2, Trigger as Trigger7 } from "@dxos/async";
+import { iframeServiceBundle as iframeServiceBundle2, workerServiceBundle as workerServiceBundle2 } from "@dxos/client-protocol";
 import { log as log15, logInfo as logInfo2 } from "@dxos/log";
 import { createProtoRpcPeer as createProtoRpcPeer3 } from "@dxos/rpc";
 import { Callback } from "@dxos/util";
@@ -3482,14 +3623,10 @@ var __decorate4 = function(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var WorkerSession = class {
-  constructor({ serviceHost, systemPort, appPort, shellPort, readySignal, options = {
-    heartbeatInterval: 1e3
-  } }) {
-    this._startTrigger = new Trigger6();
+  constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }) {
+    this._startTrigger = new Trigger7();
     this.onClose = new Callback();
-    assert12(options);
     assert12(serviceHost);
-    this._options = options;
     this._serviceHost = serviceHost;
     const middleware = {
       handleCall: async (method, params, handler) => {
@@ -3528,6 +3665,7 @@ var WorkerSession = class {
         WorkerService: {
           start: async (request) => {
             this.origin = request.origin;
+            this.lockKey = request.lockKey;
             this._startTrigger.wake();
           },
           stop: async () => {
@@ -3537,7 +3675,7 @@ var WorkerSession = class {
               } catch (err) {
                 log15.catch(err, {}, {
                   file: "worker-session.ts",
-                  line: 107,
+                  line: 95,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -3548,14 +3686,13 @@ var WorkerSession = class {
       },
       port: systemPort,
       timeout: 1e3
-      // With low timeout heartbeat may fail if the tab's thread is saturated.
     });
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
     log15.info("opening..", {}, {
       file: "worker-session.ts",
-      line: 121,
+      line: 109,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3567,35 +3704,14 @@ var WorkerSession = class {
     await this._startTrigger.wait({
       timeout: 3e3
     });
-    this._heartbeatTimer = setInterval(async () => {
-      try {
-        await this._iframeRpc.rpc.IframeService.heartbeat();
-      } catch (err1) {
-        log15.warn("Heartbeat failed", {
-          err: err1
-        }, {
-          file: "worker-session.ts",
-          line: 133,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        });
-        try {
-          await this.close();
-        } catch (err) {
-          log15.catch(err, {}, {
-            file: "worker-session.ts",
-            line: 137,
-            scope: this,
-            callSite: (f, a) => f(...a)
-          });
-        }
-      }
-    }, this._options.heartbeatInterval);
+    if (this.lockKey) {
+      void this._afterLockReleases(this.lockKey, () => this.close());
+    }
   }
   async close() {
     log15.info("closing..", {}, {
       file: "worker-session.ts",
-      line: 144,
+      line: 119,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3604,14 +3720,11 @@ var WorkerSession = class {
     } catch (err) {
       log15.catch(err, {}, {
         file: "worker-session.ts",
-        line: 148,
+        line: 123,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     }
-    if (this._heartbeatTimer !== void 0) {
-      clearInterval(this._heartbeatTimer);
-    }
     await Promise.all([
       this._clientRpc.close(),
       this._iframeRpc.close()
@@ -3623,16 +3736,23 @@ var WorkerSession = class {
     } catch (e) {
       log15.info("No shell connected.", {}, {
         file: "worker-session.ts",
-        line: 162,
+        line: 133,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     }
   }
+  _afterLockReleases(lockKey, callback) {
+    return navigator.locks.request(lockKey, () => {
+    }).then(callback);
+  }
 };
 __decorate4([
   logInfo2
 ], WorkerSession.prototype, "origin", void 0);
+__decorate4([
+  logInfo2
+], WorkerSession.prototype, "lockKey", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
 var WorkerRuntime = class {
@@ -3640,7 +3760,7 @@ var WorkerRuntime = class {
   constructor(_configProvider) {
     this._configProvider = _configProvider;
     this._transportFactory = new WebRTCTransportProxyFactory();
-    this._ready = new Trigger7();
+    this._ready = new Trigger8();
     this.sessions = /* @__PURE__ */ new Set();
     this._clientServices = new ClientServicesHost();
   }
@@ -3659,17 +3779,14 @@ var WorkerRuntime = class {
       const signals = this._config.get("runtime.services.signaling");
       this._clientServices.initialize({
         config: this._config,
-        networkManager: new NetworkManager({
-          log: true,
-          signalManager: signals ? new WebsocketSignalManager(signals) : new MemorySignalManager(new MemorySignalManagerContext()),
-          transportFactory: this._transportFactory
-        })
+        signalManager: signals ? new WebsocketSignalManager(signals) : new MemorySignalManager(new MemorySignalManagerContext()),
+        transportFactory: this._transportFactory
       });
       await this._clientServices.open();
       this._ready.wake(void 0);
       log16("started", {}, {
         file: "worker-runtime.ts",
-        line: 65,
+        line: 62,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3677,7 +3794,7 @@ var WorkerRuntime = class {
       this._ready.wake(err);
       log16.catch(err, {}, {
         file: "worker-runtime.ts",
-        line: 68,
+        line: 65,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3709,6 +3826,12 @@ var WorkerRuntime = class {
   * Selects one of the existing session fro WebRTC networking.
   */
   _reconnectWebrtc() {
+    log16("reconnecting webrtc...", {}, {
+      file: "worker-runtime.ts",
+      line: 102,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
     if (this._sessionForNetworking) {
       if (!this.sessions.has(this._sessionForNetworking)) {
         this._sessionForNetworking = void 0;
@@ -3728,27 +3851,27 @@ var WorkerRuntime = class {
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 import assert13 from "@dxos/node-std/assert";
-import { Trigger as Trigger8 } from "@dxos/async";
-import { Invitation as Invitation4 } from "@dxos/client";
+import { Trigger as Trigger9 } from "@dxos/async";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
-import { failUndefined as failUndefined2 } from "@dxos/debug";
+import { failUndefined as failUndefined3 } 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 { PublicKey as PublicKey9 } from "@dxos/keys";
 import { log as log17 } from "@dxos/log";
 import { trace as trace5 } from "@dxos/protocols";
+import { Invitation as Invitation4 } from "@dxos/protocols/proto/dxos/client/services";
 var ServiceContext = class {
   // prettier-ignore
-  constructor(storage, networkManager, modelFactory) {
+  constructor(storage, networkManager, signalManager, modelFactory) {
     this.storage = storage;
     this.networkManager = networkManager;
+    this.signalManager = signalManager;
     this.modelFactory = modelFactory;
-    this.initialized = new Trigger8();
+    this.initialized = new Trigger9();
     this.dataServiceSubscriptions = new DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = PublicKey9.random().toHex();
-    networkManager._traceParent = this._instanceId;
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
     this.snapshotStore = new SnapshotStore(storage.createDirectory("snapshots"));
     this.keyring = new Keyring(storage.createDirectory("keyring"));
@@ -3763,33 +3886,34 @@ var ServiceContext = class {
     });
     this.spaceManager = new SpaceManager({
       feedStore: this.feedStore,
-      networkManager: this.networkManager
+      networkManager: this.networkManager,
+      metadataStore: this.metadataStore,
+      modelFactory: this.modelFactory,
+      snapshotStore: this.snapshotStore
     });
-    this.spaceManager._traceParent = this._instanceId;
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager);
-    this.identityManager._traceParent = this._instanceId;
     this.invitations = new InvitationsHandler(this.networkManager);
-    this.invitations._traceParent = this._instanceId;
     this._handlerFactories.set(Invitation4.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
       var _a;
-      return (_a = this.identityManager.identity) != null ? _a : failUndefined2();
+      return (_a = this.identityManager.identity) != null ? _a : failUndefined3();
     }, this._acceptIdentity.bind(this)));
   }
   async open() {
-    log17.trace("dxos.sdk.service-context", trace5.begin({
+    log17.trace("dxos.sdk.service-context.open", trace5.begin({
       id: this._instanceId
     }), {
       file: "service-context.ts",
-      line: 115,
+      line: 119,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     log17("opening...", {}, {
       file: "service-context.ts",
-      line: 117,
+      line: 121,
       scope: this,
       callSite: (f, a) => f(...a)
     });
+    await this.signalManager.open();
     await this.networkManager.open();
     await this.spaceManager.open();
     await this.identityManager.open();
@@ -3798,7 +3922,15 @@ var ServiceContext = class {
     }
     log17("opened", {}, {
       file: "service-context.ts",
-      line: 124,
+      line: 129,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    log17.trace("dxos.sdk.service-context.open", trace5.end({
+      id: this._instanceId
+    }), {
+      file: "service-context.ts",
+      line: 130,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3807,7 +3939,7 @@ var ServiceContext = class {
     var _a, _b;
     log17("closing...", {}, {
       file: "service-context.ts",
-      line: 128,
+      line: 134,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3817,18 +3949,11 @@ var ServiceContext = class {
     await this.spaceManager.close();
     await this.feedStore.close();
     await this.networkManager.close();
+    await this.signalManager.close();
     this.dataServiceSubscriptions.clear();
     log17("closed", {}, {
       file: "service-context.ts",
-      line: 136,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    log17.trace("dxos.sdk.service-context", trace5.end({
-      id: this._instanceId
-    }), {
-      file: "service-context.ts",
-      line: 138,
+      line: 143,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3853,11 +3978,11 @@ var ServiceContext = class {
     var _a;
     log17("initializing spaces...", {}, {
       file: "service-context.ts",
-      line: 163,
+      line: 168,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    const identity = (_a = this.identityManager.identity) != null ? _a : failUndefined2();
+    const identity = (_a = this.identityManager.identity) != null ? _a : failUndefined3();
     const signingContext = {
       credentialSigner: identity.getIdentityCredentialSigner(),
       identityKey: identity.identityKey,
@@ -3871,8 +3996,7 @@ var ServiceContext = class {
         });
       }
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.modelFactory, this.feedStore, this.snapshotStore);
-    this.dataSpaceManager._traceParent = this._instanceId;
+    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.dataServiceSubscriptions, this.keyring, signingContext, this.feedStore);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(Invitation4.Kind.SPACE, (invitation) => {
       assert13(this.dataSpaceManager, "dataSpaceManager not initialized yet");
@@ -3893,7 +4017,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 205,
+            line: 207,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3904,7 +4028,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 209,
+            line: 211,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3915,7 +4039,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 214,
+            line: 216,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3926,7 +4050,7 @@ var ServiceContext = class {
         } catch (err) {
           log17.catch(err, {}, {
             file: "service-context.ts",
-            line: 220,
+            line: 222,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3967,7 +4091,9 @@ var ClientServicesHost = class {
     config,
     modelFactory = createDefaultModelFactory(),
     // TODO(burdon): Create ApolloLink abstraction (see Client).
-    networkManager,
+    transportFactory,
+    signalManager,
+    connectionLog,
     storage,
     // TODO(wittjosiah): Turn this on by default.
     lockKey
@@ -3975,19 +4101,21 @@ var ClientServicesHost = class {
     this._statusUpdate = new Event9();
     this._opening = false;
     this._open = false;
-    this._instanceId = PublicKey10.random().toHex();
     this._storage = storage;
     this._modelFactory = modelFactory;
     if (config) {
       this.initialize({
         config,
-        networkManager
+        transportFactory,
+        signalManager
       });
     }
     this._resourceLock = lockKey ? new VaultResourceLock({
       lockKey,
       onAcquire: () => {
-        this._opening || this.open();
+        if (!this._opening) {
+          void this.open();
+        }
       },
       onRelease: () => this.close()
     }) : void 0;
@@ -4029,7 +4157,8 @@ var ClientServicesHost = class {
   * Config can also be provided in the constructor.
   * Can only be called once.
   */
-  initialize({ config, networkManager }) {
+  initialize({ config, ...options }) {
+    var _a, _b, _c;
     assert14(!this._open, "service host is open");
     if (config) {
       assert14(!this._config, "config already set");
@@ -4038,39 +4167,47 @@ var ClientServicesHost = class {
         this._storage = createStorageObjects(config.get("runtime.client.storage", {})).storage;
       }
     }
-    if (networkManager) {
-      assert14(!this._networkManager, "network manager already set");
-      this._networkManager = networkManager;
-    }
+    const { connectionLog = true, transportFactory = createWebRTCTransportFactory({
+      iceServers: (_a = this._config) == null ? void 0 : _a.get("runtime.services.ice")
+    }), signalManager = new WebsocketSignalManager2((_c = (_b = this._config) == null ? void 0 : _b.get("runtime.services.signaling")) != null ? _c : []) } = options;
+    this._signalManager = signalManager;
+    assert14(!this._networkManager, "network manager already set");
+    this._networkManager = new NetworkManager({
+      log: connectionLog,
+      transportFactory,
+      signalManager
+    });
   }
   async open() {
     var _a, _b, _c;
     if (this._open) {
       return;
     }
-    log18.trace("dxos.sdk.client-services-host", trace6.begin({
-      id: this._instanceId
+    const traceId = PublicKey10.random().toHex();
+    log18.trace("dxos.sdk.client-services-host.open", trace6.begin({
+      id: traceId
     }), {
       file: "service-host.ts",
-      line: 169,
+      line: 186,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     assert14(this._config, "config not set");
     assert14(this._storage, "storage not set");
+    assert14(this._signalManager, "signal manager not set");
     assert14(this._networkManager, "network manager not set");
     this._opening = true;
     log18("opening...", {
       lockKey: (_a = this._resourceLock) == null ? void 0 : _a.lockKey
     }, {
       file: "service-host.ts",
-      line: 176,
+      line: 194,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await ((_b = this._resourceLock) == null ? void 0 : _b.acquire());
     await this._loggingService.open();
-    this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._modelFactory);
+    this._serviceContext = new ServiceContext(this._storage, this._networkManager, this._signalManager, this._modelFactory);
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
       IdentityService: new IdentityServiceImpl(this._serviceContext),
@@ -4081,7 +4218,7 @@ var ClientServicesHost = class {
         return this._serviceContext.dataSpaceManager;
       }),
       DataService: new DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
-      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager),
+      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       // TODO(burdon): Move to new protobuf definitions.
       DevtoolsHost: new DevtoolsServiceImpl({
@@ -4099,7 +4236,15 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 226,
+      line: 249,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    log18.trace("dxos.sdk.client-services-host.open", trace6.end({
+      id: traceId
+    }), {
+      file: "service-host.ts",
+      line: 250,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4114,7 +4259,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 235,
+      line: 259,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4129,24 +4274,25 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 241,
+      line: 265,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    log18.trace("dxos.sdk.client-services-host", trace6.end({
-      id: this._instanceId
+  }
+  async reset() {
+    var _a;
+    const traceId = PublicKey10.random().toHex();
+    log18.trace("dxos.sdk.client-services-host.reset", trace6.begin({
+      id: traceId
     }), {
       file: "service-host.ts",
-      line: 243,
+      line: 270,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-  }
-  async reset() {
-    var _a;
     log18("resetting...", {}, {
       file: "service-host.ts",
-      line: 247,
+      line: 272,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4154,7 +4300,15 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log18("reset", {}, {
       file: "service-host.ts",
-      line: 250,
+      line: 275,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    log18.trace("dxos.sdk.client-services-host.reset", trace6.end({
+      id: traceId
+    }), {
+      file: "service-host.ts",
+      line: 276,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4183,41 +4337,6 @@ var LocalClientServices = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/services/utils.ts
-import { Config } from "@dxos/config";
-import { log as log19 } 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()) => {
-  return new LocalClientServices({
-    config,
-    networkManager: createNetworkManager(config)
-  });
-};
-var createNetworkManager = (config, options = {}) => {
-  const signals = config.get("runtime.services.signaling");
-  if (signals) {
-    const { log: log1 = true, signalManager = new WebsocketSignalManager2(signals), transportFactory = createWebRTCTransportFactory({
-      iceServers: config.get("runtime.services.ice")
-    }) } = options;
-    return new NetworkManager2({
-      log: log1,
-      signalManager,
-      transportFactory
-    });
-  }
-  log19.warn("P2P network is not configured.", {}, {
-    file: "utils.ts",
-    line: 48,
-    scope: void 0,
-    callSite: (f, a) => f(...a)
-  });
-  return new NetworkManager2({
-    signalManager: new MemorySignalManager2(new MemorySignalManagerContext2()),
-    transportFactory: MemoryTransportFactory
-  });
-};
-
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
 var __decorate5 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -4232,7 +4351,7 @@ var __decorate5 = function(decorators, target, key, desc) {
 var LOCK_KEY = "DXOS_RESOURCE_LOCK";
 var IFrameHostRuntime = class {
   constructor({ config, origin, appPort, shellPort }) {
-    this._ready = new Trigger9();
+    this._ready = new Trigger10();
     this._configProvider = config;
     this.origin = origin;
     this._appPort = appPort;
@@ -4249,7 +4368,7 @@ var IFrameHostRuntime = class {
   }
   async start() {
     var _a;
-    log20("starting...", {}, {
+    log19("starting...", {}, {
       file: "iframe-host-runtime.ts",
       line: 69,
       scope: this,
@@ -4264,11 +4383,8 @@ var IFrameHostRuntime = class {
       this._clientServices = new LocalClientServices({
         lockKey: LOCK_KEY,
         config: this._config,
-        networkManager: new NetworkManager3({
-          log: true,
-          signalManager: signals ? new WebsocketSignalManager3(signals) : new MemorySignalManager3(new MemorySignalManagerContext3()),
-          transportFactory: this._transportFactory
-        })
+        signalManager: signals ? new WebsocketSignalManager3(signals) : new MemorySignalManager2(new MemorySignalManagerContext2()),
+        transportFactory: this._transportFactory
       });
       const middleware = {
         handleCall: async (method, params, handler) => {
@@ -4301,17 +4417,17 @@ var IFrameHostRuntime = class {
         (_a = this._shellRuntime) == null ? void 0 : _a.open()
       ]);
       this._ready.wake(void 0);
-      log20("started", {}, {
+      log19("started", {}, {
         file: "iframe-host-runtime.ts",
-        line: 115,
+        line: 112,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     } catch (err) {
       this._ready.wake(err);
-      log20.catch(err, {}, {
+      log19.catch(err, {}, {
         file: "iframe-host-runtime.ts",
-        line: 118,
+        line: 115,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -4319,18 +4435,18 @@ var IFrameHostRuntime = class {
   }
   async stop() {
     var _a;
-    log20("stopping...", {}, {
+    log19("stopping...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 123,
+      line: 120,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._clientRpc.close();
     await this._clientServices.close();
     await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
-    log20("stopped", {}, {
+    log19("stopped", {}, {
       file: "iframe-host-runtime.ts",
-      line: 127,
+      line: 124,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4360,6 +4476,9 @@ export {
   InvitationsHandler,
   InvitationsServiceImpl,
   SpaceInvitationProtocol,
+  DataSpace,
+  DataSpaceManager,
+  SpacesServiceImpl,
   createStorageObjects,
   ShellRuntimeImpl,
   MemoryShellRuntime,
@@ -4371,7 +4490,6 @@ export {
   ServiceContext,
   ServiceRegistry,
   ClientServicesHost,
-  LocalClientServices,
-  fromHost
+  LocalClientServices
 };
-//# sourceMappingURL=chunk-T73F4MV4.mjs.map
+//# sourceMappingURL=chunk-IHSMRQ3L.mjs.map