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

package/dist/lib/node/index.cjs

@@ -31,6 +31,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var src_exports = {};
 __export(src_exports, {
   ClientServicesHost: () => ClientServicesHost,
+  DataSpace: () => DataSpace,
+  DataSpaceManager: () => DataSpaceManager,
   DeviceInvitationProtocol: () => DeviceInvitationProtocol,
   DevtoolsHostEvents: () => DevtoolsHostEvents,
   DevtoolsServiceImpl: () => DevtoolsServiceImpl,
@@ -47,13 +49,13 @@ __export(src_exports, {
   ServiceRegistry: () => ServiceRegistry,
   ShellRuntimeImpl: () => ShellRuntimeImpl,
   SpaceInvitationProtocol: () => SpaceInvitationProtocol,
+  SpacesServiceImpl: () => SpacesServiceImpl,
   TrustedKeySetAuthVerifier: () => TrustedKeySetAuthVerifier,
   VaultResourceLock: () => VaultResourceLock,
   WorkerRuntime: () => WorkerRuntime,
   WorkerSession: () => WorkerSession,
   createAuthProvider: () => createAuthProvider,
   createStorageObjects: () => createStorageObjects,
-  fromHost: () => fromHost,
   getNetworkPeers: () => getNetworkPeers,
   subscribeToFeedBlocks: () => subscribeToFeedBlocks,
   subscribeToFeeds: () => subscribeToFeeds,
@@ -66,7 +68,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // packages/sdk/client-services/src/packlets/devtools/devtools.ts
-var import_async2 = require("@dxos/async");
+var import_async3 = require("@dxos/async");
 var import_codec_protobuf5 = require("@dxos/codec-protobuf");
 
 // packages/sdk/client-services/src/packlets/devtools/feeds.ts
@@ -77,9 +79,6 @@ var import_keys = require("@dxos/keys");
 var import_util = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
-    if ((feedKeys == null ? void 0 : feedKeys.length) === 0) {
-      return;
-    }
     const subscriptions = new import_async.EventSubscriptions();
     const feedMap = new import_util.ComplexMap(import_keys.PublicKey.hash);
     const update = () => {
@@ -88,13 +87,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
         }))
       });
     };
@@ -145,26 +145,26 @@ var subscribeToFeedBlocks = ({ feedStore }, { feedKey, maxBlocks = 10 }) => {
 };
 
 // packages/sdk/client-services/src/packlets/devtools/keys.ts
+var import_async2 = require("@dxos/async");
 var import_codec_protobuf2 = require("@dxos/codec-protobuf");
-var subscribeToKeyringKeys = ({ keyring }) => new import_codec_protobuf2.Stream(({ next }) => {
-  const update = () => {
+var subscribeToKeyringKeys = ({ keyring }) => new import_codec_protobuf2.Stream(({ 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);
+  (0, import_async2.scheduleTask)(ctx, update);
 });
 
 // packages/sdk/client-services/src/packlets/devtools/network.ts
 var import_codec_protobuf3 = require("@dxos/codec-protobuf");
 var import_context = require("@dxos/context");
 var import_keys2 = require("@dxos/keys");
-var subscribeToNetworkStatus = ({ networkManager }) => new import_codec_protobuf3.Stream(({ next, close }) => {
+var subscribeToNetworkStatus = ({ signalManager }) => new import_codec_protobuf3.Stream(({ next, close }) => {
   const update = () => {
     try {
-      const status = networkManager.signalManager.getStatus();
+      const status = signalManager.getStatus();
       next({
         servers: status
       });
@@ -172,12 +172,12 @@ var subscribeToNetworkStatus = ({ networkManager }) => new import_codec_protobuf
       close(err);
     }
   };
-  networkManager.signalManager.statusChanged.on(update);
+  signalManager.statusChanged.on(() => update());
   update();
 });
-var subscribeToSignal = ({ networkManager }) => new import_codec_protobuf3.Stream(({ next }) => {
+var subscribeToSignal = ({ signalManager }) => new import_codec_protobuf3.Stream(({ next }) => {
   const ctx = new import_context.Context();
-  networkManager.signalManager.onMessage.on(ctx, (message) => {
+  signalManager.onMessage.on(ctx, (message) => {
     next({
       message: {
         author: message.author.asUint8Array(),
@@ -187,7 +187,7 @@ var subscribeToSignal = ({ networkManager }) => new import_codec_protobuf3.Strea
       receivedAt: new Date()
     });
   });
-  networkManager.signalManager.swarmEvent.on(ctx, (swarmEvent) => {
+  signalManager.swarmEvent.on(ctx, (swarmEvent) => {
     next({
       swarmEvent: swarmEvent.swarmEvent,
       receivedAt: new Date()
@@ -284,7 +284,7 @@ var subscribeToSpaces = (context, { spaceKeys = [] }) => {
 // packages/sdk/client-services/src/packlets/devtools/devtools.ts
 var DevtoolsHostEvents = class {
   constructor() {
-    this.ready = new import_async2.Event();
+    this.ready = new import_async3.Event();
   }
 };
 var DevtoolsServiceImpl = class {
@@ -303,6 +303,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();
   }
@@ -353,12 +371,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() {
@@ -369,7 +387,7 @@ var DevtoolsServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/identity/authenticator.ts
-var import_async3 = require("@dxos/async");
+var import_async4 = require("@dxos/async");
 var import_context2 = require("@dxos/context");
 var import_credentials = require("@dxos/credentials");
 var import_log = require("@dxos/log");
@@ -439,7 +457,7 @@ var TrustedKeySetAuthVerifier = class {
         });
         return true;
       }
-      const trigger = new import_async3.Trigger();
+      const trigger = new import_async4.Trigger();
       this._ctx.onDispose(() => {
         trigger.wake(false);
       });
@@ -484,7 +502,7 @@ var TrustedKeySetAuthVerifier = class {
 
 // packages/sdk/client-services/src/packlets/identity/identity.ts
 var import_node_assert = __toESM(require("node:assert"));
-var import_async4 = require("@dxos/async");
+var import_async5 = require("@dxos/async");
 var import_credentials2 = require("@dxos/credentials");
 var import_debug = require("@dxos/debug");
 var import_feed_store2 = require("@dxos/feed-store");
@@ -493,7 +511,7 @@ var import_credentials3 = require("@dxos/protocols/proto/dxos/halo/credentials")
 var AUTH_TIMEOUT = 3e4;
 var Identity = class {
   constructor({ space, signer, identityKey, deviceKey }) {
-    this.stateUpdate = new import_async4.Event();
+    this.stateUpdate = new import_async5.Event();
     this.space = space;
     this._signer = signer;
     this.identityKey = identityKey;
@@ -627,7 +645,7 @@ var Identity = class {
 
 // packages/sdk/client-services/src/packlets/identity/identity-manager.ts
 var import_node_assert2 = __toESM(require("node:assert"));
-var import_async5 = require("@dxos/async");
+var import_async6 = require("@dxos/async");
 var import_credentials4 = require("@dxos/credentials");
 var import_keys4 = require("@dxos/keys");
 var import_log3 = require("@dxos/log");
@@ -642,20 +660,19 @@ var IdentityManager = class {
     this._keyring = _keyring;
     this._feedStore = _feedStore;
     this._spaceManager = _spaceManager;
-    this.stateUpdate = new import_async5.Event();
-    this._instanceId = import_keys4.PublicKey.random().toHex();
+    this.stateUpdate = new import_async6.Event();
   }
   get identity() {
     return this._identity;
   }
   async open() {
     var _a;
-    import_log3.log.trace("dxos.halo.identity-manager", import_protocols2.trace.begin({
-      id: this._instanceId,
-      parentId: this._traceParent
+    const traceId = import_keys4.PublicKey.random().toHex();
+    import_log3.log.trace("dxos.halo.identity-manager.open", import_protocols2.trace.begin({
+      id: traceId
     }), {
       file: "identity-manager.ts",
-      line: 72,
+      line: 70,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -665,7 +682,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       file: "identity-manager.ts",
-      line: 76,
+      line: 74,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -678,31 +695,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());
-    import_log3.log.trace("dxos.halo.identity-manager", import_protocols2.trace.end({
-      id: this._instanceId
+    import_log3.log.trace("dxos.halo.identity-manager.open", import_protocols2.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;
     (0, import_node_assert2.default)(!this._identity, "Identity already exists.");
     (0, import_log3.log)("creating identity...", {}, {
       file: "identity-manager.ts",
-      line: 96,
+      line: 94,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -751,7 +768,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)
     });
@@ -761,7 +778,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       file: "identity-manager.ts",
-      line: 157,
+      line: 155,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -776,7 +793,7 @@ var IdentityManager = class {
       params
     }, {
       file: "identity-manager.ts",
-      line: 165,
+      line: 163,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -802,7 +819,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)
     });
@@ -812,7 +829,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       file: "identity-manager.ts",
-      line: 191,
+      line: 189,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -824,7 +841,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       file: "identity-manager.ts",
-      line: 197,
+      line: 195,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -857,7 +874,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       file: "identity-manager.ts",
-      line: 225,
+      line: 223,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -874,7 +891,8 @@ var IdentityManager = class {
       },
       swarmIdentity,
       onNetworkConnection: () => {
-      }
+      },
+      memberKey: identityKey
     });
   }
 };
@@ -994,8 +1012,8 @@ var DeviceInvitationProtocol = class {
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
 var import_node_assert6 = __toESM(require("node:assert"));
-var import_async7 = require("@dxos/async");
-var import_client = require("@dxos/client");
+var import_async8 = require("@dxos/async");
+var import_client_protocol = require("@dxos/client-protocol");
 var import_context4 = require("@dxos/context");
 var import_credentials7 = require("@dxos/credentials");
 var import_errors2 = require("@dxos/errors");
@@ -1008,7 +1026,7 @@ var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations")
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-extension.ts
 var import_node_assert5 = __toESM(require("node:assert"));
-var import_async6 = require("@dxos/async");
+var import_async7 = require("@dxos/async");
 var import_context3 = require("@dxos/context");
 var import_errors = require("@dxos/errors");
 var import_keys5 = require("@dxos/keys");
@@ -1029,7 +1047,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
     });
     this._callbacks = _callbacks;
     this._ctx = new import_context3.Context();
-    this._remoteOptionsTrigger = new import_async6.Trigger();
+    this._remoteOptionsTrigger = new import_async7.Trigger();
   }
   async getHandlers() {
     return {
@@ -1044,11 +1062,10 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         introduce: async (request) => {
           const traceId = import_keys5.PublicKey.random().toHex();
           import_log4.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols3.trace.begin({
-            id: traceId,
-            parentId: this._traceParent
+            id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 78,
+            line: 76,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1057,7 +1074,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 83,
+            line: 78,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1066,11 +1083,10 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         authenticate: async (request) => {
           const traceId = import_keys5.PublicKey.random().toHex();
           import_log4.log.trace("dxos.sdk.invitation-handler.host.authenticate", import_protocols3.trace.begin({
-            id: traceId,
-            parentId: this._traceParent
+            id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 89,
+            line: 84,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1082,7 +1098,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             }
           }), {
             file: "invitation-extension.ts",
-            line: 94,
+            line: 86,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1091,11 +1107,10 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
         admit: async (request) => {
           const traceId = import_keys5.PublicKey.random().toHex();
           import_log4.log.trace("dxos.sdk.invitation-handler.host.admit", import_protocols3.trace.begin({
-            id: traceId,
-            parentId: this._traceParent
+            id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 100,
+            line: 92,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1104,7 +1119,7 @@ var InvitationHostExtension = class extends import_teleport.RpcExtension {
             id: traceId
           }), {
             file: "invitation-extension.ts",
-            line: 105,
+            line: 94,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1150,7 +1165,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     });
     this._callbacks = _callbacks;
     this._ctx = new import_context3.Context();
-    this._remoteOptionsTrigger = new import_async6.Trigger();
+    this._remoteOptionsTrigger = new import_async7.Trigger();
   }
   async getHandlers() {
     return {
@@ -1178,7 +1193,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     try {
       (0, import_log4.log)("begin options", {}, {
         file: "invitation-extension.ts",
-        line: 189,
+        line: 178,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1190,7 +1205,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
       }));
       (0, import_log4.log)("end options", {}, {
         file: "invitation-extension.ts",
-        line: 192,
+        line: 181,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1204,7 +1219,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
     } catch (err) {
       (0, import_log4.log)("openError", err, {
         file: "invitation-extension.ts",
-        line: 202,
+        line: 191,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1214,7 +1229,7 @@ var InvitationGuestExtension = class extends import_teleport.RpcExtension {
   async onClose() {
     (0, import_log4.log)("onClose", {}, {
       file: "invitation-extension.ts",
-      line: 208,
+      line: 197,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -1225,13 +1240,16 @@ var InvitationGuestExtension = class extends import_teleport.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;
   }
   createInvitation(protocol, options) {
     var _a;
-    const { invitationId = import_keys6.PublicKey.random().toHex(), type = import_services2.Invitation.Type.INTERACTIVE, authMethod = import_services2.Invitation.AuthMethod.SHARED_SECRET, state = import_services2.Invitation.State.INIT, timeout = import_client.INVITATION_TIMEOUT, swarmKey = import_keys6.PublicKey.random() } = options != null ? options : {};
-    const authCode = (_a = options == null ? void 0 : options.authCode) != null ? _a : authMethod === import_services2.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials7.generatePasscode)(import_client.AUTHENTICATION_CODE_LENGTH) : void 0;
+    const { invitationId = import_keys6.PublicKey.random().toHex(), type = import_services2.Invitation.Type.INTERACTIVE, authMethod = import_services2.Invitation.AuthMethod.SHARED_SECRET, state = import_services2.Invitation.State.INIT, timeout = import_client_protocol.INVITATION_TIMEOUT, swarmKey = import_keys6.PublicKey.random() } = options != null ? options : {};
+    const authCode = (_a = options == null ? void 0 : options.authCode) != null ? _a : authMethod === import_services2.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials7.generatePasscode)(import_client_protocol.AUTHENTICATION_CODE_LENGTH) : void 0;
     (0, import_node_assert6.default)(protocol);
     const invitation = {
       invitationId,
@@ -1243,7 +1261,7 @@ var InvitationsHandler = class {
       timeout,
       ...protocol.getInvitationContext()
     };
-    const stream = new import_async7.PushStream();
+    const stream = new import_async8.PushStream();
     const ctx = new import_context4.Context({
       onError: (err) => {
         void ctx.dispose();
@@ -1255,14 +1273,14 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 99,
+        line: 98,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       stream.complete();
     });
     const createExtension = () => {
-      const success = new import_async7.Trigger();
+      const success = new import_async8.Trigger();
       let guestProfile;
       let authenticationPassed = false;
       let authenticationRetry = 0;
@@ -1273,7 +1291,7 @@ var InvitationsHandler = class {
             ...protocol.toJSON()
           }, {
             file: "invitations-handler.ts",
-            line: 112,
+            line: 111,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1292,7 +1310,7 @@ var InvitationsHandler = class {
             authCode: code
           }, {
             file: "invitations-handler.ts",
-            line: 131,
+            line: 130,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1301,7 +1319,7 @@ var InvitationsHandler = class {
             case import_services2.Invitation.AuthMethod.NONE: {
               (0, import_log5.log)("authentication not required", {}, {
                 file: "invitations-handler.ts",
-                line: 136,
+                line: 135,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1326,7 +1344,7 @@ var InvitationsHandler = class {
                 authMethod: invitation.authMethod
               }, {
                 file: "invitations-handler.ts",
-                line: 154,
+                line: 153,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1355,15 +1373,14 @@ var InvitationsHandler = class {
           }
         },
         onOpen: () => {
-          (0, import_async7.scheduleTask)(ctx, async () => {
+          (0, import_async8.scheduleTask)(ctx, async () => {
             const traceId = import_keys6.PublicKey.random().toHex();
             try {
               import_log5.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols4.trace.begin({
-                id: traceId,
-                parentId: this._traceParent
+                id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 189,
+                line: 188,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1371,7 +1388,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 193,
+                line: 189,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1387,7 +1404,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 196,
+                line: 192,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1399,17 +1416,17 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 198,
+                line: 194,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
             } catch (err) {
-              if (err instanceof import_async7.TimeoutError) {
+              if (err instanceof import_async8.TimeoutError) {
                 (0, import_log5.log)("timeout", {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 201,
+                  line: 197,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1420,7 +1437,7 @@ var InvitationsHandler = class {
               } else {
                 import_log5.log.error("failed", err, {
                   file: "invitations-handler.ts",
-                  line: 204,
+                  line: 200,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1431,13 +1448,13 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 207,
+                line: 203,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
             } finally {
               if (type !== import_services2.Invitation.Type.MULTIUSE) {
-                await (0, import_async7.sleep)(import_client.ON_CLOSE_DELAY);
+                await (0, import_async8.sleep)(import_client_protocol.ON_CLOSE_DELAY);
                 await ctx.dispose();
               }
             }
@@ -1447,12 +1464,12 @@ var InvitationsHandler = class {
           if (err instanceof import_errors2.InvalidInvitationExtensionRoleError) {
             return;
           }
-          if (err instanceof import_async7.TimeoutError) {
+          if (err instanceof import_async8.TimeoutError) {
             (0, import_log5.log)("timeout", {
               ...protocol.toJSON()
             }, {
               file: "invitations-handler.ts",
-              line: 221,
+              line: 217,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1463,7 +1480,7 @@ var InvitationsHandler = class {
           } else {
             import_log5.log.error("failed", err, {
               file: "invitations-handler.ts",
-              line: 224,
+              line: 220,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1471,10 +1488,9 @@ var InvitationsHandler = class {
           }
         }
       });
-      extension._traceParent = this._traceParent;
       return extension;
     };
-    (0, import_async7.scheduleTask)(ctx, async () => {
+    (0, import_async8.scheduleTask)(ctx, async () => {
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
         topic,
@@ -1490,7 +1506,7 @@ var InvitationsHandler = class {
         state: import_services2.Invitation.State.CONNECTING
       });
     });
-    const observable = new import_client.CancellableInvitationObservable({
+    const observable = new import_client_protocol.CancellableInvitationObservable({
       initialInvitation: invitation,
       subscriber: stream.observable,
       onCancel: async () => {
@@ -1504,11 +1520,11 @@ var InvitationsHandler = class {
     return observable;
   }
   acceptInvitation(protocol, invitation) {
-    const { timeout = import_client.INVITATION_TIMEOUT } = invitation;
+    const { timeout = import_client_protocol.INVITATION_TIMEOUT } = invitation;
     (0, import_node_assert6.default)(protocol);
-    const authenticated = new import_async7.Trigger();
+    const authenticated = new import_async8.Trigger();
     let currentState;
-    const stream = new import_async7.PushStream();
+    const stream = new import_async8.PushStream();
     const setState = (newData) => {
       (0, import_node_assert6.default)(newData.state !== void 0);
       currentState = newData.state;
@@ -1519,12 +1535,12 @@ var InvitationsHandler = class {
     };
     const ctx = new import_context4.Context({
       onError: (err) => {
-        if (err instanceof import_async7.TimeoutError) {
+        if (err instanceof import_async8.TimeoutError) {
           (0, import_log5.log)("timeout", {
             ...protocol.toJSON()
           }, {
             file: "invitations-handler.ts",
-            line: 279,
+            line: 274,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1534,7 +1550,7 @@ var InvitationsHandler = class {
         } else {
           import_log5.log.warn("auth failed", err, {
             file: "invitations-handler.ts",
-            line: 282,
+            line: 277,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -1548,7 +1564,7 @@ var InvitationsHandler = class {
         ...protocol.toJSON()
       }, {
         file: "invitations-handler.ts",
-        line: 290,
+        line: 285,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -1563,7 +1579,7 @@ var InvitationsHandler = class {
               currentState
             }, {
               file: "invitations-handler.ts",
-              line: 300,
+              line: 295,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1571,27 +1587,26 @@ var InvitationsHandler = class {
               stream.error(new Error("Remote peer disconnected."));
             }
           });
-          (0, import_async7.scheduleTask)(ctx, async () => {
+          (0, import_async8.scheduleTask)(ctx, async () => {
             const traceId = import_keys6.PublicKey.random().toHex();
             try {
               import_log5.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols4.trace.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}`);
               }
-              (0, import_async7.scheduleTask)(ctx, () => ctx.raise(new import_async7.TimeoutError(timeout)), timeout);
+              (0, import_async8.scheduleTask)(ctx, () => ctx.raise(new import_async8.TimeoutError(timeout)), timeout);
               (0, import_log5.log)("connected", {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 320,
+                line: 312,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1602,7 +1617,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 324,
+                line: 316,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1612,7 +1627,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 file: "invitations-handler.ts",
-                line: 328,
+                line: 320,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1624,7 +1639,7 @@ var InvitationsHandler = class {
                 for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
                   (0, import_log5.log)("guest waiting for authentication code...", {}, {
                     file: "invitations-handler.ts",
-                    line: 337,
+                    line: 329,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1636,7 +1651,7 @@ var InvitationsHandler = class {
                   });
                   (0, import_log5.log)("sending authentication request", {}, {
                     file: "invitations-handler.ts",
-                    line: 341,
+                    line: 333,
                     scope: this,
                     callSite: (f, a) => f(...a)
                   });
@@ -1657,7 +1672,7 @@ var InvitationsHandler = class {
                         attempt
                       }, {
                         file: "invitations-handler.ts",
-                        line: 352,
+                        line: 344,
                         scope: this,
                         callSite: (f, a) => f(...a)
                       });
@@ -1674,7 +1689,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 363,
+                line: 355,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1685,7 +1700,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 file: "invitations-handler.ts",
-                line: 371,
+                line: 363,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1697,17 +1712,17 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 file: "invitations-handler.ts",
-                line: 373,
+                line: 365,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
             } catch (err) {
-              if (err instanceof import_async7.TimeoutError) {
+              if (err instanceof import_async8.TimeoutError) {
                 (0, import_log5.log)("timeout", {
                   ...protocol.toJSON()
                 }, {
                   file: "invitations-handler.ts",
-                  line: 376,
+                  line: 368,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1717,7 +1732,7 @@ var InvitationsHandler = class {
               } else {
                 (0, import_log5.log)("auth failed", err, {
                   file: "invitations-handler.ts",
-                  line: 379,
+                  line: 371,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -1728,7 +1743,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 file: "invitations-handler.ts",
-                line: 382,
+                line: 374,
                 scope: this,
                 callSite: (f, a) => f(...a)
               });
@@ -1741,12 +1756,12 @@ var InvitationsHandler = class {
           if (err instanceof import_errors2.InvalidInvitationExtensionRoleError) {
             return;
           }
-          if (err instanceof import_async7.TimeoutError) {
+          if (err instanceof import_async8.TimeoutError) {
             (0, import_log5.log)("timeout", {
               ...protocol.toJSON()
             }, {
               file: "invitations-handler.ts",
-              line: 393,
+              line: 385,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1756,7 +1771,7 @@ var InvitationsHandler = class {
           } else {
             (0, import_log5.log)("auth failed", err, {
               file: "invitations-handler.ts",
-              line: 396,
+              line: 388,
               scope: this,
               callSite: (f, a) => f(...a)
             });
@@ -1766,7 +1781,7 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    (0, import_async7.scheduleTask)(ctx, async () => {
+    (0, import_async8.scheduleTask)(ctx, async () => {
       (0, import_node_assert6.default)(invitation.swarmKey);
       const topic = invitation.swarmKey;
       const swarmConnection = await this._networkManager.joinSwarm({
@@ -1782,7 +1797,7 @@ var InvitationsHandler = class {
         state: import_services2.Invitation.State.CONNECTING
       });
     });
-    const observable = new import_client.AuthenticatingInvitationObservable({
+    const observable = new import_client_protocol.AuthenticatingInvitationObservable({
       initialInvitation: invitation,
       subscriber: stream.observable,
       onCancel: async () => {
@@ -1802,7 +1817,7 @@ var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
 var import_node_assert7 = __toESM(require("node:assert"));
-var import_async8 = require("@dxos/async");
+var import_async9 = require("@dxos/async");
 var import_codec_protobuf7 = require("@dxos/codec-protobuf");
 var import_log6 = require("@dxos/log");
 var import_services3 = require("@dxos/protocols/proto/dxos/client/services");
@@ -1812,10 +1827,10 @@ var InvitationsServiceImpl = class {
     this._getHandler = _getHandler;
     this._createInvitations = /* @__PURE__ */ new Map();
     this._acceptInvitations = /* @__PURE__ */ new Map();
-    this._invitationCreated = new import_async8.Event();
-    this._invitationAccepted = new import_async8.Event();
-    this._removedCreated = new import_async8.Event();
-    this._removedAccepted = new import_async8.Event();
+    this._invitationCreated = new import_async9.Event();
+    this._invitationAccepted = new import_async9.Event();
+    this._removedCreated = new import_async9.Event();
+    this._removedAccepted = new import_async9.Event();
   }
   // TODO(burdon): Guest/host label.
   getLoggingContext() {
@@ -2005,7 +2020,7 @@ var SpaceInvitationProtocol = class {
       guest: deviceKey
     }, {
       file: "space-invitation-protocol.ts",
-      line: 51,
+      line: 50,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2060,15 +2075,18 @@ var SpaceInvitationProtocol = class {
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 var import_node_assert14 = __toESM(require("node:assert"));
-var import_async21 = require("@dxos/async");
-var import_client8 = require("@dxos/client");
-var import_echo_pipeline5 = require("@dxos/echo-pipeline");
+var import_async23 = require("@dxos/async");
+var import_client_protocol5 = require("@dxos/client-protocol");
+var import_echo_pipeline4 = require("@dxos/echo-pipeline");
+var import_keys11 = require("@dxos/keys");
 var import_log19 = require("@dxos/log");
-var import_protocols8 = require("@dxos/protocols");
-var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
+var import_messaging3 = require("@dxos/messaging");
+var import_network_manager5 = require("@dxos/network-manager");
+var import_protocols9 = require("@dxos/protocols");
+var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 
 // packages/sdk/client-services/src/packlets/devices/devices-service.ts
-var import_async9 = require("@dxos/async");
+var import_async10 = require("@dxos/async");
 var import_codec_protobuf8 = require("@dxos/codec-protobuf");
 var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
 var DevicesServiceImpl = class {
@@ -2099,7 +2117,7 @@ var DevicesServiceImpl = class {
           });
         }
       };
-      const subscriptions = new import_async9.EventSubscriptions();
+      const subscriptions = new import_async10.EventSubscriptions();
       subscriptions.add(this._identityManager.stateUpdate.on(() => {
         update();
         if (this._identityManager.identity) {
@@ -2115,12 +2133,12 @@ var DevicesServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
-var import_async10 = require("@dxos/async");
+var import_async11 = require("@dxos/async");
 var import_codec_protobuf9 = require("@dxos/codec-protobuf");
 var import_log8 = require("@dxos/log");
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async10.Event();
+    this._logs = new import_async11.Event();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -2152,19 +2170,23 @@ var LoggingServiceImpl = class {
     });
   }
 };
-var jsonify = (value) => {
+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(jsonify);
+      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]);
+        res[key] = jsonify(value[key], handles);
       }
       return res;
     }
@@ -2176,53 +2198,62 @@ var jsonify = (value) => {
 // packages/sdk/client-services/src/packlets/network/network-service.ts
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var NetworkServiceImpl = class {
-  constructor(networkManager) {
+  constructor(networkManager, signalManager) {
     this.networkManager = networkManager;
+    this.signalManager = signalManager;
   }
-  subscribeToNetworkStatus() {
+  queryStatus() {
     return new import_codec_protobuf10.Stream(({ next }) => {
-      const unsubscribe = this.networkManager.connectionStateChanged.on((state) => next({
-        state
-      }));
-      next({
-        state: this.networkManager.connectionState
-      });
-      return unsubscribe;
+      const update = () => {
+        next({
+          swarm: this.networkManager.connectionState,
+          signaling: this.signalManager.getStatus().map(({ host, state }) => ({
+            server: host,
+            state
+          }))
+        });
+      };
+      const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
+      const unsubscribeSignal = this.signalManager.statusChanged.on(() => update());
+      update();
+      return () => {
+        unsubscribeSwarm();
+        unsubscribeSignal();
+      };
     });
   }
-  async setNetworkOptions(request) {
-    await this.networkManager.setConnectionState(request.state);
+  async updateConfig(request) {
+    await this.networkManager.setConnectionState(request.swarm);
   }
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
 var import_node_assert10 = __toESM(require("node:assert"));
-var import_async13 = require("@dxos/async");
-var import_client3 = require("@dxos/client");
+var import_async14 = require("@dxos/async");
 var import_context7 = require("@dxos/context");
-var import_credentials10 = require("@dxos/credentials");
-var import_echo_pipeline2 = require("@dxos/echo-pipeline");
+var import_credentials12 = require("@dxos/credentials");
 var import_keys9 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
+var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
 var import_util5 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-var import_async12 = require("@dxos/async");
-var import_client2 = require("@dxos/client");
+var import_async13 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
 var import_debug3 = require("@dxos/debug");
 var import_echo_pipeline = require("@dxos/echo-pipeline");
 var import_errors3 = require("@dxos/errors");
 var import_keys8 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
+var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials9 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_util4 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
 var import_node_assert9 = __toESM(require("node:assert"));
-var import_async11 = require("@dxos/async");
+var import_async12 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
 var import_keys7 = require("@dxos/keys");
 var import_log9 = require("@dxos/log");
@@ -2235,7 +2266,7 @@ var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
 var NotarizationPlugin = class {
   constructor() {
     this._ctx = new import_context5.Context();
-    this._extensionOpened = new import_async11.Event();
+    this._extensionOpened = new import_async12.Event();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new import_util3.ComplexSet(import_keys7.PublicKey.hash);
     this._processCredentialsTriggers = new import_util3.ComplexMap(import_keys7.PublicKey.hash);
@@ -2258,7 +2289,7 @@ var NotarizationPlugin = class {
       callSite: (f, a) => f(...a)
     });
     (0, import_node_assert9.default)(credentials.every((credential) => credential.id), "Credentials must have an id");
-    const errors = new import_async11.Trigger();
+    const errors = new import_async12.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
         import_log9.log.warn("Notarization error", {
@@ -2275,7 +2306,7 @@ var NotarizationPlugin = class {
     });
     opCtx == null ? void 0 : opCtx.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      (0, import_async11.scheduleTask)(ctx, () => {
+      (0, import_async12.scheduleTask)(ctx, () => {
         import_log9.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
@@ -2286,12 +2317,12 @@ var NotarizationPlugin = class {
           callSite: (f, a) => f(...a)
         });
         void ctx.dispose();
-        errors.throw(new import_async11.TimeoutError(timeout, "Notarization timed out"));
+        errors.throw(new import_async12.TimeoutError(timeout, "Notarization timed out"));
       }, timeout);
     }
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
     const peersTried = /* @__PURE__ */ new Set();
-    const notarizeTask = new import_async11.DeferredTask(ctx, async () => {
+    const notarizeTask = new import_async12.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
           return;
@@ -2309,7 +2340,7 @@ var NotarizationPlugin = class {
             callSite: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async11.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
+          (0, import_async12.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
@@ -2331,7 +2362,7 @@ var NotarizationPlugin = class {
           scope: this,
           callSite: (f, a) => f(...a)
         });
-        await (0, import_async11.sleep)(successDelay);
+        await (0, import_async12.sleep)(successDelay);
       } catch (err) {
         import_log9.log.warn("error notarizing (recoverable)", err, {
           file: "notarization-plugin.ts",
@@ -2380,7 +2411,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util3.entry)(this._processCredentialsTriggers, id).orInsert(new import_async11.Trigger()).value.wait();
+    await (0, import_util3.entry)(this._processCredentialsTriggers, id).orInsert(new import_async12.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -2474,8 +2505,13 @@ var AUTH_TIMEOUT2 = 3e4;
 var DataSpace = class DataSpace2 {
   constructor(params) {
     this._ctx = new import_context6.Context();
-    this._state = import_client2.SpaceState.CLOSED;
-    this.stateUpdate = new import_async12.Event();
+    this._state = import_services6.SpaceState.CLOSED;
+    /**
+    * Error for _state === SpaceState.ERROR.
+    */
+    this.error = void 0;
+    this.stateUpdate = new import_async13.Event();
+    this.metrics = {};
     var _a;
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
@@ -2486,21 +2522,13 @@ var DataSpace = class DataSpace2 {
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
     this._callbacks = (_a = params.callbacks) != null ? _a : {};
-    this._dataPipeline = new import_echo_pipeline.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 import_util4.ComplexSet(import_keys8.PublicKey.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;
@@ -2516,7 +2544,7 @@ var DataSpace = class DataSpace2 {
     return this._inner;
   }
   get dataPipeline() {
-    return this._dataPipeline;
+    return this._inner.dataPipeline;
   }
   get presence() {
     return this._presence;
@@ -2524,16 +2552,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 = import_client2.SpaceState.INACTIVE;
+    this._state = import_services6.SpaceState.INACTIVE;
+    this.metrics.open = new Date();
   }
   async close() {
-    this._state = import_client2.SpaceState.CLOSED;
+    this._state = import_services6.SpaceState.CLOSED;
     await this._ctx.dispose();
-    await this._dataPipeline.close();
     await this.authVerifier.close();
     await this._inner.close();
     await this._notarizationPluginConsumer.close();
@@ -2550,14 +2581,15 @@ var DataSpace = class DataSpace2 {
   * Initialize the data pipeline in a separate task.
   */
   initializeDataPipelineAsync() {
-    (0, import_async12.scheduleTask)(this._ctx, async () => {
+    (0, import_async13.scheduleTask)(this._ctx, async () => {
       try {
+        this.metrics.pipelineInitBegin = new Date();
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof import_errors3.CancelledError) {
           (0, import_log10.log)("Data pipeline initialization cancelled", err, {
             file: "data-space.ts",
-            line: 178,
+            line: 173,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -2565,27 +2597,33 @@ var DataSpace = class DataSpace2 {
         }
         import_log10.log.error("Error initializing data pipeline", err, {
           file: "data-space.ts",
-          line: 182,
+          line: 177,
           scope: this,
           callSite: (f, a) => f(...a)
         });
+        this._state = import_services6.SpaceState.ERROR;
+        this.error = err;
+        this.stateUpdate.emit();
+      } finally {
+        this.metrics.ready = new Date();
       }
     });
   }
   async initializeDataPipeline() {
     var _a, _b, _c, _d;
-    if (this._state !== import_client2.SpaceState.INACTIVE) {
+    if (this._state !== import_services6.SpaceState.INACTIVE) {
       throw new import_errors3.SystemError("Invalid operation");
     }
-    this._state = import_client2.SpaceState.INITIALIZING;
+    this._state = import_services6.SpaceState.INITIALIZING;
     await this._inner.controlPipeline.state.waitUntilReachedTargetTimeframe({
       ctx: this._ctx,
       breakOnStall: false
     });
+    this.metrics.controlPipelineReady = new Date();
     await this._createWritableFeeds();
     (0, import_log10.log)("Writable feeds created", {}, {
       file: "data-space.ts",
-      line: 200,
+      line: 202,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2595,33 +2633,28 @@ 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;
-      }
-    });
+    await this._inner.initializeDataPipeline();
+    this.metrics.dataPipelineOpen = new Date();
+    await (0, import_context6.cancelWithContext)(this._ctx, this._inner.dataPipeline.ensureEpochInitialized());
     (0, import_log10.log)("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
     });
+    this.metrics.dataPipelineReady = new Date();
     (0, import_log10.log)("data pipeline ready", {}, {
       file: "data-space.ts",
-      line: 227,
+      line: 230,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await ((_b = (_a = this._callbacks).beforeReady) == null ? void 0 : _b.call(_a));
-    this._state = import_client2.SpaceState.READY;
+    this._state = import_services6.SpaceState.READY;
     this.stateUpdate.emit();
     await ((_d = (_c = this._callbacks).afterReady) == null ? void 0 : _d.call(_c));
   }
@@ -2668,14 +2701,105 @@ 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([
   (0, import_debug3.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
 DataSpace = __decorate([
-  (0, import_async12.trackLeaks)("open", "close")
+  (0, import_async13.trackLeaks)("open", "close")
 ], DataSpace);
 
+// packages/sdk/client-services/src/packlets/spaces/genesis.ts
+var import_credentials10 = require("@dxos/credentials");
+var import_debug4 = require("@dxos/debug");
+var import_credentials11 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_timeframe = require("@dxos/timeframe");
+var spaceGenesis = async (keyring, signingContext, space) => {
+  var _a, _b, _c, _d;
+  const credentials = [
+    await (0, import_credentials10.createCredential)({
+      signer: keyring,
+      issuer: space.key,
+      subject: space.key,
+      assertion: {
+        "@type": "dxos.halo.credentials.SpaceGenesis",
+        spaceKey: space.key
+      }
+    }),
+    await (0, import_credentials10.createCredential)({
+      signer: keyring,
+      issuer: space.key,
+      subject: signingContext.identityKey,
+      assertion: {
+        "@type": "dxos.halo.credentials.SpaceMember",
+        spaceKey: space.key,
+        role: import_credentials11.SpaceMember.Role.ADMIN,
+        profile: signingContext.profile,
+        genesisFeedKey: (_a = space.controlFeedKey) != null ? _a : (0, import_debug4.failUndefined)()
+      }
+    }),
+    await signingContext.credentialSigner.createCredential({
+      subject: (_b = space.controlFeedKey) != null ? _b : (0, import_debug4.failUndefined)(),
+      assertion: {
+        "@type": "dxos.halo.credentials.AdmittedFeed",
+        spaceKey: space.key,
+        identityKey: signingContext.identityKey,
+        deviceKey: signingContext.deviceKey,
+        designation: import_credentials11.AdmittedFeed.Designation.CONTROL
+      }
+    }),
+    await signingContext.credentialSigner.createCredential({
+      subject: (_c = space.dataFeedKey) != null ? _c : (0, import_debug4.failUndefined)(),
+      assertion: {
+        "@type": "dxos.halo.credentials.AdmittedFeed",
+        spaceKey: space.key,
+        identityKey: signingContext.identityKey,
+        deviceKey: signingContext.deviceKey,
+        designation: import_credentials11.AdmittedFeed.Designation.DATA
+      }
+    }),
+    await signingContext.credentialSigner.createCredential({
+      subject: (_d = space.key) != null ? _d : (0, import_debug4.failUndefined)(),
+      assertion: {
+        "@type": "dxos.halo.credentials.Epoch",
+        number: 0,
+        previousId: void 0,
+        timeframe: new import_timeframe.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;
@@ -2688,17 +2812,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 import_context7.Context();
-    this.updated = new import_async13.Event();
+    this.updated = new import_async14.Event();
     this._spaces = new import_util5.ComplexMap(import_keys9.PublicKey.hash);
     this._isOpen = false;
     this._instanceId = import_keys9.PublicKey.random().toHex();
@@ -2710,16 +2832,15 @@ var DataSpaceManager = class DataSpaceManager2 {
   async open() {
     (0, import_log11.log)("open", {}, {
       file: "data-space-manager.ts",
-      line: 83,
+      line: 80,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    import_log11.log.trace("dxos.echo.data-space-manager", import_protocols6.trace.begin({
-      id: this._instanceId,
-      parentId: this._traceParent
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols6.trace.begin({
+      id: this._instanceId
     }), {
       file: "data-space-manager.ts",
-      line: 84,
+      line: 81,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2728,7 +2849,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       spaces: this._metadataStore.spaces.length
     }, {
       file: "data-space-manager.ts",
-      line: 86,
+      line: 83,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2738,7 +2859,7 @@ var DataSpaceManager = class DataSpaceManager2 {
           spaceMetadata
         }, {
           file: "data-space-manager.ts",
-          line: 90,
+          line: 87,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2750,7 +2871,7 @@ var DataSpaceManager = class DataSpaceManager2 {
           err
         }, {
           file: "data-space-manager.ts",
-          line: 94,
+          line: 91,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -2758,11 +2879,19 @@ var DataSpaceManager = class DataSpaceManager2 {
     }
     this._isOpen = true;
     this.updated.emit();
+    import_log11.log.trace("dxos.echo.data-space-manager.open", import_protocols6.trace.end({
+      id: this._instanceId
+    }), {
+      file: "data-space-manager.ts",
+      line: 97,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
   }
   async close() {
     (0, import_log11.log)("close", {}, {
       file: "data-space-manager.ts",
-      line: 104,
+      line: 102,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2771,14 +2900,6 @@ var DataSpaceManager = class DataSpaceManager2 {
     for (const space of this._spaces.values()) {
       await space.close();
     }
-    import_log11.log.trace("dxos.echo.data-space-manager", import_protocols6.trace.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.
@@ -2798,15 +2919,15 @@ var DataSpaceManager = class DataSpaceManager2 {
       spaceKey
     }, {
       file: "data-space-manager.ts",
-      line: 129,
+      line: 126,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     const space = await this._constructSpace(metadata);
-    const credentials = await (0, import_echo_pipeline2.spaceGenesis)(this._keyring, this._signingContext, space.inner);
+    const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_node_assert10.default)((0, import_credentials10.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
+    (0, import_node_assert10.default)((0, import_credentials12.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
     await this._signingContext.recordCredential(memberCredential);
     await space.initializeDataPipeline();
     this.updated.emit();
@@ -2818,7 +2939,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       opts
     }, {
       file: "data-space-manager.ts",
-      line: 148,
+      line: 145,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2844,7 +2965,7 @@ var DataSpaceManager = class DataSpaceManager2 {
   async waitUntilSpaceReady(spaceKey) {
     await (0, import_context7.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
-      return !!space && space.state === import_client3.SpaceState.READY;
+      return !!space && space.state === import_services7.SpaceState.READY;
     }));
   }
   async _constructSpace(metadata) {
@@ -2852,7 +2973,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       metadata
     }, {
       file: "data-space-manager.ts",
-      line: 184,
+      line: 181,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -2865,7 +2986,6 @@ var DataSpaceManager = class DataSpaceManager2 {
       identityKey: this._signingContext.identityKey,
       gossip
     });
-    const snapshotManager = new import_echo_pipeline2.SnapshotManager(this._snapshotStore);
     const controlFeed = metadata.controlFeedKey && await this._feedStore.openFeed(metadata.controlFeedKey, {
       writable: true
     });
@@ -2883,35 +3003,32 @@ 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 () => {
           (0, import_log11.log)("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 () => {
           (0, import_log11.log)("after space ready", {
@@ -2919,7 +3036,7 @@ var DataSpaceManager = class DataSpaceManager2 {
             open: this._isOpen
           }, {
             file: "data-space-manager.ts",
-            line: 240,
+            line: 233,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -2927,7 +3044,8 @@ var DataSpaceManager = class DataSpaceManager2 {
             this.updated.emit();
           }
         }
-      }
+      },
+      cache: metadata.cache
     });
     await dataSpace.open();
     if (metadata.controlTimeframe) {
@@ -2941,28 +3059,29 @@ var DataSpaceManager = class DataSpaceManager2 {
   }
 };
 __decorate2([
-  import_async13.synchronized
+  import_async14.synchronized
 ], DataSpaceManager.prototype, "open", null);
 __decorate2([
-  import_async13.synchronized
+  import_async14.synchronized
 ], DataSpaceManager.prototype, "close", null);
 __decorate2([
-  import_async13.synchronized
+  import_async14.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 __decorate2([
-  import_async13.synchronized
+  import_async14.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = __decorate2([
-  (0, import_async13.trackLeaks)("open", "close")
+  (0, import_async14.trackLeaks)("open", "close")
 ], DataSpaceManager);
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
-var import_async14 = require("@dxos/async");
+var import_async15 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
-var import_debug4 = require("@dxos/debug");
-var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_debug5 = require("@dxos/debug");
+var import_echo_pipeline2 = require("@dxos/echo-pipeline");
 var import_log12 = require("@dxos/log");
-var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols7 = require("@dxos/protocols");
+var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util6 = require("@dxos/util");
 var TIMEFRAME_UPDATE_DEBOUNCE_TIME = 500;
 var SpacesServiceImpl = class {
@@ -2981,7 +3100,7 @@ var SpacesServiceImpl = class {
     return this._transformSpace(space);
   }
   async updateSpace(request) {
-    (0, import_debug4.todo)();
+    (0, import_debug5.todo)();
   }
   querySpaces() {
     return new import_codec_protobuf11.Stream(({ next, ctx }) => {
@@ -2992,7 +3111,7 @@ var SpacesServiceImpl = class {
           spaces
         }, {
           file: "spaces-service.ts",
-          line: 60,
+          line: 62,
           scope: this,
           callSite: (f, a) => f(...a)
         });
@@ -3000,9 +3119,9 @@ var SpacesServiceImpl = class {
           spaces
         });
       };
-      (0, import_async14.scheduleTask)(ctx, async () => {
+      (0, import_async15.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async14.EventSubscriptions();
+        const subscriptions = new import_async15.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
@@ -3032,15 +3151,15 @@ var SpacesServiceImpl = class {
   async postMessage({ spaceKey, channel, message }) {
     var _a;
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
+    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      (0, import_async14.scheduleTask)(ctx, async () => {
+      (0, import_async15.scheduleTask)(ctx, async () => {
         var _a;
         const dataSpaceManager = await this._getDataSpaceManager();
-        const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
+        const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -3051,19 +3170,19 @@ var SpacesServiceImpl = class {
   queryCredentials({ spaceKey }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
       var _a;
-      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
+      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
       const processor = space.spaceState.registerProcessor({
         process: async (credential) => {
           next(credential);
         }
       });
       ctx.onDispose(() => processor.close());
-      (0, import_async14.scheduleTask)(ctx, () => processor.open());
+      (0, import_async15.scheduleTask)(ctx, () => processor.open());
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
     var _a;
-    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug4.raise)(new import_echo_pipeline3.SpaceNotFoundError(spaceKey));
+    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
     for (const credential of credentials != null ? credentials : []) {
       await space.controlPipeline.writer.write({
         credential: {
@@ -3072,11 +3191,18 @@ var SpacesServiceImpl = class {
       });
     }
   }
+  async createEpoch({ spaceKey }) {
+    var _a;
+    const dataSpaceManager = await this._getDataSpaceManager();
+    const space = (_a = dataSpaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug5.raise)(new import_echo_pipeline2.SpaceNotFoundError(spaceKey));
+    await space.createEpoch();
+  }
   _transformSpace(space) {
     var _a, _b, _c, _d, _e;
     return {
       spaceKey: space.key,
       state: space.state,
+      error: space.error ? (0, import_protocols7.encodeError)(space.error) : void 0,
       pipeline: {
         controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
         currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
@@ -3096,9 +3222,11 @@ var SpacesServiceImpl = class {
               displayName: (_b2 = (_a2 = member.assertion.profile) == null ? void 0 : _a2.displayName) != null ? _b2 : (0, import_util6.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 ? import_services6.SpaceMember.PresenceState.ONLINE : import_services6.SpaceMember.PresenceState.OFFLINE
+          presence: ((_c2 = this._identityManager.identity) == null ? void 0 : _c2.identityKey.equals(member.key)) || space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services8.SpaceMember.PresenceState.ONLINE : import_services8.SpaceMember.PresenceState.OFFLINE
         };
-      })
+      }),
+      cache: space.cache,
+      metrics: space.metrics
     };
   }
 };
@@ -3190,7 +3318,7 @@ var SystemServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-var import_async16 = require("@dxos/async");
+var import_async17 = require("@dxos/async");
 var import_log13 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
@@ -3198,7 +3326,7 @@ var import_util7 = require("@dxos/util");
 
 // packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
-var import_debug5 = require("@dxos/debug");
+var import_debug6 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
 var ClientRpcServer = class {
   constructor(params) {
@@ -3238,7 +3366,7 @@ var ClientRpcServer = class {
   _getServiceHandler(serviceName) {
     var _a;
     if (!this._handlerCache.has(serviceName)) {
-      const [key, descriptor] = (_a = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName)) != null ? _a : (0, import_debug5.raise)(new Error(`Service not available: ${serviceName}`));
+      const [key, descriptor] = (_a = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName)) != null ? _a : (0, import_debug6.raise)(new Error(`Service not available: ${serviceName}`));
       const service = this._serviceRegistry.services[key];
       if (!service) {
         throw new Error(`Service not available: ${serviceName}`);
@@ -3251,14 +3379,14 @@ var ClientRpcServer = class {
 
 // packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
 var import_node_assert11 = __toESM(require("node:assert"));
-var import_async15 = require("@dxos/async");
-var import_client4 = require("@dxos/client");
+var import_async16 = require("@dxos/async");
+var import_client_protocol2 = require("@dxos/client-protocol");
 var import_iframe = require("@dxos/protocols/proto/dxos/iframe");
 var import_rpc2 = require("@dxos/rpc");
 var ShellRuntimeImpl = class {
   constructor(_port) {
     this._port = _port;
-    this.layoutUpdate = new import_async15.Event();
+    this.layoutUpdate = new import_async16.Event();
     this._layout = import_iframe.ShellLayout.DEFAULT;
   }
   get layout() {
@@ -3285,8 +3413,8 @@ var ShellRuntimeImpl = class {
   }
   async open() {
     this._appRpc = (0, import_rpc2.createProtoRpcPeer)({
-      requested: import_client4.appServiceBundle,
-      exposed: import_client4.shellServiceBundle,
+      requested: import_client_protocol2.appServiceBundle,
+      exposed: import_client_protocol2.shellServiceBundle,
       handlers: {
         ShellService: {
           setLayout: async (request) => {
@@ -3309,8 +3437,8 @@ var ShellRuntimeImpl = class {
 };
 var MemoryShellRuntime = class {
   constructor({ layout, invitationCode, spaceKey } = {}) {
-    this.layoutUpdate = new import_async15.Event();
-    this.contextUpdate = new import_async15.Event();
+    this.layoutUpdate = new import_async16.Event();
+    this.contextUpdate = new import_async16.Event();
     this._layout = layout != null ? layout : import_iframe.ShellLayout.DEFAULT;
     this._invitationCode = invitationCode;
     this._spaceKey = spaceKey;
@@ -3352,7 +3480,7 @@ var __decorate3 = function(decorators, target, key, desc) {
 var LOCK_KEY = "DXOS_RESOURCE_LOCK";
 var IFrameHostRuntime = class {
   constructor({ config, origin, appPort, shellPort }) {
-    this._ready = new import_async16.Trigger();
+    this._ready = new import_async17.Trigger();
     this._configProvider = config;
     this.origin = origin;
     this._appPort = appPort;
@@ -3384,11 +3512,8 @@ var IFrameHostRuntime = class {
       this._clientServices = new LocalClientServices({
         lockKey: LOCK_KEY,
         config: this._config,
-        networkManager: new import_network_manager2.NetworkManager({
-          log: true,
-          signalManager: signals ? new import_messaging.WebsocketSignalManager(signals) : new import_messaging.MemorySignalManager(new import_messaging.MemorySignalManagerContext()),
-          transportFactory: this._transportFactory
-        })
+        signalManager: signals ? new import_messaging.WebsocketSignalManager(signals) : new import_messaging.MemorySignalManager(new import_messaging.MemorySignalManagerContext()),
+        transportFactory: this._transportFactory
       });
       const middleware = {
         handleCall: async (method, params, handler) => {
@@ -3423,7 +3548,7 @@ var IFrameHostRuntime = class {
       this._ready.wake(void 0);
       (0, import_log13.log)("started", {}, {
         file: "iframe-host-runtime.ts",
-        line: 115,
+        line: 112,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3431,7 +3556,7 @@ var IFrameHostRuntime = class {
       this._ready.wake(err);
       import_log13.log.catch(err, {}, {
         file: "iframe-host-runtime.ts",
-        line: 118,
+        line: 115,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3441,7 +3566,7 @@ var IFrameHostRuntime = class {
     var _a;
     (0, import_log13.log)("stopping...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 123,
+      line: 120,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3450,7 +3575,7 @@ var IFrameHostRuntime = class {
     await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
     (0, import_log13.log)("stopped", {}, {
       file: "iframe-host-runtime.ts",
-      line: 127,
+      line: 124,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3461,7 +3586,8 @@ __decorate3([
 ], IFrameHostRuntime.prototype, "origin", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
-var import_client5 = require("@dxos/client");
+var import_async18 = require("@dxos/async");
+var import_client_protocol3 = require("@dxos/client-protocol");
 var import_errors5 = require("@dxos/errors");
 var import_log14 = require("@dxos/log");
 var import_network_manager3 = require("@dxos/network-manager");
@@ -3469,6 +3595,8 @@ var import_rpc3 = require("@dxos/rpc");
 var import_util8 = require("@dxos/util");
 var IFrameProxyRuntime = class {
   constructor({ config, systemPort, shellPort }) {
+    this._id = String(Math.floor(Math.random() * 1e6));
+    this._release = new import_async18.Trigger();
     this._configProvider = config;
     this._systemPort = systemPort;
     this._shellPort = shellPort;
@@ -3486,27 +3614,35 @@ var IFrameProxyRuntime = class {
       iceServers: this._config.get("runtime.services.ice")
     });
     this._systemRpc = (0, import_rpc3.createProtoRpcPeer)({
-      requested: import_client5.workerServiceBundle,
-      exposed: import_client5.iframeServiceBundle,
+      requested: import_client_protocol3.workerServiceBundle,
+      exposed: import_client_protocol3.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 import_async18.Trigger();
+      const ready = new import_async18.Trigger();
+      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) {
       import_log14.log.catch(err, {}, {
         file: "iframe-proxy-runtime.ts",
-        line: 74,
+        line: 85,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3516,14 +3652,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
-var import_async17 = require("@dxos/async");
+var import_async19 = require("@dxos/async");
 var import_log15 = require("@dxos/log");
 var __decorate4 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -3542,7 +3682,7 @@ var Message;
 var VaultResourceLock = class {
   constructor({ lockKey, onAcquire, onRelease }) {
     this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
-    this._releaseTrigger = new import_async17.Trigger();
+    this._releaseTrigger = new import_async19.Trigger();
     this._lockKey = lockKey;
     this._onAcquire = onAcquire;
     this._onRelease = onRelease;
@@ -3562,7 +3702,7 @@ var VaultResourceLock = class {
         scope: this,
         callSite: (f, a) => f(...a)
       });
-      await (0, import_async17.asyncTimeout)(this._requestLock(), 3e3);
+      await (0, import_async19.asyncTimeout)(this._requestLock(), 3e3);
       (0, import_log15.log)("acquired lock", {}, {
         file: "vault-resource-lock.ts",
         line: 46,
@@ -3602,14 +3742,14 @@ var VaultResourceLock = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    const acquired = new import_async17.Trigger();
+    const acquired = new import_async19.Trigger();
     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 import_async17.Trigger();
+      this._releaseTrigger = new import_async19.Trigger();
       await this._releaseTrigger.wait();
       (0, import_log15.log)("releasing lock...", {}, {
         file: "vault-resource-lock.ts",
@@ -3644,15 +3784,15 @@ __decorate4([
 ], VaultResourceLock.prototype, "lockKey", null);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
-var import_async19 = require("@dxos/async");
+var import_async21 = require("@dxos/async");
 var import_log17 = require("@dxos/log");
 var import_messaging2 = require("@dxos/messaging");
 var import_network_manager4 = require("@dxos/network-manager");
 
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
 var import_node_assert12 = __toESM(require("node:assert"));
-var import_async18 = require("@dxos/async");
-var import_client6 = require("@dxos/client");
+var import_async20 = require("@dxos/async");
+var import_client_protocol4 = require("@dxos/client-protocol");
 var import_log16 = require("@dxos/log");
 var import_rpc4 = require("@dxos/rpc");
 var import_util9 = require("@dxos/util");
@@ -3667,14 +3807,10 @@ var __decorate5 = 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 import_async18.Trigger();
+  constructor({ serviceHost, systemPort, appPort, shellPort, readySignal }) {
+    this._startTrigger = new import_async20.Trigger();
     this.onClose = new import_util9.Callback();
-    (0, import_node_assert12.default)(options);
     (0, import_node_assert12.default)(serviceHost);
-    this._options = options;
     this._serviceHost = serviceHost;
     const middleware = {
       handleCall: async (method, params, handler) => {
@@ -3707,12 +3843,13 @@ var WorkerSession = class {
       ...middleware
     });
     this._iframeRpc = (0, import_rpc4.createProtoRpcPeer)({
-      requested: import_client6.iframeServiceBundle,
-      exposed: import_client6.workerServiceBundle,
+      requested: import_client_protocol4.iframeServiceBundle,
+      exposed: import_client_protocol4.workerServiceBundle,
       handlers: {
         WorkerService: {
           start: async (request) => {
             this.origin = request.origin;
+            this.lockKey = request.lockKey;
             this._startTrigger.wake();
           },
           stop: async () => {
@@ -3722,7 +3859,7 @@ var WorkerSession = class {
               } catch (err) {
                 import_log16.log.catch(err, {}, {
                   file: "worker-session.ts",
-                  line: 107,
+                  line: 95,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -3733,14 +3870,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() {
     import_log16.log.info("opening..", {}, {
       file: "worker-session.ts",
-      line: 121,
+      line: 109,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3752,35 +3888,14 @@ var WorkerSession = class {
     await this._startTrigger.wait({
       timeout: 3e3
     });
-    this._heartbeatTimer = setInterval(async () => {
-      try {
-        await this._iframeRpc.rpc.IframeService.heartbeat();
-      } catch (err1) {
-        import_log16.log.warn("Heartbeat failed", {
-          err: err1
-        }, {
-          file: "worker-session.ts",
-          line: 133,
-          scope: this,
-          callSite: (f, a) => f(...a)
-        });
-        try {
-          await this.close();
-        } catch (err) {
-          import_log16.log.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() {
     import_log16.log.info("closing..", {}, {
       file: "worker-session.ts",
-      line: 144,
+      line: 119,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3789,14 +3904,11 @@ var WorkerSession = class {
     } catch (err) {
       import_log16.log.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()
@@ -3804,20 +3916,27 @@ var WorkerSession = class {
   }
   async _maybeOpenShell() {
     try {
-      await (0, import_async18.asyncTimeout)(this._shellClientRpc.open(), 1e3);
+      await (0, import_async20.asyncTimeout)(this._shellClientRpc.open(), 1e3);
     } catch (e) {
       import_log16.log.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);
+  }
 };
 __decorate5([
   import_log16.logInfo
 ], WorkerSession.prototype, "origin", void 0);
+__decorate5([
+  import_log16.logInfo
+], WorkerSession.prototype, "lockKey", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
 var WorkerRuntime = class {
@@ -3825,7 +3944,7 @@ var WorkerRuntime = class {
   constructor(_configProvider) {
     this._configProvider = _configProvider;
     this._transportFactory = new import_network_manager4.WebRTCTransportProxyFactory();
-    this._ready = new import_async19.Trigger();
+    this._ready = new import_async21.Trigger();
     this.sessions = /* @__PURE__ */ new Set();
     this._clientServices = new ClientServicesHost();
   }
@@ -3844,17 +3963,14 @@ var WorkerRuntime = class {
       const signals = this._config.get("runtime.services.signaling");
       this._clientServices.initialize({
         config: this._config,
-        networkManager: new import_network_manager4.NetworkManager({
-          log: true,
-          signalManager: signals ? new import_messaging2.WebsocketSignalManager(signals) : new import_messaging2.MemorySignalManager(new import_messaging2.MemorySignalManagerContext()),
-          transportFactory: this._transportFactory
-        })
+        signalManager: signals ? new import_messaging2.WebsocketSignalManager(signals) : new import_messaging2.MemorySignalManager(new import_messaging2.MemorySignalManagerContext()),
+        transportFactory: this._transportFactory
       });
       await this._clientServices.open();
       this._ready.wake(void 0);
       (0, import_log17.log)("started", {}, {
         file: "worker-runtime.ts",
-        line: 65,
+        line: 62,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3862,7 +3978,7 @@ var WorkerRuntime = class {
       this._ready.wake(err);
       import_log17.log.catch(err, {}, {
         file: "worker-runtime.ts",
-        line: 68,
+        line: 65,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3894,6 +4010,12 @@ var WorkerRuntime = class {
   * Selects one of the existing session fro WebRTC networking.
   */
   _reconnectWebrtc() {
+    (0, import_log17.log)("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;
@@ -3913,68 +4035,69 @@ var WorkerRuntime = class {
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
 var import_node_assert13 = __toESM(require("node:assert"));
-var import_async20 = require("@dxos/async");
-var import_client7 = require("@dxos/client");
-var import_credentials11 = require("@dxos/credentials");
-var import_debug6 = require("@dxos/debug");
-var import_echo_pipeline4 = require("@dxos/echo-pipeline");
+var import_async22 = require("@dxos/async");
+var import_credentials13 = require("@dxos/credentials");
+var import_debug7 = require("@dxos/debug");
+var import_echo_pipeline3 = require("@dxos/echo-pipeline");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_keyring = require("@dxos/keyring");
 var import_keys10 = require("@dxos/keys");
 var import_log18 = require("@dxos/log");
-var import_protocols7 = require("@dxos/protocols");
+var import_protocols8 = require("@dxos/protocols");
+var import_services11 = require("@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 import_async20.Trigger();
-    this.dataServiceSubscriptions = new import_echo_pipeline4.DataServiceSubscriptions();
+    this.initialized = new import_async22.Trigger();
+    this.dataServiceSubscriptions = new import_echo_pipeline3.DataServiceSubscriptions();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys10.PublicKey.random().toHex();
-    networkManager._traceParent = this._instanceId;
-    this.metadataStore = new import_echo_pipeline4.MetadataStore(storage.createDirectory("metadata"));
-    this.snapshotStore = new import_echo_pipeline4.SnapshotStore(storage.createDirectory("snapshots"));
+    this.metadataStore = new import_echo_pipeline3.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_pipeline3.SnapshotStore(storage.createDirectory("snapshots"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
     this.feedStore = new import_feed_store4.FeedStore({
       factory: new import_feed_store4.FeedFactory({
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline4.valueEncoding
+          valueEncoding: import_echo_pipeline3.valueEncoding
         }
       })
     });
-    this.spaceManager = new import_echo_pipeline4.SpaceManager({
+    this.spaceManager = new import_echo_pipeline3.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(import_client7.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
+    this._handlerFactories.set(import_services11.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => {
       var _a;
-      return (_a = this.identityManager.identity) != null ? _a : (0, import_debug6.failUndefined)();
+      return (_a = this.identityManager.identity) != null ? _a : (0, import_debug7.failUndefined)();
     }, this._acceptIdentity.bind(this)));
   }
   async open() {
-    import_log18.log.trace("dxos.sdk.service-context", import_protocols7.trace.begin({
+    import_log18.log.trace("dxos.sdk.service-context.open", import_protocols8.trace.begin({
       id: this._instanceId
     }), {
       file: "service-context.ts",
-      line: 115,
+      line: 119,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     (0, import_log18.log)("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();
@@ -3983,7 +4106,15 @@ var ServiceContext = class {
     }
     (0, import_log18.log)("opened", {}, {
       file: "service-context.ts",
-      line: 124,
+      line: 129,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    import_log18.log.trace("dxos.sdk.service-context.open", import_protocols8.trace.end({
+      id: this._instanceId
+    }), {
+      file: "service-context.ts",
+      line: 130,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3992,7 +4123,7 @@ var ServiceContext = class {
     var _a, _b;
     (0, import_log18.log)("closing...", {}, {
       file: "service-context.ts",
-      line: 128,
+      line: 134,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4002,18 +4133,11 @@ var ServiceContext = class {
     await this.spaceManager.close();
     await this.feedStore.close();
     await this.networkManager.close();
+    await this.signalManager.close();
     this.dataServiceSubscriptions.clear();
     (0, import_log18.log)("closed", {}, {
       file: "service-context.ts",
-      line: 136,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    import_log18.log.trace("dxos.sdk.service-context", import_protocols7.trace.end({
-      id: this._instanceId
-    }), {
-      file: "service-context.ts",
-      line: 138,
+      line: 143,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4038,11 +4162,11 @@ var ServiceContext = class {
     var _a;
     (0, import_log18.log)("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 : (0, import_debug6.failUndefined)();
+    const identity = (_a = this.identityManager.identity) != null ? _a : (0, import_debug7.failUndefined)();
     const signingContext = {
       credentialSigner: identity.getIdentityCredentialSigner(),
       identityKey: identity.identityKey,
@@ -4056,17 +4180,16 @@ 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(import_client7.Invitation.Kind.SPACE, (invitation) => {
+    this._handlerFactories.set(import_services11.Invitation.Kind.SPACE, (invitation) => {
       (0, import_node_assert13.default)(this.dataSpaceManager, "dataSpaceManager not initialized yet");
       return new SpaceInvitationProtocol(this.dataSpaceManager, signingContext, this.keyring, invitation.spaceKey);
     });
     this.initialized.wake();
     this._deviceSpaceSync = identity.space.spaceState.registerProcessor({
       process: async (credential) => {
-        const assertion = (0, import_credentials11.getCredentialAssertion)(credential);
+        const assertion = (0, import_credentials13.getCredentialAssertion)(credential);
         if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
           return;
         }
@@ -4078,7 +4201,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 205,
+            line: 207,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -4089,7 +4212,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 209,
+            line: 211,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -4100,7 +4223,7 @@ var ServiceContext = class {
             details: assertion
           }, {
             file: "service-context.ts",
-            line: 214,
+            line: 216,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -4111,7 +4234,7 @@ var ServiceContext = class {
         } catch (err) {
           import_log18.log.catch(err, {}, {
             file: "service-context.ts",
-            line: 220,
+            line: 222,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -4150,41 +4273,45 @@ var ServiceRegistry = class {
 var ClientServicesHost = class {
   constructor({
     config,
-    modelFactory = (0, import_client8.createDefaultModelFactory)(),
+    modelFactory = (0, import_client_protocol5.createDefaultModelFactory)(),
     // TODO(burdon): Create ApolloLink abstraction (see Client).
-    networkManager,
+    transportFactory,
+    signalManager,
+    connectionLog,
     storage,
     // TODO(wittjosiah): Turn this on by default.
     lockKey
   } = {}) {
-    this._statusUpdate = new import_async21.Event();
+    this._statusUpdate = new import_async23.Event();
     this._opening = false;
     this._open = false;
-    this._instanceId = import_client8.PublicKey.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;
     this._systemService = new SystemServiceImpl({
       config: this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen ? import_services9.SystemStatus.ACTIVE : import_services9.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen ? import_services12.SystemStatus.ACTIVE : import_services12.SystemStatus.INACTIVE,
       onUpdateStatus: async (status) => {
         var _a, _b;
-        if (!this.isOpen && status === import_services9.SystemStatus.ACTIVE) {
+        if (!this.isOpen && status === import_services12.SystemStatus.ACTIVE) {
           await ((_a = this._resourceLock) == null ? void 0 : _a.acquire());
-        } else if (this.isOpen && status === import_services9.SystemStatus.INACTIVE) {
+        } else if (this.isOpen && status === import_services12.SystemStatus.INACTIVE) {
           await ((_b = this._resourceLock) == null ? void 0 : _b.release());
         }
       },
@@ -4193,7 +4320,7 @@ var ClientServicesHost = class {
       }
     });
     this._loggingService = new LoggingServiceImpl();
-    this._serviceRegistry = new ServiceRegistry(import_client8.clientServiceBundle, {
+    this._serviceRegistry = new ServiceRegistry(import_client_protocol5.clientServiceBundle, {
       SystemService: this._systemService
     });
   }
@@ -4214,7 +4341,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;
     (0, import_node_assert14.default)(!this._open, "service host is open");
     if (config) {
       (0, import_node_assert14.default)(!this._config, "config already set");
@@ -4223,39 +4351,47 @@ var ClientServicesHost = class {
         this._storage = createStorageObjects(config.get("runtime.client.storage", {})).storage;
       }
     }
-    if (networkManager) {
-      (0, import_node_assert14.default)(!this._networkManager, "network manager already set");
-      this._networkManager = networkManager;
-    }
+    const { connectionLog = true, transportFactory = (0, import_network_manager5.createWebRTCTransportFactory)({
+      iceServers: (_a = this._config) == null ? void 0 : _a.get("runtime.services.ice")
+    }), signalManager = new import_messaging3.WebsocketSignalManager((_c = (_b = this._config) == null ? void 0 : _b.get("runtime.services.signaling")) != null ? _c : []) } = options;
+    this._signalManager = signalManager;
+    (0, import_node_assert14.default)(!this._networkManager, "network manager already set");
+    this._networkManager = new import_network_manager5.NetworkManager({
+      log: connectionLog,
+      transportFactory,
+      signalManager
+    });
   }
   async open() {
     var _a, _b, _c;
     if (this._open) {
       return;
     }
-    import_log19.log.trace("dxos.sdk.client-services-host", import_protocols8.trace.begin({
-      id: this._instanceId
+    const traceId = import_keys11.PublicKey.random().toHex();
+    import_log19.log.trace("dxos.sdk.client-services-host.open", import_protocols9.trace.begin({
+      id: traceId
     }), {
       file: "service-host.ts",
-      line: 169,
+      line: 186,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     (0, import_node_assert14.default)(this._config, "config not set");
     (0, import_node_assert14.default)(this._storage, "storage not set");
+    (0, import_node_assert14.default)(this._signalManager, "signal manager not set");
     (0, import_node_assert14.default)(this._networkManager, "network manager not set");
     this._opening = true;
     (0, import_log19.log)("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),
@@ -4265,8 +4401,8 @@ var ClientServicesHost = class {
         await this._serviceContext.initialized.wait();
         return this._serviceContext.dataSpaceManager;
       }),
-      DataService: new import_echo_pipeline5.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
-      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager),
+      DataService: new import_echo_pipeline4.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
+      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       // TODO(burdon): Move to new protobuf definitions.
       DevtoolsHost: new DevtoolsServiceImpl({
@@ -4284,7 +4420,15 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 226,
+      line: 249,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    import_log19.log.trace("dxos.sdk.client-services-host.open", import_protocols9.trace.end({
+      id: traceId
+    }), {
+      file: "service-host.ts",
+      line: 250,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4299,7 +4443,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 235,
+      line: 259,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4314,24 +4458,25 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       file: "service-host.ts",
-      line: 241,
+      line: 265,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    import_log19.log.trace("dxos.sdk.client-services-host", import_protocols8.trace.end({
-      id: this._instanceId
+  }
+  async reset() {
+    var _a;
+    const traceId = import_keys11.PublicKey.random().toHex();
+    import_log19.log.trace("dxos.sdk.client-services-host.reset", import_protocols9.trace.begin({
+      id: traceId
     }), {
       file: "service-host.ts",
-      line: 243,
+      line: 270,
       scope: this,
       callSite: (f, a) => f(...a)
     });
-  }
-  async reset() {
-    var _a;
     (0, import_log19.log)("resetting...", {}, {
       file: "service-host.ts",
-      line: 247,
+      line: 272,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4339,7 +4484,15 @@ var ClientServicesHost = class {
     await this._storage.reset();
     (0, import_log19.log)("reset", {}, {
       file: "service-host.ts",
-      line: 250,
+      line: 275,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    import_log19.log.trace("dxos.sdk.client-services-host.reset", import_protocols9.trace.end({
+      id: traceId
+    }), {
+      file: "service-host.ts",
+      line: 276,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -4367,44 +4520,11 @@ var LocalClientServices = class {
     await this._host.close();
   }
 };
-
-// packages/sdk/client-services/src/packlets/services/utils.ts
-var import_config2 = require("@dxos/config");
-var import_log20 = require("@dxos/log");
-var import_messaging3 = require("@dxos/messaging");
-var import_network_manager5 = require("@dxos/network-manager");
-var fromHost = (config = new import_config2.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 import_messaging3.WebsocketSignalManager(signals), transportFactory = (0, import_network_manager5.createWebRTCTransportFactory)({
-      iceServers: config.get("runtime.services.ice")
-    }) } = options;
-    return new import_network_manager5.NetworkManager({
-      log: log1,
-      signalManager,
-      transportFactory
-    });
-  }
-  import_log20.log.warn("P2P network is not configured.", {}, {
-    file: "utils.ts",
-    line: 48,
-    scope: void 0,
-    callSite: (f, a) => f(...a)
-  });
-  return new import_network_manager5.NetworkManager({
-    signalManager: new import_messaging3.MemorySignalManager(new import_messaging3.MemorySignalManagerContext()),
-    transportFactory: import_network_manager5.MemoryTransportFactory
-  });
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ClientServicesHost,
+  DataSpace,
+  DataSpaceManager,
   DeviceInvitationProtocol,
   DevtoolsHostEvents,
   DevtoolsServiceImpl,
@@ -4421,13 +4541,13 @@ var createNetworkManager = (config, options = {}) => {
   ServiceRegistry,
   ShellRuntimeImpl,
   SpaceInvitationProtocol,
+  SpacesServiceImpl,
   TrustedKeySetAuthVerifier,
   VaultResourceLock,
   WorkerRuntime,
   WorkerSession,
   createAuthProvider,
   createStorageObjects,
-  fromHost,
   getNetworkPeers,
   subscribeToFeedBlocks,
   subscribeToFeeds,