@dxos/client-services 0.5.8-next.4b7fabd → 0.5.9-main.07b4bad

package/dist/lib/browser/{chunk-ACQUT3OK.mjs → chunk-XYEJP6PO.mjs}

@@ -345,13 +345,349 @@ var DevtoolsServiceImpl = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/identity/authenticator.ts
+// packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts
+import { asyncTimeout } from "@dxos/async";
+import { getFirstStreamValue } from "@dxos/codec-protobuf";
+import { credentialTypeFilter } from "@dxos/credentials";
+import { invariant } from "@dxos/invariant";
+import { STORAGE_VERSION } from "@dxos/protocols";
+import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
+import { TRACE_PROCESSOR } from "@dxos/tracing";
+
+// packages/sdk/client-services/src/version.ts
+var DXOS_VERSION = "0.5.9-main.07b4bad";
+
+// packages/sdk/client-services/src/packlets/services/platform.ts
+import { Platform } from "@dxos/protocols/proto/dxos/client/services";
+var getPlatform = () => {
+  if (process.browser) {
+    if (typeof window !== "undefined") {
+      const { userAgent } = window.navigator;
+      return {
+        type: Platform.PLATFORM_TYPE.BROWSER,
+        userAgent,
+        uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
+      };
+    } else {
+      return {
+        type: Platform.PLATFORM_TYPE.SHARED_WORKER,
+        uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
+      };
+    }
+  } else {
+    const { platform: platform2, version, arch } = process;
+    return {
+      type: Platform.PLATFORM_TYPE.NODE,
+      platform: platform2,
+      arch,
+      runtime: version,
+      uptime: Math.floor(process.uptime()),
+      memory: process.memoryUsage()
+    };
+  }
+};
+
+// packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts
+var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts";
+var DEFAULT_TIMEOUT = 1e3;
+var createDiagnostics = async (clientServices, serviceContext, config) => {
+  const diagnostics = {
+    created: (/* @__PURE__ */ new Date()).toISOString(),
+    platform: getPlatform(),
+    client: {
+      version: DXOS_VERSION,
+      storage: {
+        version: STORAGE_VERSION
+      }
+    },
+    trace: TRACE_PROCESSOR.getDiagnostics()
+  };
+  await Promise.all([
+    (async () => {
+      invariant(clientServices.LoggingService, "SystemService is not available.", {
+        F: __dxlog_file,
+        L: 110,
+        S: void 0,
+        A: [
+          "clientServices.LoggingService",
+          "'SystemService is not available.'"
+        ]
+      });
+      diagnostics.metrics = await getFirstStreamValue(clientServices.LoggingService.queryMetrics({}), {
+        timeout: DEFAULT_TIMEOUT
+      }).catch(() => void 0);
+    })(),
+    (async () => {
+      diagnostics.storage = await asyncTimeout(getStorageDiagnostics(), DEFAULT_TIMEOUT).catch(() => void 0);
+    })(),
+    async () => {
+      const identity = serviceContext.identityManager.identity;
+      if (identity) {
+        diagnostics.identity = {
+          identityKey: identity.identityKey,
+          spaceKey: identity.space.key,
+          profile: identity.profileDocument
+        };
+        const { devices } = await getFirstStreamValue(clientServices.DevicesService.queryDevices(), {
+          timeout: DEFAULT_TIMEOUT
+        }).catch(() => void 0) ?? {};
+        diagnostics.devices = devices;
+        if (serviceContext.dataSpaceManager) {
+          diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
+        }
+        const { feeds = [] } = await getFirstStreamValue(clientServices.DevtoolsHost.subscribeToFeeds({}), {
+          timeout: DEFAULT_TIMEOUT
+        }).catch(() => void 0) ?? {};
+        diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
+          feedKey,
+          bytes,
+          length
+        }));
+        const status = await getFirstStreamValue(clientServices.NetworkService.queryStatus(), {
+          timeout: DEFAULT_TIMEOUT
+        }).catch(() => void 0);
+        diagnostics.networkStatus = status;
+        diagnostics.swarms = serviceContext.networkManager.connectionLog?.swarms;
+      }
+    }
+  ]);
+  diagnostics.config = config.values;
+  return diagnostics;
+};
+var getSpaceStats = async (space) => {
+  const stats = {
+    key: space.key,
+    metrics: space.metrics,
+    epochs: space.inner.spaceState.credentials.filter(credentialTypeFilter("dxos.halo.credentials.Epoch")).map((credential) => ({
+      ...credential.subject.assertion,
+      id: credential.id
+    })),
+    members: Array.from(space.inner.spaceState.members.values()).map((member) => ({
+      role: member.role,
+      identity: {
+        identityKey: member.key,
+        profile: {
+          displayName: member.assertion.profile?.displayName
+        }
+      },
+      presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE
+    })),
+    pipeline: {
+      // TODO(burdon): Pick properties from credentials if needed.
+      currentEpoch: space.automergeSpaceState.lastEpoch,
+      appliedEpoch: space.automergeSpaceState.lastEpoch,
+      controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
+      currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
+      targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
+      totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe
+    }
+  };
+  if (stats.metrics) {
+    const { open, ready } = stats.metrics;
+    stats.metrics.startupTime = open && ready && ready.getTime() - open.getTime();
+  }
+  return stats;
+};
+var getStorageDiagnostics = async () => {
+  if (typeof navigator === "undefined" || !navigator.storage) {
+    return void 0;
+  }
+  const map = /* @__PURE__ */ new Map();
+  const dir = await navigator.storage.getDirectory();
+  for await (const filename of dir?.keys()) {
+    const idx = filename.indexOf("-", filename.indexOf("-") + 1);
+    if (idx === -1) {
+      continue;
+    }
+    map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
+  }
+  return Array.from(map.entries()).sort((a, b) => b[1] - a[1]).map(([file, count]) => ({
+    file,
+    count
+  }));
+};
+
+// packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts
 import { Trigger } from "@dxos/async";
+import { log } from "@dxos/log";
+var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts";
+var CHANNEL_NAME = "dxos.diagnostics.broadcast";
+var MessageType;
+(function(MessageType2) {
+  MessageType2["PROBE"] = "probe";
+  MessageType2["PROBE_ACK"] = "probe-ack";
+  MessageType2["REQUEST_DIAGNOSTICS"] = "request-diagnostics";
+  MessageType2["RECEIVE_DIAGNOSTICS"] = "receive-diagnostics";
+})(MessageType || (MessageType = {}));
+var createCollectDiagnosticsBroadcastSender = () => {
+  return {
+    broadcastDiagnosticsRequest: async () => {
+      let expectedResponse = "probe-ack";
+      let channel;
+      try {
+        const trigger = new Trigger();
+        channel = new BroadcastChannel(CHANNEL_NAME);
+        channel.onmessage = (msg) => {
+          if (expectedResponse === msg.data.type) {
+            trigger.wake(msg.data);
+          }
+        };
+        channel.postMessage({
+          type: "probe"
+        });
+        await trigger.wait({
+          timeout: 200
+        });
+        expectedResponse = "receive-diagnostics";
+        trigger.reset();
+        channel.postMessage({
+          type: "request-diagnostics"
+        });
+        const diagnostics = await trigger.wait({
+          timeout: 5e3
+        });
+        return diagnostics.payload;
+      } catch (e) {
+        const errorDescription = e instanceof Error ? e.message : JSON.stringify(e);
+        return {
+          expectedResponse,
+          errorDescription
+        };
+      } finally {
+        safeClose(channel);
+      }
+    }
+  };
+};
+var createCollectDiagnosticsBroadcastHandler = (systemService) => {
+  let channel;
+  return {
+    start: () => {
+      channel = new BroadcastChannel(CHANNEL_NAME);
+      channel.onmessage = async (message) => {
+        try {
+          if (message.data.type === "probe") {
+            channel?.postMessage({
+              type: "probe-ack"
+            });
+          } else if (message.data.type === "request-diagnostics") {
+            const diagnostics = await systemService.getDiagnostics({});
+            channel?.postMessage({
+              type: "receive-diagnostics",
+              payload: diagnostics
+            });
+          }
+        } catch (error) {
+          log.catch(error, void 0, {
+            F: __dxlog_file2,
+            L: 77,
+            S: void 0,
+            C: (f, a) => f(...a)
+          });
+        }
+      };
+    },
+    stop: () => {
+      safeClose(channel);
+      channel = void 0;
+    }
+  };
+};
+var safeClose = (channel) => {
+  try {
+    channel?.close();
+  } catch (e) {
+  }
+};
+
+// packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
+import { Stream as Stream7 } from "@dxos/codec-protobuf";
+import { raise } from "@dxos/debug";
+import { parseMethodName, RpcPeer } from "@dxos/rpc";
+import { MapCounter, trace } from "@dxos/tracing";
+function _ts_decorate(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+var ClientRpcServer = class {
+  constructor(params) {
+    this._handlerCache = /* @__PURE__ */ new Map();
+    this._callMetrics = new MapCounter();
+    const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
+    this._handleCall = handleCall;
+    this._handleStream = handleStream;
+    this._serviceRegistry = serviceRegistry;
+    this._rpcPeer = new RpcPeer({
+      ...rpcOptions,
+      callHandler: (method, params2) => {
+        const [serviceName, methodName] = parseMethodName(method);
+        const handler = (method2, params3) => this._getServiceHandler(serviceName).call(method2, params3);
+        this._callMetrics.inc(`${serviceName}.${methodName} request`);
+        if (this._handleCall) {
+          return this._handleCall(methodName, params2, handler);
+        } else {
+          return handler(methodName, params2);
+        }
+      },
+      streamHandler: (method, params2) => {
+        const [serviceName, methodName] = parseMethodName(method);
+        const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
+        this._callMetrics.inc(`${serviceName}.${methodName} request stream`);
+        if (this._handleStream) {
+          return Stream7.map(Stream7.unwrapPromise(this._handleStream(methodName, params2, handler)), (data) => {
+            this._callMetrics.inc(`${serviceName}.${methodName} response stream`);
+            return data;
+          });
+        } else {
+          return handler(methodName, params2);
+        }
+      }
+    });
+  }
+  get _services() {
+    return Object.keys(this._serviceRegistry.services);
+  }
+  async open() {
+    await this._rpcPeer.open();
+  }
+  async close() {
+    await this._rpcPeer.close();
+  }
+  _getServiceHandler(serviceName) {
+    if (!this._handlerCache.has(serviceName)) {
+      const [key, descriptor] = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName) ?? raise(new Error(`Service not available: ${serviceName}`));
+      const service = this._serviceRegistry.services[key];
+      if (!service) {
+        throw new Error(`Service not available: ${serviceName}`);
+      }
+      this._handlerCache.set(serviceName, descriptor.createServer(service));
+    }
+    return this._handlerCache.get(serviceName);
+  }
+};
+_ts_decorate([
+  trace.metricsCounter()
+], ClientRpcServer.prototype, "_callMetrics", void 0);
+_ts_decorate([
+  trace.info()
+], ClientRpcServer.prototype, "_services", null);
+ClientRpcServer = _ts_decorate([
+  trace.resource()
+], ClientRpcServer);
+
+// packages/sdk/client-services/src/packlets/identity/authenticator.ts
+import { Trigger as Trigger2 } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
 import { verifyCredential } from "@dxos/credentials";
-import { log } from "@dxos/log";
+import { log as log2 } from "@dxos/log";
 import { schema } from "@dxos/protocols";
-var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
+var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
 var Credential = schema.getCodecForType("dxos.halo.credentials.Credential");
 var createAuthProvider = (signer) => async (nonce) => {
   const credential = await signer.createCredential({
@@ -374,20 +710,20 @@ var TrustedKeySetAuthVerifier = class {
   get verifier() {
     return async (nonce, auth) => {
       const credential = Credential.decode(auth);
-      log("authenticating...", {
+      log2("authenticating...", {
         credential
       }, {
-        F: __dxlog_file,
+        F: __dxlog_file3,
         L: 56,
         S: this,
         C: (f, a) => f(...a)
       });
       const result = await verifyCredential(credential);
       if (result.kind === "fail") {
-        log("Invalid credential", {
+        log2("Invalid credential", {
           result
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file3,
           L: 60,
           S: this,
           C: (f, a) => f(...a)
@@ -395,11 +731,11 @@ var TrustedKeySetAuthVerifier = class {
         return false;
       }
       if (!credential.proof.nonce || !Buffer.from(nonce).equals(credential.proof.nonce)) {
-        log("Invalid nonce", {
+        log2("Invalid nonce", {
           nonce,
           credential
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file3,
           L: 65,
           S: this,
           C: (f, a) => f(...a)
@@ -407,36 +743,36 @@ var TrustedKeySetAuthVerifier = class {
         return false;
       }
       if (this._isTrustedKey(credential.issuer)) {
-        log("key is not currently in trusted set, waiting...", {
+        log2("key is not currently in trusted set, waiting...", {
           key: credential.issuer
         }, {
-          F: __dxlog_file,
+          F: __dxlog_file3,
           L: 70,
           S: this,
           C: (f, a) => f(...a)
         });
         return true;
       }
-      const trigger = new Trigger();
+      const trigger = new Trigger2();
       this._ctx.onDispose(() => {
         trigger.wake(false);
       });
       const clear = this._params.update.on(this._ctx, () => {
         if (this._isTrustedKey(credential.issuer)) {
-          log("auth success", {
+          log2("auth success", {
             key: credential.issuer
           }, {
-            F: __dxlog_file,
+            F: __dxlog_file3,
             L: 81,
             S: this,
             C: (f, a) => f(...a)
           });
           trigger.wake(true);
         } else {
-          log("key is not currently in trusted set, waiting...", {
+          log2("key is not currently in trusted set, waiting...", {
             key: credential.issuer
           }, {
-            F: __dxlog_file,
+            F: __dxlog_file3,
             L: 84,
             S: this,
             C: (f, a) => f(...a)
@@ -465,13 +801,13 @@ import { Event } from "@dxos/async";
 import { AUTH_TIMEOUT, LOAD_CONTROL_FEEDS_TIMEOUT } from "@dxos/client-protocol";
 import { DeviceStateMachine, createCredentialSignerWithKey, createCredentialSignerWithChain, ProfileStateMachine } from "@dxos/credentials";
 import { writeMessages } from "@dxos/feed-store";
-import { invariant } from "@dxos/invariant";
+import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
-import { log as log2 } from "@dxos/log";
+import { log as log3 } from "@dxos/log";
 import { AdmittedFeed } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { trace } from "@dxos/tracing";
+import { trace as trace2 } from "@dxos/tracing";
 import { ComplexSet } from "@dxos/util";
-function _ts_decorate(decorators, target, key, desc) {
+function _ts_decorate2(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -481,7 +817,7 @@ function _ts_decorate(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file2 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
+var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
 var Identity = class {
   constructor({ space, signer, identityKey, deviceKey, presence }) {
     this.stateUpdate = new Event();
@@ -490,10 +826,10 @@ var Identity = class {
     this._presence = presence;
     this.identityKey = identityKey;
     this.deviceKey = deviceKey;
-    log2.trace("dxos.halo.device", {
+    log3.trace("dxos.halo.device", {
       deviceKey
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file4,
       L: 67,
       S: this,
       C: (f, a) => f(...a)
@@ -561,8 +897,8 @@ var Identity = class {
   * Requires identity to be ready.
   */
   getIdentityCredentialSigner() {
-    invariant(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
-      F: __dxlog_file2,
+    invariant2(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
+      F: __dxlog_file4,
       L: 145,
       S: this,
       A: [
@@ -579,14 +915,14 @@ var Identity = class {
     return createCredentialSignerWithKey(this._signer, this.deviceKey);
   }
   async admitDevice({ deviceKey, controlFeedKey, dataFeedKey }) {
-    log2("Admitting device:", {
+    log3("Admitting device:", {
       identityKey: this.identityKey,
       hostDevice: this.deviceKey,
       deviceKey,
       controlFeedKey,
       dataFeedKey
     }, {
-      F: __dxlog_file2,
+      F: __dxlog_file4,
       L: 161,
       S: this,
       C: (f, a) => f(...a)
@@ -628,14 +964,14 @@ var Identity = class {
     })));
   }
 };
-_ts_decorate([
-  trace.span()
+_ts_decorate2([
+  trace2.span()
 ], Identity.prototype, "open", null);
-_ts_decorate([
-  trace.span()
+_ts_decorate2([
+  trace2.span()
 ], Identity.prototype, "close", null);
-Identity = _ts_decorate([
-  trace.resource()
+Identity = _ts_decorate2([
+  trace2.resource()
 ], Identity);
 
 // packages/sdk/client-services/src/packlets/identity/identity-manager.ts
@@ -643,17 +979,17 @@ import platform from "platform";
 import { Event as Event2 } from "@dxos/async";
 import { Context as Context3 } from "@dxos/context";
 import { createCredentialSignerWithKey as createCredentialSignerWithKey2, CredentialGenerator } from "@dxos/credentials";
-import { invariant as invariant2 } from "@dxos/invariant";
+import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey as PublicKey4 } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
-import { trace as trace2 } from "@dxos/protocols";
+import { log as log4 } from "@dxos/log";
+import { trace as trace3 } from "@dxos/protocols";
 import { Device, DeviceKind } from "@dxos/protocols/proto/dxos/client/services";
 import { AdmittedFeed as AdmittedFeed2, DeviceType } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Gossip, Presence } from "@dxos/teleport-extension-gossip";
 import { Timeframe } from "@dxos/timeframe";
 import { trace as Trace } from "@dxos/tracing";
 import { isNode, deferFunction } from "@dxos/util";
-function _ts_decorate2(decorators, target, key, desc) {
+function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
     r = Reflect.decorate(decorators, target, key, desc);
@@ -663,7 +999,7 @@ function _ts_decorate2(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
+var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-manager.ts";
 var DEVICE_PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var DEVICE_PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var IdentityManager = class {
@@ -684,19 +1020,19 @@ var IdentityManager = class {
   }
   async open(ctx) {
     const traceId = PublicKey4.random().toHex();
-    log3.trace("dxos.halo.identity-manager.open", trace2.begin({
+    log4.trace("dxos.halo.identity-manager.open", trace3.begin({
       id: traceId
     }), {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
     const identityRecord = this._metadataStore.getIdentityRecord();
-    log3("identity record", {
+    log4("identity record", {
       identityRecord
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 107,
       S: this,
       C: (f, a) => f(...a)
@@ -705,21 +1041,21 @@ var IdentityManager = class {
       this._identity = await this._constructIdentity(identityRecord);
       await this._identity.open(ctx);
       await this._identity.ready();
-      log3.trace("dxos.halo.identity", {
+      log4.trace("dxos.halo.identity", {
         identityKey: identityRecord.identityKey,
         displayName: this._identity.profileDocument?.displayName
       }, {
-        F: __dxlog_file3,
+        F: __dxlog_file5,
         L: 112,
         S: this,
         C: (f, a) => f(...a)
       });
       this.stateUpdate.emit();
     }
-    log3.trace("dxos.halo.identity-manager.open", trace2.end({
+    log4.trace("dxos.halo.identity-manager.open", trace3.end({
       id: traceId
     }), {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 119,
       S: this,
       C: (f, a) => f(...a)
@@ -729,8 +1065,8 @@ var IdentityManager = class {
     await this._identity?.close(new Context3());
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
-    invariant2(!this._identity, "Identity already exists.", {
-      F: __dxlog_file3,
+    invariant3(!this._identity, "Identity already exists.", {
+      F: __dxlog_file5,
       L: 128,
       S: this,
       A: [
@@ -738,8 +1074,8 @@ var IdentityManager = class {
         "'Identity already exists.'"
       ]
     });
-    log3("creating identity...", void 0, {
-      F: __dxlog_file3,
+    log4("creating identity...", void 0, {
+      F: __dxlog_file5,
       L: 129,
       S: this,
       C: (f, a) => f(...a)
@@ -759,8 +1095,8 @@ var IdentityManager = class {
     await identity.open(new Context3());
     {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
-      invariant2(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
-        F: __dxlog_file3,
+      invariant3(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
+        F: __dxlog_file5,
         L: 148,
         S: this,
         A: [
@@ -768,8 +1104,8 @@ var IdentityManager = class {
           "'Genesis feed key is required.'"
         ]
       });
-      invariant2(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
-        F: __dxlog_file3,
+      invariant3(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
+        F: __dxlog_file5,
         L: 149,
         S: this,
         A: [
@@ -804,22 +1140,22 @@ var IdentityManager = class {
     await this._metadataStore.setIdentityRecord(identityRecord);
     this._identity = identity;
     await this._identity.ready();
-    log3.trace("dxos.halo.identity", {
+    log4.trace("dxos.halo.identity", {
       identityKey: identityRecord.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
-    log3("created identity", {
+    log4("created identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey,
       profile: identity.profileDocument
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 197,
       S: this,
       C: (f, a) => f(...a)
@@ -853,16 +1189,16 @@ var IdentityManager = class {
   * Accept an existing identity. Expects its device key to be authorized (now or later).
   */
   async acceptIdentity(params) {
-    log3("accepting identity", {
+    log4("accepting identity", {
       params
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant2(!this._identity, "Identity already exists.", {
-      F: __dxlog_file3,
+    invariant3(!this._identity, "Identity already exists.", {
+      F: __dxlog_file5,
       L: 236,
       S: this,
       A: [
@@ -886,11 +1222,11 @@ var IdentityManager = class {
     this._identity = identity;
     await this._metadataStore.setIdentityRecord(identityRecord);
     await this._identity.ready();
-    log3.trace("dxos.halo.identity", {
+    log4.trace("dxos.halo.identity", {
       identityKey: identityRecord.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 255,
       S: this,
       C: (f, a) => f(...a)
@@ -900,11 +1236,11 @@ var IdentityManager = class {
       ...params.deviceProfile
     });
     this.stateUpdate.emit();
-    log3("accepted identity", {
+    log4("accepted identity", {
       identityKey: identity.identityKey,
       deviceKey: identity.deviceKey
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 265,
       S: this,
       C: (f, a) => f(...a)
@@ -915,8 +1251,8 @@ var IdentityManager = class {
   * Update the profile document of an existing identity.
   */
   async updateProfile(profile) {
-    invariant2(this._identity, "Identity not initialized.", {
-      F: __dxlog_file3,
+    invariant3(this._identity, "Identity not initialized.", {
+      F: __dxlog_file5,
       L: 273,
       S: this,
       A: [
@@ -946,8 +1282,8 @@ var IdentityManager = class {
     return profile;
   }
   async updateDeviceProfile(profile) {
-    invariant2(this._identity, "Identity not initialized.", {
-      F: __dxlog_file3,
+    invariant3(this._identity, "Identity not initialized.", {
+      F: __dxlog_file5,
       L: 290,
       S: this,
       A: [
@@ -982,8 +1318,8 @@ var IdentityManager = class {
     };
   }
   async _constructIdentity(identityRecord) {
-    invariant2(!this._identity, void 0, {
-      F: __dxlog_file3,
+    invariant3(!this._identity, void 0, {
+      F: __dxlog_file5,
       L: 316,
       S: this,
       A: [
@@ -991,10 +1327,10 @@ var IdentityManager = class {
         ""
       ]
     });
-    log3("constructing identity", {
+    log4("constructing identity", {
       identityRecord
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 317,
       S: this,
       C: (f, a) => f(...a)
@@ -1008,8 +1344,8 @@ var IdentityManager = class {
       identityKey: identityRecord.deviceKey,
       gossip
     });
-    invariant2(identityRecord.haloSpace.controlFeedKey, void 0, {
-      F: __dxlog_file3,
+    invariant3(identityRecord.haloSpace.controlFeedKey, void 0, {
+      F: __dxlog_file5,
       L: 330,
       S: this,
       A: [
@@ -1020,8 +1356,8 @@ var IdentityManager = class {
     const controlFeed = await this._feedStore.openFeed(identityRecord.haloSpace.controlFeedKey, {
       writable: true
     });
-    invariant2(identityRecord.haloSpace.dataFeedKey, void 0, {
-      F: __dxlog_file3,
+    invariant3(identityRecord.haloSpace.dataFeedKey, void 0, {
+      F: __dxlog_file5,
       L: 334,
       S: this,
       A: [
@@ -1052,10 +1388,10 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey,
       deviceKey: identityRecord.deviceKey
     });
-    log3("done", {
+    log4("done", {
       identityKey: identityRecord.identityKey
     }, {
-      F: __dxlog_file3,
+      F: __dxlog_file5,
       L: 360,
       S: this,
       C: (f, a) => f(...a)
@@ -1079,8 +1415,8 @@ var IdentityManager = class {
         }));
       },
       onAuthFailure: () => {
-        log3.warn("auth failure", void 0, {
-          F: __dxlog_file3,
+        log4.warn("auth failure", void 0, {
+          F: __dxlog_file5,
           L: 385,
           S: this,
           C: (f, a) => f(...a)
@@ -1094,21 +1430,21 @@ var IdentityManager = class {
     });
   }
 };
-_ts_decorate2([
+_ts_decorate3([
   Trace.span({
     showInBrowserTimeline: true
   })
 ], IdentityManager.prototype, "open", null);
-IdentityManager = _ts_decorate2([
+IdentityManager = _ts_decorate3([
   Trace.resource()
 ], IdentityManager);
 
 // packages/sdk/client-services/src/packlets/identity/identity-service.ts
-import { Stream as Stream7 } from "@dxos/codec-protobuf";
+import { Stream as Stream8 } from "@dxos/codec-protobuf";
 import { signPresentation } from "@dxos/credentials";
 import { todo } from "@dxos/debug";
-import { invariant as invariant3 } from "@dxos/invariant";
-var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
+import { invariant as invariant4 } from "@dxos/invariant";
+var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
 var IdentityServiceImpl = class {
   constructor(_createIdentity, _identityManager, _keyring, _onProfileUpdate) {
     this._createIdentity = _createIdentity;
@@ -1127,7 +1463,7 @@ var IdentityServiceImpl = class {
     return todo();
   }
   queryIdentity() {
-    return new Stream7(({ next }) => {
+    return new Stream8(({ next }) => {
       const emitNext = () => next({
         identity: this._getIdentity()
       });
@@ -1146,8 +1482,8 @@ var IdentityServiceImpl = class {
     };
   }
   async updateProfile(profile) {
-    invariant3(this._identityManager.identity, "Identity not initialized.", {
-      F: __dxlog_file4,
+    invariant4(this._identityManager.identity, "Identity not initialized.", {
+      F: __dxlog_file6,
       L: 61,
       S: this,
       A: [
@@ -1160,8 +1496,8 @@ var IdentityServiceImpl = class {
     return this._getIdentity();
   }
   async signPresentation({ presentation, nonce }) {
-    invariant3(this._identityManager.identity, "Identity not initialized.", {
-      F: __dxlog_file4,
+    invariant4(this._identityManager.identity, "Identity not initialized.", {
+      F: __dxlog_file6,
       L: 68,
       S: this,
       A: [
@@ -1180,10 +1516,10 @@ var IdentityServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts
-import { invariant as invariant4 } from "@dxos/invariant";
+import { invariant as invariant5 } from "@dxos/invariant";
 import { AlreadyJoinedError } from "@dxos/protocols";
 import { Invitation } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
+var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
 var DeviceInvitationProtocol = class {
   constructor(_keyring, _getIdentity, _acceptIdentity) {
     this._keyring = _keyring;
@@ -1208,8 +1544,8 @@ var DeviceInvitationProtocol = class {
     throw new Error("delegation not supported");
   }
   async admit(_, request) {
-    invariant4(request.device, void 0, {
-      F: __dxlog_file5,
+    invariant5(request.device, void 0, {
+      F: __dxlog_file7,
       L: 50,
       S: this,
       A: [
@@ -1254,8 +1590,8 @@ var DeviceInvitationProtocol = class {
     };
   }
   async accept(response, request) {
-    invariant4(response.device, void 0, {
-      F: __dxlog_file5,
+    invariant5(response.device, void 0, {
+      F: __dxlog_file7,
       L: 95,
       S: this,
       A: [
@@ -1264,8 +1600,8 @@ var DeviceInvitationProtocol = class {
       ]
     });
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
-    invariant4(request.device, void 0, {
-      F: __dxlog_file5,
+    invariant5(request.device, void 0, {
+      F: __dxlog_file7,
       L: 98,
       S: this,
       A: [
@@ -1295,21 +1631,21 @@ import { Mutex, scheduleTask as scheduleTask3, TimeoutError } from "@dxos/async"
 import { INVITATION_TIMEOUT } from "@dxos/client-protocol";
 import { ContextDisposedError as ContextDisposedError2 } from "@dxos/context";
 import { createKeyPair, sign } from "@dxos/crypto";
-import { invariant as invariant8 } from "@dxos/invariant";
+import { invariant as invariant9 } from "@dxos/invariant";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
-import { log as log7 } from "@dxos/log";
+import { log as log8 } from "@dxos/log";
 import { createTeleportProtocolFactory } from "@dxos/network-manager";
-import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace4 } from "@dxos/protocols";
+import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace5 } from "@dxos/protocols";
 import { Invitation as Invitation4 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse as AuthenticationResponse2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { Options as Options4 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { ComplexSet as ComplexSet3 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts
-import { Trigger as Trigger2 } from "@dxos/async";
+import { Trigger as Trigger3 } from "@dxos/async";
 import { cancelWithContext as cancelWithContext2, Context as Context4 } from "@dxos/context";
-import { invariant as invariant5 } from "@dxos/invariant";
-import { log as log4 } from "@dxos/log";
+import { invariant as invariant6 } from "@dxos/invariant";
+import { log as log5 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError, schema as schema2 } from "@dxos/protocols";
 import { Options } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension } from "@dxos/teleport";
@@ -1334,7 +1670,7 @@ var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts
-var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
+var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
 var OPTIONS_TIMEOUT = 1e4;
 var InvitationGuestExtension = class extends RpcExtension {
   constructor(_invitationFlowMutex, _callbacks) {
@@ -1349,7 +1685,7 @@ var InvitationGuestExtension = class extends RpcExtension {
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new Context4();
-    this._remoteOptionsTrigger = new Trigger2();
+    this._remoteOptionsTrigger = new Trigger3();
     this._invitationFlowLock = null;
   }
   hasFlowLock() {
@@ -1359,8 +1695,8 @@ var InvitationGuestExtension = class extends RpcExtension {
     return {
       InvitationHostService: {
         options: async (options) => {
-          invariant5(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file6,
+          invariant6(!this._remoteOptions, "Remote options already set.", {
+            F: __dxlog_file8,
             L: 63,
             S: this,
             A: [
@@ -1386,15 +1722,15 @@ var InvitationGuestExtension = class extends RpcExtension {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      log4("guest acquire lock", void 0, {
-        F: __dxlog_file6,
+      log5("guest acquire lock", void 0, {
+        F: __dxlog_file8,
         L: 84,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      log4("guest lock acquired", void 0, {
-        F: __dxlog_file6,
+      log5("guest lock acquired", void 0, {
+        F: __dxlog_file8,
         L: 86,
         S: this,
         C: (f, a) => f(...a)
@@ -1402,8 +1738,8 @@ var InvitationGuestExtension = class extends RpcExtension {
       await cancelWithContext2(this._ctx, this.rpc.InvitationHostService.options({
         role: Options.Role.GUEST
       }));
-      log4("options sent", void 0, {
-        F: __dxlog_file6,
+      log5("options sent", void 0, {
+        F: __dxlog_file8,
         L: 88,
         S: this,
         C: (f, a) => f(...a)
@@ -1411,8 +1747,8 @@ var InvitationGuestExtension = class extends RpcExtension {
       await cancelWithContext2(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT
       }));
-      log4("options received", void 0, {
-        F: __dxlog_file6,
+      log5("options received", void 0, {
+        F: __dxlog_file8,
         L: 90,
         S: this,
         C: (f, a) => f(...a)
@@ -1445,8 +1781,8 @@ var InvitationGuestExtension = class extends RpcExtension {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock.release();
       this._invitationFlowLock = null;
-      log4("invitation flow lock released", void 0, {
-        F: __dxlog_file6,
+      log5("invitation flow lock released", void 0, {
+        F: __dxlog_file8,
         L: 123,
         S: this,
         C: (f, a) => f(...a)
@@ -1456,17 +1792,17 @@ var InvitationGuestExtension = class extends RpcExtension {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts
-import { Trigger as Trigger3, scheduleTask as scheduleTask2 } from "@dxos/async";
+import { Trigger as Trigger4, scheduleTask as scheduleTask2 } from "@dxos/async";
 import { cancelWithContext as cancelWithContext3, Context as Context5 } from "@dxos/context";
 import { randomBytes, verify } from "@dxos/crypto";
-import { invariant as invariant6, InvariantViolation } from "@dxos/invariant";
+import { invariant as invariant7, InvariantViolation } from "@dxos/invariant";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
-import { log as log5 } from "@dxos/log";
-import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, schema as schema3, trace as trace3 } from "@dxos/protocols";
+import { log as log6 } from "@dxos/log";
+import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, schema as schema3, trace as trace4 } from "@dxos/protocols";
 import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse, Options as Options2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
-var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
+var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
 var OPTIONS_TIMEOUT2 = 1e4;
 var MAX_OTP_ATTEMPTS = 3;
 var InvitationHostExtension = class extends RpcExtension2 {
@@ -1482,12 +1818,12 @@ var InvitationHostExtension = class extends RpcExtension2 {
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
     this._ctx = new Context5();
-    this._remoteOptionsTrigger = new Trigger3();
+    this._remoteOptionsTrigger = new Trigger4();
     this._challenge = void 0;
     this.guestProfile = void 0;
     this.authenticationPassed = false;
     this.authenticationRetry = 0;
-    this.completedTrigger = new Trigger3();
+    this.completedTrigger = new Trigger4();
     this._invitationFlowLock = null;
   }
   hasFlowLock() {
@@ -1499,8 +1835,8 @@ var InvitationHostExtension = class extends RpcExtension2 {
       // Perhaps in the future we will have more complex logic here.
       InvitationHostService: {
         options: async (options) => {
-          invariant6(!this._remoteOptions, "Remote options already set.", {
-            F: __dxlog_file7,
+          invariant7(!this._remoteOptions, "Remote options already set.", {
+            F: __dxlog_file9,
             L: 101,
             S: this,
             A: [
@@ -1514,10 +1850,10 @@ var InvitationHostExtension = class extends RpcExtension2 {
         introduce: async (request) => {
           const { profile, invitationId } = request;
           const traceId = PublicKey5.random().toHex();
-          log5.trace("dxos.sdk.invitation-handler.host.introduce", trace3.begin({
+          log6.trace("dxos.sdk.invitation-handler.host.introduce", trace4.begin({
             id: traceId
           }), {
-            F: __dxlog_file7,
+            F: __dxlog_file9,
             L: 110,
             S: this,
             C: (f, a) => f(...a)
@@ -1525,11 +1861,11 @@ var InvitationHostExtension = class extends RpcExtension2 {
           const invitation = this._requireActiveInvitation();
           this._assertInvitationState(Invitation3.State.CONNECTED);
           if (invitationId !== invitation?.invitationId) {
-            log5.warn("incorrect invitationId", {
+            log6.warn("incorrect invitationId", {
               expected: invitation.invitationId,
               actual: invitationId
             }, {
-              F: __dxlog_file7,
+              F: __dxlog_file9,
               L: 116,
               S: this,
               C: (f, a) => f(...a)
@@ -1540,10 +1876,10 @@ var InvitationHostExtension = class extends RpcExtension2 {
               authMethod: Invitation3.AuthMethod.NONE
             };
           }
-          log5("guest introduced themselves", {
+          log6("guest introduced themselves", {
             guestProfile: profile
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file9,
             L: 125,
             S: this,
             C: (f, a) => f(...a)
@@ -1551,10 +1887,10 @@ var InvitationHostExtension = class extends RpcExtension2 {
           this.guestProfile = profile;
           this._callbacks.onStateUpdate(Invitation3.State.READY_FOR_AUTHENTICATION);
           this._challenge = invitation.authMethod === Invitation3.AuthMethod.KNOWN_PUBLIC_KEY ? randomBytes(32) : void 0;
-          log5.trace("dxos.sdk.invitation-handler.host.introduce", trace3.end({
+          log6.trace("dxos.sdk.invitation-handler.host.introduce", trace4.end({
             id: traceId
           }), {
-            F: __dxlog_file7,
+            F: __dxlog_file9,
             L: 132,
             S: this,
             C: (f, a) => f(...a)
@@ -1566,19 +1902,19 @@ var InvitationHostExtension = class extends RpcExtension2 {
         },
         authenticate: async ({ authCode: code, signedChallenge }) => {
           const traceId = PublicKey5.random().toHex();
-          log5.trace("dxos.sdk.invitation-handler.host.authenticate", trace3.begin({
+          log6.trace("dxos.sdk.invitation-handler.host.authenticate", trace4.begin({
             id: traceId
           }), {
-            F: __dxlog_file7,
+            F: __dxlog_file9,
             L: 141,
             S: this,
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          log5("received authentication request", {
+          log6("received authentication request", {
             authCode: code
           }, {
-            F: __dxlog_file7,
+            F: __dxlog_file9,
             L: 144,
             S: this,
             C: (f, a) => f(...a)
@@ -1591,8 +1927,8 @@ var InvitationHostExtension = class extends RpcExtension2 {
           this._callbacks.onStateUpdate(Invitation3.State.AUTHENTICATING);
           switch (invitation.authMethod) {
             case Invitation3.AuthMethod.NONE: {
-              log5("authentication not required", void 0, {
-                F: __dxlog_file7,
+              log6("authentication not required", void 0, {
+                F: __dxlog_file9,
                 L: 152,
                 S: this,
                 C: (f, a) => f(...a)
@@ -1627,10 +1963,10 @@ var InvitationHostExtension = class extends RpcExtension2 {
               break;
             }
             default: {
-              log5.error("invalid authentication method", {
+              log6.error("invalid authentication method", {
                 authMethod: invitation.authMethod
               }, {
-                F: __dxlog_file7,
+                F: __dxlog_file9,
                 L: 190,
                 S: this,
                 C: (f, a) => f(...a)
@@ -1649,13 +1985,13 @@ var InvitationHostExtension = class extends RpcExtension2 {
               status
             };
           }
-          log5.trace("dxos.sdk.invitation-handler.host.authenticate", trace3.end({
+          log6.trace("dxos.sdk.invitation-handler.host.authenticate", trace4.end({
             id: traceId,
             data: {
               status
             }
           }), {
-            F: __dxlog_file7,
+            F: __dxlog_file9,
             L: 202,
             S: this,
             C: (f, a) => f(...a)
@@ -1666,10 +2002,10 @@ var InvitationHostExtension = class extends RpcExtension2 {
         },
         admit: async (request) => {
           const traceId = PublicKey5.random().toHex();
-          log5.trace("dxos.sdk.invitation-handler.host.admit", trace3.begin({
+          log6.trace("dxos.sdk.invitation-handler.host.admit", trace4.begin({
             id: traceId
           }), {
-            F: __dxlog_file7,
+            F: __dxlog_file9,
             L: 208,
             S: this,
             C: (f, a) => f(...a)
@@ -1683,10 +2019,10 @@ var InvitationHostExtension = class extends RpcExtension2 {
               }
             }
             const response = await this._callbacks.admit(request);
-            log5.trace("dxos.sdk.invitation-handler.host.admit", trace3.end({
+            log6.trace("dxos.sdk.invitation-handler.host.admit", trace4.end({
               id: traceId
             }), {
-              F: __dxlog_file7,
+              F: __dxlog_file9,
               L: 222,
               S: this,
               C: (f, a) => f(...a)
@@ -1703,15 +2039,15 @@ var InvitationHostExtension = class extends RpcExtension2 {
   async onOpen(context) {
     await super.onOpen(context);
     try {
-      log5("host acquire lock", void 0, {
-        F: __dxlog_file7,
+      log6("host acquire lock", void 0, {
+        F: __dxlog_file9,
         L: 237,
         S: this,
         C: (f, a) => f(...a)
       });
       this._invitationFlowLock = await tryAcquireBeforeContextDisposed(this._ctx, this._invitationFlowMutex);
-      log5("host lock acquired", void 0, {
-        F: __dxlog_file7,
+      log6("host lock acquired", void 0, {
+        F: __dxlog_file9,
         L: 239,
         S: this,
         C: (f, a) => f(...a)
@@ -1721,8 +2057,8 @@ var InvitationHostExtension = class extends RpcExtension2 {
       await this.rpc.InvitationHostService.options({
         role: Options2.Role.HOST
       });
-      log5("options sent", void 0, {
-        F: __dxlog_file7,
+      log6("options sent", void 0, {
+        F: __dxlog_file9,
         L: 243,
         S: this,
         C: (f, a) => f(...a)
@@ -1730,8 +2066,8 @@ var InvitationHostExtension = class extends RpcExtension2 {
       await cancelWithContext3(this._ctx, this._remoteOptionsTrigger.wait({
         timeout: OPTIONS_TIMEOUT2
       }));
-      log5("options received", void 0, {
-        F: __dxlog_file7,
+      log6("options received", void 0, {
+        F: __dxlog_file9,
         L: 245,
         S: this,
         C: (f, a) => f(...a)
@@ -1784,8 +2120,8 @@ var InvitationHostExtension = class extends RpcExtension2 {
     if (this._invitationFlowLock != null) {
       this._invitationFlowLock?.release();
       this._invitationFlowLock = null;
-      log5("invitation flow lock released", void 0, {
-        F: __dxlog_file7,
+      log6("invitation flow lock released", void 0, {
+        F: __dxlog_file9,
         L: 300,
         S: this,
         C: (f, a) => f(...a)
@@ -1796,20 +2132,20 @@ var InvitationHostExtension = class extends RpcExtension2 {
 var isAuthenticationRequired = (invitation) => invitation.authMethod !== Invitation3.AuthMethod.NONE;
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts
-import { invariant as invariant7 } from "@dxos/invariant";
+import { invariant as invariant8 } from "@dxos/invariant";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
-import { log as log6 } from "@dxos/log";
+import { log as log7 } from "@dxos/log";
 import { Options as Options3 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { ComplexSet as ComplexSet2 } from "@dxos/util";
-var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
+var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
 var InvitationTopology = class {
   constructor(_role) {
     this._role = _role;
     this._seenPeers = new ComplexSet2(PublicKey6.hash);
   }
   init(controller) {
-    invariant7(!this._controller, "Already initialized.", {
-      F: __dxlog_file8,
+    invariant8(!this._controller, "Already initialized.", {
+      F: __dxlog_file10,
       L: 42,
       S: this,
       A: [
@@ -1820,8 +2156,8 @@ var InvitationTopology = class {
     this._controller = controller;
   }
   update() {
-    invariant7(this._controller, "Not initialized.", {
-      F: __dxlog_file8,
+    invariant8(this._controller, "Not initialized.", {
+      F: __dxlog_file10,
       L: 47,
       S: this,
       A: [
@@ -1840,11 +2176,11 @@ var InvitationTopology = class {
     const firstUnknownPeer = candidates.find((peerId) => !this._seenPeers.has(peerId));
     this._seenPeers = new ComplexSet2(PublicKey6.hash, allPeers.filter((peerId) => this._seenPeers.has(peerId)));
     if (firstUnknownPeer != null) {
-      log6("invitation connect", {
+      log7("invitation connect", {
         ownPeerId,
         remotePeerId: firstUnknownPeer
       }, {
-        F: __dxlog_file8,
+        F: __dxlog_file10,
         L: 69,
         S: this,
         C: (f, a) => f(...a)
@@ -1854,8 +2190,8 @@ var InvitationTopology = class {
     }
   }
   async onOffer(peer) {
-    invariant7(this._controller, "Not initialized.", {
-      F: __dxlog_file8,
+    invariant8(this._controller, "Not initialized.", {
+      F: __dxlog_file10,
       L: 76,
       S: this,
       A: [
@@ -1874,7 +2210,7 @@ var InvitationTopology = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
-var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
+var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
 var MAX_DELEGATED_INVITATION_HOST_TRIES = 3;
 var InvitationsHandler = class {
   /**
@@ -1898,8 +2234,8 @@ var InvitationsHandler = class {
         admit: async (admissionRequest) => {
           try {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
-            invariant8(deviceKey, void 0, {
-              F: __dxlog_file9,
+            invariant9(deviceKey, void 0, {
+              F: __dxlog_file11,
               L: 90,
               S: this,
               A: [
@@ -1925,18 +2261,18 @@ var InvitationsHandler = class {
           scheduleTask3(connectionCtx, async () => {
             const traceId = PublicKey7.random().toHex();
             try {
-              log7.trace("dxos.sdk.invitations-handler.host.onOpen", trace4.begin({
+              log8.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.begin({
                 id: traceId
               }), {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 115,
                 S: this,
                 C: (f, a) => f(...a)
               });
-              log7("connected", {
+              log8("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 116,
                 S: this,
                 C: (f, a) => f(...a)
@@ -1944,20 +2280,20 @@ var InvitationsHandler = class {
               const deviceKey = await extension.completedTrigger.wait({
                 timeout: invitation.timeout
               });
-              log7("admitted guest", {
+              log8("admitted guest", {
                 guest: deviceKey,
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 118,
                 S: this,
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, Invitation4.State.SUCCESS);
-              log7.trace("dxos.sdk.invitations-handler.host.onOpen", trace4.end({
+              log8.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.end({
                 id: traceId
               }), {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 120,
                 S: this,
                 C: (f, a) => f(...a)
@@ -1969,10 +2305,10 @@ var InvitationsHandler = class {
             } catch (err) {
               if (err instanceof TimeoutError) {
                 if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-                  log7("timeout", {
+                  log8("timeout", {
                     ...protocol.toJSON()
                   }, {
-                    F: __dxlog_file9,
+                    F: __dxlog_file11,
                     L: 129,
                     S: this,
                     C: (f, a) => f(...a)
@@ -1980,19 +2316,19 @@ var InvitationsHandler = class {
                 }
               } else {
                 if (guardedState.error(extension, err)) {
-                  log7.error("failed", err, {
-                    F: __dxlog_file9,
+                  log8.error("failed", err, {
+                    F: __dxlog_file11,
                     L: 133,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                 }
               }
-              log7.trace("dxos.sdk.invitations-handler.host.onOpen", trace4.error({
+              log8.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.error({
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 136,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2003,10 +2339,10 @@ var InvitationsHandler = class {
         },
         onError: (err) => {
           if (err instanceof InvalidInvitationExtensionRoleError3) {
-            log7("invalid role", {
+            log8("invalid role", {
               ...err.context
             }, {
-              F: __dxlog_file9,
+              F: __dxlog_file11,
               L: 144,
               S: this,
               C: (f, a) => f(...a)
@@ -2015,10 +2351,10 @@ var InvitationsHandler = class {
           }
           if (err instanceof TimeoutError) {
             if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-              log7("timeout", {
+              log8("timeout", {
                 err
               }, {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 149,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2026,8 +2362,8 @@ var InvitationsHandler = class {
             }
           } else {
             if (guardedState.error(extension, err)) {
-              log7.error("failed", err, {
-                F: __dxlog_file9,
+              log8.error("failed", err, {
+                F: __dxlog_file11,
                 L: 153,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2040,8 +2376,8 @@ var InvitationsHandler = class {
     };
     if (invitation.lifetime && invitation.created) {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
-        log7.warn("invitation has already expired", void 0, {
-          F: __dxlog_file9,
+        log8.warn("invitation has already expired", void 0, {
+          F: __dxlog_file11,
           L: 164,
           S: this,
           C: (f, a) => f(...a)
@@ -2063,8 +2399,8 @@ var InvitationsHandler = class {
   acceptInvitation(ctx, stream, protocol, invitation, otpEnteredTrigger, deviceProfile) {
     const { timeout = INVITATION_TIMEOUT } = invitation;
     if (deviceProfile) {
-      invariant8(invitation.kind === Invitation4.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
-        F: __dxlog_file9,
+      invariant9(invitation.kind === Invitation4.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
+        F: __dxlog_file11,
         L: 197,
         S: this,
         A: [
@@ -2077,12 +2413,12 @@ var InvitationsHandler = class {
     const guardedState = this._createGuardedState(ctx, invitation, stream);
     const shouldCancelInvitationFlow = (extension) => {
       const isLockedByAnotherConnection = guardedState.mutex.isLocked() && !extension.hasFlowLock();
-      log7("should cancel invitation flow", {
+      log8("should cancel invitation flow", {
         isLockedByAnotherConnection,
         invitationType: Invitation4.Type.DELEGATED,
         triedPeers: triedPeersIds.size
       }, {
-        F: __dxlog_file9,
+        F: __dxlog_file11,
         L: 205,
         S: this,
         C: (f, a) => f(...a)
@@ -2105,11 +2441,11 @@ var InvitationsHandler = class {
             return;
           }
           connectionCtx.onDispose(async () => {
-            log7("extension disposed", {
+            log8("extension disposed", {
               admitted,
               currentState: guardedState.current.state
             }, {
-              F: __dxlog_file9,
+              F: __dxlog_file11,
               L: 233,
               S: this,
               C: (f, a) => f(...a)
@@ -2124,10 +2460,10 @@ var InvitationsHandler = class {
           scheduleTask3(connectionCtx, async () => {
             const traceId = PublicKey7.random().toHex();
             try {
-              log7.trace("dxos.sdk.invitations-handler.guest.onOpen", trace4.begin({
+              log8.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.begin({
                 id: traceId
               }), {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 245,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2136,19 +2472,19 @@ var InvitationsHandler = class {
                 guardedState.set(extension, Invitation4.State.TIMEOUT);
                 extensionCtx.close();
               }, timeout);
-              log7("connected", {
+              log8("connected", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 256,
                 S: this,
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, Invitation4.State.CONNECTED);
-              log7("introduce", {
+              log8("introduce", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 260,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2157,11 +2493,11 @@ var InvitationsHandler = class {
                 invitationId: invitation.invitationId,
                 ...protocol.createIntroduction()
               });
-              log7("introduce response", {
+              log8("introduce response", {
                 ...protocol.toJSON(),
                 response: introductionResponse
               }, {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 265,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2179,10 +2515,10 @@ var InvitationsHandler = class {
                     break;
                 }
               }
-              log7("request admission", {
+              log8("request admission", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 291,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2191,10 +2527,10 @@ var InvitationsHandler = class {
               const admissionResponse = await extension.rpc.InvitationHostService.admit(admissionRequest);
               admitted = true;
               const result = await protocol.accept(admissionResponse, admissionRequest);
-              log7("admitted by host", {
+              log8("admitted by host", {
                 ...protocol.toJSON()
               }, {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 302,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2204,28 +2540,28 @@ var InvitationsHandler = class {
                 ...result,
                 state: Invitation4.State.SUCCESS
               });
-              log7.trace("dxos.sdk.invitations-handler.guest.onOpen", trace4.end({
+              log8.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.end({
                 id: traceId
               }), {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 308,
                 S: this,
                 C: (f, a) => f(...a)
               });
             } catch (err) {
               if (err instanceof TimeoutError) {
-                log7("timeout", {
+                log8("timeout", {
                   ...protocol.toJSON()
                 }, {
-                  F: __dxlog_file9,
+                  F: __dxlog_file11,
                   L: 311,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 guardedState.set(extension, Invitation4.State.TIMEOUT);
               } else {
-                log7("auth failed", err, {
-                  F: __dxlog_file9,
+                log8("auth failed", err, {
+                  F: __dxlog_file11,
                   L: 314,
                   S: this,
                   C: (f, a) => f(...a)
@@ -2233,11 +2569,11 @@ var InvitationsHandler = class {
                 guardedState.error(extension, err);
               }
               extensionCtx.close(err);
-              log7.trace("dxos.sdk.invitations-handler.guest.onOpen", trace4.error({
+              log8.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.error({
                 id: traceId,
                 error: err
               }), {
-                F: __dxlog_file9,
+                F: __dxlog_file11,
                 L: 318,
                 S: this,
                 C: (f, a) => f(...a)
@@ -2250,18 +2586,18 @@ var InvitationsHandler = class {
             return;
           }
           if (err instanceof TimeoutError) {
-            log7("timeout", {
+            log8("timeout", {
               ...protocol.toJSON()
             }, {
-              F: __dxlog_file9,
+              F: __dxlog_file11,
               L: 327,
               S: this,
               C: (f, a) => f(...a)
             });
             guardedState.set(extension, Invitation4.State.TIMEOUT);
           } else {
-            log7("auth failed", err, {
-              F: __dxlog_file9,
+            log8("auth failed", err, {
+              F: __dxlog_file11,
               L: 330,
               S: this,
               C: (f, a) => f(...a)
@@ -2278,8 +2614,8 @@ var InvitationsHandler = class {
         stream.error(error);
         await ctx.dispose();
       } else {
-        invariant8(invitation.swarmKey, void 0, {
-          F: __dxlog_file9,
+        invariant9(invitation.swarmKey, void 0, {
+          F: __dxlog_file11,
           L: 345,
           S: this,
           A: [
@@ -2373,12 +2709,12 @@ var InvitationsHandler = class {
     };
   }
   _logStateUpdate(invitation, actor, newState) {
-    log7("invitation state update", {
+    log8("invitation state update", {
       actor: actor?.constructor.name,
       newState: stateToString(newState),
       oldState: stateToString(invitation.state)
     }, {
-      F: __dxlog_file9,
+      F: __dxlog_file11,
       L: 438,
       S: this,
       C: (f, a) => f(...a)
@@ -2395,16 +2731,16 @@ var InvitationsHandler = class {
   }
   async _handleGuestOtpAuth(extension, setState, authenticated, options) {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
-      log7("guest waiting for authentication code...", void 0, {
-        F: __dxlog_file9,
+      log8("guest waiting for authentication code...", void 0, {
+        F: __dxlog_file11,
         L: 462,
         S: this,
         C: (f, a) => f(...a)
       });
       setState(Invitation4.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
-      log7("sending authentication request", void 0, {
-        F: __dxlog_file9,
+      log8("sending authentication request", void 0, {
+        F: __dxlog_file11,
         L: 466,
         S: this,
         C: (f, a) => f(...a)
@@ -2420,10 +2756,10 @@ var InvitationsHandler = class {
         if (attempt === MAX_OTP_ATTEMPTS) {
           throw new Error(`Maximum retry attempts: ${MAX_OTP_ATTEMPTS}`);
         } else {
-          log7("retrying invalid code", {
+          log8("retrying invalid code", {
             attempt
           }, {
-            F: __dxlog_file9,
+            F: __dxlog_file11,
             L: 477,
             S: this,
             C: (f, a) => f(...a)
@@ -2440,8 +2776,8 @@ var InvitationsHandler = class {
     if (introductionResponse.challenge == null) {
       throw new Error("challenge missing in the introduction");
     }
-    log7("sending authentication request", void 0, {
-      F: __dxlog_file9,
+    log8("sending authentication request", void 0, {
+      F: __dxlog_file11,
       L: 496,
       S: this,
       C: (f, a) => f(...a)
@@ -2465,7 +2801,7 @@ var createAdmissionKeypair = () => {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
-import { Stream as Stream8 } from "@dxos/codec-protobuf";
+import { Stream as Stream9 } from "@dxos/codec-protobuf";
 import { QueryInvitationsResponse } from "@dxos/protocols/proto/dxos/client/services";
 var InvitationsServiceImpl = class {
   constructor(_invitationsManager) {
@@ -2476,13 +2812,13 @@ var InvitationsServiceImpl = class {
     return {};
   }
   createInvitation(options) {
-    return new Stream8(({ next, close }) => {
+    return new Stream9(({ next, close }) => {
       void this._invitationsManager.createInvitation(options).then((invitation) => invitation.subscribe(next, close, close)).catch(close);
     });
   }
   acceptInvitation(request) {
     const invitation = this._invitationsManager.acceptInvitation(request);
-    return new Stream8(({ next, close }) => {
+    return new Stream9(({ next, close }) => {
       invitation.subscribe(next, close, close);
     });
   }
@@ -2493,7 +2829,7 @@ var InvitationsServiceImpl = class {
     return this._invitationsManager.cancelInvitation(request);
   }
   queryInvitations() {
-    return new Stream8(({ next, ctx }) => {
+    return new Stream9(({ next, ctx }) => {
       this._invitationsManager.invitationCreated.on(ctx, (invitation) => {
         next({
           action: QueryInvitationsResponse.Action.ADDED,
@@ -2564,12 +2900,12 @@ var InvitationsServiceImpl = class {
 // packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts
 import { createAdmissionCredentials, createCancelDelegatedSpaceInvitationCredential, createDelegatedSpaceInvitationCredential, getCredentialAssertion } from "@dxos/credentials";
 import { writeMessages as writeMessages2 } from "@dxos/feed-store";
-import { invariant as invariant9 } from "@dxos/invariant";
-import { log as log8 } from "@dxos/log";
+import { invariant as invariant10 } from "@dxos/invariant";
+import { log as log9 } from "@dxos/log";
 import { AlreadyJoinedError as AlreadyJoinedError2, AuthorizationError, InvalidInvitationError, SpaceNotFoundError } from "@dxos/protocols";
 import { Invitation as Invitation5 } from "@dxos/protocols/proto/dxos/client/services";
-import { SpaceMember } from "@dxos/protocols/proto/dxos/halo/credentials";
-var __dxlog_file10 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
+import { SpaceMember as SpaceMember2 } from "@dxos/protocols/proto/dxos/halo/credentials";
+var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
 var SpaceInvitationProtocol = class {
   constructor(_spaceManager, _signingContext, _keyring, _spaceKey) {
     this._spaceManager = _spaceManager;
@@ -2603,8 +2939,8 @@ var SpaceInvitationProtocol = class {
     };
   }
   async admit(invitation, request, guestProfile) {
-    invariant9(this._spaceKey, void 0, {
-      F: __dxlog_file10,
+    invariant10(this._spaceKey, void 0, {
+      F: __dxlog_file12,
       L: 76,
       S: this,
       A: [
@@ -2613,8 +2949,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
-    invariant9(space, void 0, {
-      F: __dxlog_file10,
+    invariant10(space, void 0, {
+      F: __dxlog_file12,
       L: 78,
       S: this,
       A: [
@@ -2622,8 +2958,8 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    invariant9(request.space, void 0, {
-      F: __dxlog_file10,
+    invariant10(request.space, void 0, {
+      F: __dxlog_file12,
       L: 80,
       S: this,
       A: [
@@ -2632,21 +2968,21 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const { identityKey, deviceKey } = request.space;
-    if (space.inner.spaceState.getMemberRole(identityKey) !== SpaceMember.Role.REMOVED) {
+    if (space.inner.spaceState.getMemberRole(identityKey) !== SpaceMember2.Role.REMOVED) {
       throw new AlreadyJoinedError2();
     }
-    log8("writing guest credentials", {
+    log9("writing guest credentials", {
       host: this._signingContext.deviceKey,
       guest: deviceKey
     }, {
-      F: __dxlog_file10,
+      F: __dxlog_file12,
       L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
-    const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, invitation.role ?? SpaceMember.Role.ADMIN, space.inner.spaceState.membershipChainHeads, guestProfile, invitation.delegationCredentialId);
-    invariant9(credentials[0].credential, void 0, {
-      F: __dxlog_file10,
+    const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, identityKey, space.key, space.inner.genesisFeedKey, invitation.role ?? SpaceMember2.Role.ADMIN, space.inner.spaceState.membershipChainHeads, guestProfile, invitation.delegationCredentialId);
+    invariant10(credentials[0].credential, void 0, {
+      F: __dxlog_file12,
       L: 101,
       S: this,
       A: [
@@ -2655,8 +2991,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const spaceMemberCredential = credentials[0].credential.credential;
-    invariant9(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file10,
+    invariant10(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file12,
       L: 103,
       S: this,
       A: [
@@ -2673,8 +3009,8 @@ var SpaceInvitationProtocol = class {
     };
   }
   async delegate(invitation) {
-    invariant9(this._spaceKey, void 0, {
-      F: __dxlog_file10,
+    invariant10(this._spaceKey, void 0, {
+      F: __dxlog_file12,
       L: 116,
       S: this,
       A: [
@@ -2683,8 +3019,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
-    invariant9(space, void 0, {
-      F: __dxlog_file10,
+    invariant10(space, void 0, {
+      F: __dxlog_file12,
       L: 118,
       S: this,
       A: [
@@ -2693,8 +3029,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     if (invitation.authMethod === Invitation5.AuthMethod.KNOWN_PUBLIC_KEY) {
-      invariant9(invitation.guestKeypair?.publicKey, void 0, {
-        F: __dxlog_file10,
+      invariant10(invitation.guestKeypair?.publicKey, void 0, {
+        F: __dxlog_file12,
         L: 120,
         S: this,
         A: [
@@ -2703,11 +3039,11 @@ var SpaceInvitationProtocol = class {
         ]
       });
     }
-    log8("writing delegate space invitation", {
+    log9("writing delegate space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file10,
+      F: __dxlog_file12,
       L: 123,
       S: this,
       C: (f, a) => f(...a)
@@ -2716,13 +3052,13 @@ var SpaceInvitationProtocol = class {
       invitationId: invitation.invitationId,
       authMethod: invitation.authMethod,
       swarmKey: invitation.swarmKey,
-      role: invitation.role ?? SpaceMember.Role.ADMIN,
+      role: invitation.role ?? SpaceMember2.Role.ADMIN,
       expiresOn: invitation.lifetime ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime) : void 0,
       multiUse: invitation.multiUse ?? false,
       guestKey: invitation.authMethod === Invitation5.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
-    invariant9(credential.credential, void 0, {
-      F: __dxlog_file10,
+    invariant10(credential.credential, void 0, {
+      F: __dxlog_file12,
       L: 143,
       S: this,
       A: [
@@ -2736,8 +3072,8 @@ var SpaceInvitationProtocol = class {
     return credential.credential.credential.id;
   }
   async cancelDelegation(invitation) {
-    invariant9(this._spaceKey, void 0, {
-      F: __dxlog_file10,
+    invariant10(this._spaceKey, void 0, {
+      F: __dxlog_file12,
       L: 149,
       S: this,
       A: [
@@ -2745,8 +3081,8 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    invariant9(invitation.type === Invitation5.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
-      F: __dxlog_file10,
+    invariant10(invitation.type === Invitation5.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
+      F: __dxlog_file12,
       L: 150,
       S: this,
       A: [
@@ -2755,8 +3091,8 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const space = this._spaceManager.spaces.get(this._spaceKey);
-    invariant9(space, void 0, {
-      F: __dxlog_file10,
+    invariant10(space, void 0, {
+      F: __dxlog_file12,
       L: 152,
       S: this,
       A: [
@@ -2764,18 +3100,18 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    log8("cancelling delegated space invitation", {
+    log9("cancelling delegated space invitation", {
       host: this._signingContext.deviceKey,
       id: invitation.invitationId
     }, {
-      F: __dxlog_file10,
+      F: __dxlog_file12,
       L: 154,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await createCancelDelegatedSpaceInvitationCredential(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
-    invariant9(credential.credential, void 0, {
-      F: __dxlog_file10,
+    invariant10(credential.credential, void 0, {
+      F: __dxlog_file12,
       L: 161,
       S: this,
       A: [
@@ -2813,8 +3149,8 @@ var SpaceInvitationProtocol = class {
     };
   }
   async accept(response) {
-    invariant9(response.space, void 0, {
-      F: __dxlog_file10,
+    invariant10(response.space, void 0, {
+      F: __dxlog_file12,
       L: 196,
       S: this,
       A: [
@@ -2824,8 +3160,8 @@ var SpaceInvitationProtocol = class {
     });
     const { credential, controlTimeframe, dataTimeframe } = response.space;
     const assertion = getCredentialAssertion(credential);
-    invariant9(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file10,
+    invariant10(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file12,
       L: 199,
       S: this,
       A: [
@@ -2833,8 +3169,8 @@ var SpaceInvitationProtocol = class {
         "'Invalid credential'"
       ]
     });
-    invariant9(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
-      F: __dxlog_file10,
+    invariant10(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
+      F: __dxlog_file12,
       L: 200,
       S: this,
       A: [
@@ -2859,17 +3195,17 @@ var SpaceInvitationProtocol = class {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts
-import { Event as Event3, PushStream, TimeoutError as TimeoutError2, Trigger as Trigger4 } from "@dxos/async";
+import { Event as Event3, PushStream, TimeoutError as TimeoutError2, Trigger as Trigger5 } from "@dxos/async";
 import { AuthenticatingInvitation, AUTHENTICATION_CODE_LENGTH, CancellableInvitation, INVITATION_TIMEOUT as INVITATION_TIMEOUT2 } from "@dxos/client-protocol";
 import { Context as Context6 } from "@dxos/context";
 import { generatePasscode } from "@dxos/credentials";
 import { hasInvitationExpired } from "@dxos/echo-pipeline";
-import { invariant as invariant10 } from "@dxos/invariant";
+import { invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
-import { log as log9 } from "@dxos/log";
+import { log as log10 } from "@dxos/log";
 import { Invitation as Invitation6 } from "@dxos/protocols/proto/dxos/client/services";
-import { SpaceMember as SpaceMember2 } from "@dxos/protocols/proto/dxos/halo/credentials";
-var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
+import { SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/halo/credentials";
+var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
 var InvitationsManager = class {
   constructor(_invitationsHandler, _getHandler, _metadataStore) {
     this._invitationsHandler = _invitationsHandler;
@@ -2911,8 +3247,8 @@ var InvitationsManager = class {
     try {
       await this._persistIfRequired(handler, stream, invitation);
     } catch (err) {
-      log9.catch(err, void 0, {
-        F: __dxlog_file11,
+      log10.catch(err, void 0, {
+        F: __dxlog_file13,
         L: 82,
         S: this,
         C: (f, a) => f(...a)
@@ -2934,8 +3270,8 @@ var InvitationsManager = class {
       const persistentInvitations = this._metadataStore.getInvitations();
       const freshInvitations = persistentInvitations.filter((invitation) => !hasInvitationExpired(invitation));
       const loadTasks = freshInvitations.map((persistentInvitation) => {
-        invariant10(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
-          F: __dxlog_file11,
+        invariant11(!this._createInvitations.get(persistentInvitation.invitationId), "invitation already exists", {
+          F: __dxlog_file13,
           L: 103,
           S: this,
           A: [
@@ -2953,8 +3289,8 @@ var InvitationsManager = class {
         invitations: cInvitations.map((invitation) => invitation.get())
       };
     } catch (err) {
-      log9.catch(err, void 0, {
-        F: __dxlog_file11,
+      log10.catch(err, void 0, {
+        F: __dxlog_file13,
         L: 110,
         S: this,
         C: (f, a) => f(...a)
@@ -2985,14 +3321,14 @@ var InvitationsManager = class {
     return invitation;
   }
   async authenticate({ invitationId, authCode }) {
-    log9("authenticating...", void 0, {
-      F: __dxlog_file11,
+    log10("authenticating...", void 0, {
+      F: __dxlog_file13,
       L: 140,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant10(invitationId, void 0, {
-      F: __dxlog_file11,
+    invariant11(invitationId, void 0, {
+      F: __dxlog_file13,
       L: 141,
       S: this,
       A: [
@@ -3002,10 +3338,10 @@ var InvitationsManager = class {
     });
     const observable = this._acceptInvitations.get(invitationId);
     if (!observable) {
-      log9.warn("invalid invitation", {
+      log10.warn("invalid invitation", {
         invitationId
       }, {
-        F: __dxlog_file11,
+        F: __dxlog_file13,
         L: 144,
         S: this,
         C: (f, a) => f(...a)
@@ -3015,16 +3351,16 @@ var InvitationsManager = class {
     }
   }
   async cancelInvitation({ invitationId }) {
-    log9("cancelInvitation...", {
+    log10("cancelInvitation...", {
       invitationId
     }, {
-      F: __dxlog_file11,
+      F: __dxlog_file13,
       L: 151,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant10(invitationId, void 0, {
-      F: __dxlog_file11,
+    invariant11(invitationId, void 0, {
+      F: __dxlog_file13,
       L: 152,
       S: this,
       A: [
@@ -3071,7 +3407,7 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, options) {
-    const { invitationId = PublicKey8.random().toHex(), type = Invitation6.Type.INTERACTIVE, authMethod = Invitation6.AuthMethod.SHARED_SECRET, state = Invitation6.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey8.random(), persistent = options?.authMethod !== Invitation6.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = SpaceMember2.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
+    const { invitationId = PublicKey8.random().toHex(), type = Invitation6.Type.INTERACTIVE, authMethod = Invitation6.AuthMethod.SHARED_SECRET, state = Invitation6.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey8.random(), persistent = options?.authMethod !== Invitation6.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = SpaceMember3.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
     const authCode = options?.authCode ?? (authMethod === Invitation6.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
@@ -3100,10 +3436,10 @@ var InvitationsManager = class {
       }
     });
     ctx.onDispose(() => {
-      log9("complete", {
+      log10("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file11,
+        F: __dxlog_file13,
         L: 241,
         S: this,
         C: (f, a) => f(...a)
@@ -3128,15 +3464,15 @@ var InvitationsManager = class {
     };
   }
   _createObservableAcceptingInvitation(handler, initialState) {
-    const otpEnteredTrigger = new Trigger4();
+    const otpEnteredTrigger = new Trigger5();
     const stream = new PushStream();
     const ctx = new Context6({
       onError: (err) => {
         if (err instanceof TimeoutError2) {
-          log9("timeout", {
+          log10("timeout", {
             ...handler.toJSON()
           }, {
-            F: __dxlog_file11,
+            F: __dxlog_file13,
             L: 261,
             S: this,
             C: (f, a) => f(...a)
@@ -3146,8 +3482,8 @@ var InvitationsManager = class {
             state: Invitation6.State.TIMEOUT
           });
         } else {
-          log9.warn("auth failed", err, {
-            F: __dxlog_file11,
+          log10.warn("auth failed", err, {
+            F: __dxlog_file13,
             L: 264,
             S: this,
             C: (f, a) => f(...a)
@@ -3161,10 +3497,10 @@ var InvitationsManager = class {
       }
     });
     ctx.onDispose(() => {
-      log9("complete", {
+      log10("complete", {
         ...handler.toJSON()
       }, {
-        F: __dxlog_file11,
+        F: __dxlog_file13,
         L: 271,
         S: this,
         C: (f, a) => f(...a)
@@ -3208,8 +3544,8 @@ var InvitationsManager = class {
     try {
       await this._metadataStore.removeInvitation(invitation.invitationId);
     } catch (err) {
-      log9.catch(err, void 0, {
-        F: __dxlog_file11,
+      log10.catch(err, void 0, {
+        F: __dxlog_file13,
         L: 307,
         S: this,
         C: (f, a) => f(...a)
@@ -3223,100 +3559,19 @@ var InvitationsManager = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/services/client-rpc-server.ts
-import { Stream as Stream9 } from "@dxos/codec-protobuf";
-import { raise } from "@dxos/debug";
-import { parseMethodName, RpcPeer } from "@dxos/rpc";
-import { MapCounter, trace as trace5 } from "@dxos/tracing";
-function _ts_decorate3(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      if (d = decorators[i])
-        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-var ClientRpcServer = class {
-  constructor(params) {
-    this._handlerCache = /* @__PURE__ */ new Map();
-    this._callMetrics = new MapCounter();
-    const { serviceRegistry, handleCall, handleStream, ...rpcOptions } = params;
-    this._handleCall = handleCall;
-    this._handleStream = handleStream;
-    this._serviceRegistry = serviceRegistry;
-    this._rpcPeer = new RpcPeer({
-      ...rpcOptions,
-      callHandler: (method, params2) => {
-        const [serviceName, methodName] = parseMethodName(method);
-        const handler = (method2, params3) => this._getServiceHandler(serviceName).call(method2, params3);
-        this._callMetrics.inc(`${serviceName}.${methodName} request`);
-        if (this._handleCall) {
-          return this._handleCall(methodName, params2, handler);
-        } else {
-          return handler(methodName, params2);
-        }
-      },
-      streamHandler: (method, params2) => {
-        const [serviceName, methodName] = parseMethodName(method);
-        const handler = (method2, params3) => this._getServiceHandler(serviceName).callStream(method2, params3);
-        this._callMetrics.inc(`${serviceName}.${methodName} request stream`);
-        if (this._handleStream) {
-          return Stream9.map(Stream9.unwrapPromise(this._handleStream(methodName, params2, handler)), (data) => {
-            this._callMetrics.inc(`${serviceName}.${methodName} response stream`);
-            return data;
-          });
-        } else {
-          return handler(methodName, params2);
-        }
-      }
-    });
-  }
-  get _services() {
-    return Object.keys(this._serviceRegistry.services);
-  }
-  async open() {
-    await this._rpcPeer.open();
-  }
-  async close() {
-    await this._rpcPeer.close();
-  }
-  _getServiceHandler(serviceName) {
-    if (!this._handlerCache.has(serviceName)) {
-      const [key, descriptor] = Object.entries(this._serviceRegistry.descriptors).find(([key2, descriptor2]) => descriptor2.name === serviceName) ?? raise(new Error(`Service not available: ${serviceName}`));
-      const service = this._serviceRegistry.services[key];
-      if (!service) {
-        throw new Error(`Service not available: ${serviceName}`);
-      }
-      this._handlerCache.set(serviceName, descriptor.createServer(service));
-    }
-    return this._handlerCache.get(serviceName);
-  }
-};
-_ts_decorate3([
-  trace5.metricsCounter()
-], ClientRpcServer.prototype, "_callMetrics", void 0);
-_ts_decorate3([
-  trace5.info()
-], ClientRpcServer.prototype, "_services", null);
-ClientRpcServer = _ts_decorate3([
-  trace5.resource()
-], ClientRpcServer);
-
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { Event as Event6, asyncTimeout, scheduleTask as scheduleTask5, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
+import { Event as Event6, asyncTimeout as asyncTimeout2, scheduleTask as scheduleTask5, sleep as sleep2, synchronized, trackLeaks } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
 import { Context as Context8, ContextDisposedError as ContextDisposedError3, cancelWithContext as cancelWithContext4 } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
-import { AutomergeDocumentLoaderImpl, createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { AutomergeDocumentLoaderImpl, createIdFromSpaceKey, createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { TYPE_PROPERTIES } from "@dxos/echo-schema";
-import { failedInvariant, invariant as invariant12 } from "@dxos/invariant";
+import { failedInvariant, invariant as invariant13 } from "@dxos/invariant";
 import { PublicKey as PublicKey10 } from "@dxos/keys";
-import { log as log11 } from "@dxos/log";
+import { log as log12 } from "@dxos/log";
 import { CancelledError, SystemError } from "@dxos/protocols";
 import { CreateEpochRequest, SpaceState } from "@dxos/protocols/proto/dxos/client/services";
-import { AdmittedFeed as AdmittedFeed3, SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { AdmittedFeed as AdmittedFeed3, SpaceMember as SpaceMember4 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe2 } from "@dxos/timeframe";
 import { trace as trace6 } from "@dxos/tracing";
 import { ComplexSet as ComplexSet5, assignDeep } from "@dxos/util";
@@ -3360,15 +3615,15 @@ var AutomergeSpaceState = class {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-import { DeferredTask, Event as Event5, scheduleTask as scheduleTask4, sleep, TimeoutError as TimeoutError3, Trigger as Trigger5 } from "@dxos/async";
+import { DeferredTask, Event as Event5, scheduleTask as scheduleTask4, sleep, TimeoutError as TimeoutError3, Trigger as Trigger6 } from "@dxos/async";
 import { Context as Context7, rejectOnDispose } from "@dxos/context";
-import { invariant as invariant11 } from "@dxos/invariant";
+import { invariant as invariant12 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
-import { log as log10 } from "@dxos/log";
+import { log as log11 } from "@dxos/log";
 import { schema as schema4 } from "@dxos/protocols";
 import { RpcExtension as RpcExtension3 } from "@dxos/teleport";
 import { ComplexMap as ComplexMap2, ComplexSet as ComplexSet4, entry } from "@dxos/util";
-var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
 var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
@@ -3393,16 +3648,16 @@ var NotarizationPlugin = class {
   * Request credentials to be notarized.
   */
   async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
-    log10("notarize", {
+    log11("notarize", {
       credentials
     }, {
-      F: __dxlog_file12,
+      F: __dxlog_file14,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant11(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file12,
+    invariant12(credentials.every((credential) => credential.id), "Credentials must have an id", {
+      F: __dxlog_file14,
       L: 91,
       S: this,
       A: [
@@ -3410,13 +3665,13 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new Trigger5();
+    const errors = new Trigger6();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        log10.warn("Notarization error", {
+        log11.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file12,
+          F: __dxlog_file14,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -3428,11 +3683,11 @@ var NotarizationPlugin = class {
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
       scheduleTask4(ctx, () => {
-        log10.warn("Notarization timeout", {
+        log11.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file12,
+          F: __dxlog_file14,
           L: 111,
           S: this,
           C: (f, a) => f(...a)
@@ -3452,10 +3707,10 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          log10.info("Exhausted all peers to notarize with", {
+          log11.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file12,
+            F: __dxlog_file14,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
@@ -3465,11 +3720,11 @@ var NotarizationPlugin = class {
           return;
         }
         peersTried.add(peer);
-        log10("try notarizing", {
+        log11("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file12,
+          F: __dxlog_file14,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -3477,8 +3732,8 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        log10("success", void 0, {
-          F: __dxlog_file12,
+        log11("success", void 0, {
+          F: __dxlog_file14,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
@@ -3486,8 +3741,8 @@ var NotarizationPlugin = class {
         await sleep(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          log10.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file12,
+          log11.info("error notarizing (recoverable)", err, {
+            F: __dxlog_file14,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -3504,8 +3759,8 @@ var NotarizationPlugin = class {
         allNotarized,
         errors.wait()
       ]);
-      log10("done", void 0, {
-        F: __dxlog_file12,
+      log11("done", void 0, {
+        F: __dxlog_file14,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -3526,8 +3781,8 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    invariant11(!this._writer, "Writer already set.", {
-      F: __dxlog_file12,
+    invariant12(!this._writer, "Writer already set.", {
+      F: __dxlog_file14,
       L: 181,
       S: this,
       A: [
@@ -3541,7 +3796,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger5()).value.wait();
+    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger6()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -3551,8 +3806,8 @@ var NotarizationPlugin = class {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
     for (const credential of request.credentials ?? []) {
-      invariant11(credential.id, "Credential must have an id", {
-        F: __dxlog_file12,
+      invariant12(credential.id, "Credential must have an id", {
+        F: __dxlog_file14,
         L: 200,
         S: this,
         A: [
@@ -3569,10 +3824,10 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        log10("extension opened", {
+        log11("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file12,
+          F: __dxlog_file14,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -3581,10 +3836,10 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        log10("extension closed", {
+        log11("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file12,
+          F: __dxlog_file14,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -3638,7 +3893,7 @@ function _ts_decorate4(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
     this._ctx = new Context8();
@@ -3664,21 +3919,24 @@ var DataSpace = class {
     this._callbacks = params.callbacks ?? {};
     this._echoHost = params.echoHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new ComplexSet5(PublicKey10.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== SpaceMember3.Role.REMOVED).map((member) => member.key)),
+      trustedKeysProvider: () => new ComplexSet5(PublicKey10.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== SpaceMember4.Role.REMOVED).map((member) => member.key)),
       update: this._inner.stateUpdate,
       authTimeout: AUTH_TIMEOUT2
     });
     this._cache = params.cache;
     this._state = params.initialState;
-    log11("new state", {
+    log12("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file13,
-      L: 141,
+      F: __dxlog_file15,
+      L: 143,
       S: this,
       C: (f, a) => f(...a)
     });
   }
+  get id() {
+    return this._inner.id;
+  }
   get key() {
     return this._inner.key;
   }
@@ -3720,11 +3978,11 @@ var DataSpace = class {
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new Context8());
     this._state = SpaceState.CONTROL_ONLY;
-    log11("new state", {
+    log12("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file13,
-      L: 199,
+      F: __dxlog_file15,
+      L: 206,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3738,11 +3996,11 @@ var DataSpace = class {
   async _close() {
     await this._callbacks.beforeClose?.();
     this._state = SpaceState.CLOSED;
-    log11("new state", {
+    log12("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file13,
-      L: 213,
+      F: __dxlog_file15,
+      L: 220,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3772,26 +4030,26 @@ var DataSpace = class {
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof CancelledError || err instanceof ContextDisposedError3) {
-          log11("data pipeline initialization cancelled", err, {
-            F: __dxlog_file13,
-            L: 246,
+          log12("data pipeline initialization cancelled", err, {
+            F: __dxlog_file15,
+            L: 253,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
-        log11.error("Error initializing data pipeline", err, {
-          F: __dxlog_file13,
-          L: 250,
+        log12.error("Error initializing data pipeline", err, {
+          F: __dxlog_file15,
+          L: 257,
           S: this,
           C: (f, a) => f(...a)
         });
         this._state = SpaceState.ERROR;
-        log11("new state", {
+        log12("new state", {
           state: SpaceState[this._state]
         }, {
-          F: __dxlog_file13,
-          L: 252,
+          F: __dxlog_file15,
+          L: 259,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3807,11 +4065,11 @@ var DataSpace = class {
       throw new SystemError("Invalid operation");
     }
     this._state = SpaceState.INITIALIZING;
-    log11("new state", {
+    log12("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file13,
-      L: 268,
+      F: __dxlog_file15,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3819,19 +4077,19 @@ var DataSpace = class {
     await sleep2(1);
     this._automergeSpaceState.startProcessingRootDocs();
     await cancelWithContext4(this._ctx, this.automergeSpaceState.ensureEpochInitialized());
-    log11("data pipeline ready", void 0, {
-      F: __dxlog_file13,
-      L: 280,
+    log12("data pipeline ready", void 0, {
+      F: __dxlog_file15,
+      L: 287,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._callbacks.beforeReady?.();
     this._state = SpaceState.READY;
-    log11("new state", {
+    log12("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file13,
-      L: 284,
+      F: __dxlog_file15,
+      L: 291,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3845,9 +4103,9 @@ var DataSpace = class {
     });
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
-    log11("writable feeds created", void 0, {
-      F: __dxlog_file13,
-      L: 300,
+    log12("writable feeds created", void 0, {
+      F: __dxlog_file15,
+      L: 307,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3905,12 +4163,12 @@ var DataSpace = class {
     }
   }
   _onNewAutomergeRoot(rootUrl) {
-    log11("loading automerge root doc for space", {
+    log12("loading automerge root doc for space", {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file13,
-      L: 366,
+      F: __dxlog_file15,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3935,12 +4193,12 @@ var DataSpace = class {
         if (!this._echoHost.roots.has(handle.documentId)) {
           await this._echoHost.openSpaceRoot(handle.url);
         } else {
-          log11.warn("echo database root already exists", {
+          log12.warn("echo database root already exists", {
             space: this.key,
             rootUrl
           }, {
-            F: __dxlog_file13,
-            L: 393,
+            F: __dxlog_file15,
+            L: 400,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3949,13 +4207,13 @@ var DataSpace = class {
         if (err instanceof ContextDisposedError3) {
           return;
         }
-        log11.warn("error loading automerge root doc", {
+        log12.warn("error loading automerge root doc", {
           space: this.key,
           rootUrl,
           err
         }, {
-          F: __dxlog_file13,
-          L: 399,
+          F: __dxlog_file15,
+          L: 406,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4006,11 +4264,11 @@ var DataSpace = class {
         {
           const currentRootUrl = this._automergeSpaceState.rootUrl;
           const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
-          await cancelWithContext4(this._ctx, asyncTimeout(rootHandle.whenReady(), 1e4));
+          await cancelWithContext4(this._ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
           const newRoot = this._echoHost.automergeRepo.create(rootHandle.docSync());
-          invariant12(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file13,
-            L: 449,
+          invariant13(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+            F: __dxlog_file15,
+            L: 456,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
@@ -4027,21 +4285,21 @@ var DataSpace = class {
         break;
       case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT:
         {
-          log11.info("Fragmenting", void 0, {
-            F: __dxlog_file13,
-            L: 461,
+          log12.info("Fragmenting", void 0, {
+            F: __dxlog_file15,
+            L: 468,
             S: this,
             C: (f, a) => f(...a)
           });
           const currentRootUrl = this._automergeSpaceState.rootUrl;
           const rootHandle = this._echoHost.automergeRepo.find(currentRootUrl);
-          await cancelWithContext4(this._ctx, asyncTimeout(rootHandle.whenReady(), 1e4));
+          await cancelWithContext4(this._ctx, asyncTimeout2(rootHandle.whenReady(), 1e4));
           const objects = Object.entries(rootHandle.docSync().objects);
           const properties = findPropertiesObject(rootHandle.docSync());
           const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
-          invariant12(properties, "Properties not found", {
-            F: __dxlog_file13,
-            L: 471,
+          invariant13(properties, "Properties not found", {
+            F: __dxlog_file15,
+            L: 478,
             S: this,
             A: [
               "properties",
@@ -4055,16 +4313,16 @@ var DataSpace = class {
             ])
           };
           const newRoot = this._echoHost.automergeRepo.create(newSpaceDoc);
-          invariant12(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-            F: __dxlog_file13,
-            L: 476,
+          invariant13(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+            F: __dxlog_file15,
+            L: 483,
             S: this,
             A: [
               "typeof newRoot.url === 'string' && newRoot.url.length > 0",
               ""
             ]
           });
-          const docLoader = new AutomergeDocumentLoaderImpl(this.key, this._echoHost.automergeRepo);
+          const docLoader = new AutomergeDocumentLoaderImpl(await createIdFromSpaceKey(this.key), this._echoHost.automergeRepo, this.key);
           await docLoader.loadSpaceRootDocHandle(this._ctx, {
             rootUrl: newRoot.url
           });
@@ -4085,6 +4343,25 @@ var DataSpace = class {
           };
         }
         break;
+      case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT:
+        {
+          invariant13(options.newAutomergeRoot, void 0, {
+            F: __dxlog_file15,
+            L: 513,
+            S: this,
+            A: [
+              "options.newAutomergeRoot",
+              ""
+            ]
+          });
+          epoch = {
+            previousId: this._automergeSpaceState.lastEpoch?.id,
+            number: (this._automergeSpaceState.lastEpoch?.subject.assertion.number ?? -1) + 1,
+            timeframe: this._automergeSpaceState.lastEpoch?.subject.assertion.timeframe ?? new Timeframe2(),
+            automergeRoot: options.newAutomergeRoot
+          };
+        }
+        break;
     }
     if (!epoch) {
       return;
@@ -4106,6 +4383,7 @@ var DataSpace = class {
         receipt.seq
       ]
     ]));
+    await this._echoHost.updateIndexes();
   }
   async activate() {
     if (this._state !== SpaceState.INACTIVE) {
@@ -4122,11 +4400,11 @@ var DataSpace = class {
     await this._metadataStore.setSpaceState(this.key, SpaceState.INACTIVE);
     await this._close();
     this._state = SpaceState.INACTIVE;
-    log11("new state", {
+    log12("new state", {
       state: SpaceState[this._state]
     }, {
-      F: __dxlog_file13,
-      L: 542,
+      F: __dxlog_file15,
+      L: 566,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4136,6 +4414,9 @@ var DataSpace = class {
 _ts_decorate4([
   trace6.info()
 ], DataSpace.prototype, "_inner", void 0);
+_ts_decorate4([
+  trace6.info()
+], DataSpace.prototype, "id", null);
 _ts_decorate4([
   trace6.info()
 ], DataSpace.prototype, "key", null);
@@ -4196,12 +4477,12 @@ import { Event as Event7, synchronized as synchronized2, trackLeaks as trackLeak
 import { cancelWithContext as cancelWithContext5, Context as Context9 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
 import { AuthStatus } from "@dxos/echo-pipeline";
-import { invariant as invariant13 } from "@dxos/invariant";
+import { invariant as invariant14 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
-import { log as log12 } from "@dxos/log";
+import { log as log13 } from "@dxos/log";
 import { trace as Trace2 } from "@dxos/protocols";
 import { Invitation as Invitation7, SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
-import { SpaceMember as SpaceMember5 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { SpaceMember as SpaceMember6 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Gossip as Gossip2, Presence as Presence2 } from "@dxos/teleport-extension-gossip";
 import { trace as trace7 } from "@dxos/tracing";
 import { ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsync } from "@dxos/util";
@@ -4209,7 +4490,7 @@ import { ComplexMap as ComplexMap3, deferFunction as deferFunction2, forEachAsyn
 // packages/sdk/client-services/src/packlets/spaces/genesis.ts
 import { createCredential } from "@dxos/credentials";
 import { failUndefined } from "@dxos/debug";
-import { AdmittedFeed as AdmittedFeed4, SpaceMember as SpaceMember4 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { AdmittedFeed as AdmittedFeed4, SpaceMember as SpaceMember5 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
   const credentials = [
@@ -4229,7 +4510,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
       assertion: {
         "@type": "dxos.halo.credentials.SpaceMember",
         spaceKey: space.key,
-        role: SpaceMember4.Role.OWNER,
+        role: SpaceMember5.Role.OWNER,
         profile: signingContext.getProfile(),
         genesisFeedKey: space.controlFeedKey ?? failUndefined()
       }
@@ -4287,7 +4568,7 @@ function _ts_decorate5(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DataSpaceManager = class {
@@ -4335,45 +4616,45 @@ var DataSpaceManager = class {
     return this._spaces;
   }
   async open() {
-    log12("open", void 0, {
-      F: __dxlog_file14,
+    log13("open", void 0, {
+      F: __dxlog_file16,
       L: 144,
       S: this,
       C: (f, a) => f(...a)
     });
-    log12.trace("dxos.echo.data-space-manager.open", Trace2.begin({
+    log13.trace("dxos.echo.data-space-manager.open", Trace2.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file14,
+      F: __dxlog_file16,
       L: 145,
       S: this,
       C: (f, a) => f(...a)
     });
-    log12("metadata loaded", {
+    log13("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file16,
       L: 146,
       S: this,
       C: (f, a) => f(...a)
     });
     await forEachAsync(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
-        log12("load space", {
+        log13("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file16,
           L: 150,
           S: this,
           C: (f, a) => f(...a)
         });
         await this._constructSpace(spaceMetadata);
       } catch (err) {
-        log12.error("Error loading space", {
+        log13.error("Error loading space", {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file16,
           L: 153,
           S: this,
           C: (f, a) => f(...a)
@@ -4387,18 +4668,18 @@ var DataSpaceManager = class {
         space.initializeDataPipelineAsync();
       }
     }
-    log12.trace("dxos.echo.data-space-manager.open", Trace2.end({
+    log13.trace("dxos.echo.data-space-manager.open", Trace2.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file14,
+      F: __dxlog_file16,
       L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    log12("close", void 0, {
-      F: __dxlog_file14,
+    log13("close", void 0, {
+      F: __dxlog_file16,
       L: 171,
       S: this,
       C: (f, a) => f(...a)
@@ -4413,8 +4694,8 @@ var DataSpaceManager = class {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    invariant13(this._isOpen, "Not open.", {
-      F: __dxlog_file14,
+    invariant14(this._isOpen, "Not open.", {
+      F: __dxlog_file16,
       L: 184,
       S: this,
       A: [
@@ -4432,10 +4713,10 @@ var DataSpaceManager = class {
       dataFeedKey,
       state: SpaceState2.ACTIVE
     };
-    log12("creating space...", {
+    log13("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file16,
       L: 196,
       S: this,
       C: (f, a) => f(...a)
@@ -4445,8 +4726,8 @@ var DataSpaceManager = class {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, root.url);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    invariant13(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file14,
+    invariant14(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file16,
       L: 205,
       S: this,
       A: [
@@ -4461,16 +4742,16 @@ var DataSpaceManager = class {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    log12("accept space", {
+    log13("accept space", {
       opts
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file16,
       L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant13(this._isOpen, "Not open.", {
-      F: __dxlog_file14,
+    invariant14(this._isOpen, "Not open.", {
+      F: __dxlog_file16,
       L: 218,
       S: this,
       A: [
@@ -4478,8 +4759,8 @@ var DataSpaceManager = class {
         "'Not open.'"
       ]
     });
-    invariant13(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file14,
+    invariant14(!this._spaces.has(opts.spaceKey), "Space already exists.", {
+      F: __dxlog_file16,
       L: 219,
       S: this,
       A: [
@@ -4511,10 +4792,10 @@ var DataSpaceManager = class {
     }));
   }
   async _constructSpace(metadata) {
-    log12("construct space", {
+    log13("construct space", {
       metadata
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file16,
       L: 252,
       S: this,
       C: (f, a) => f(...a)
@@ -4551,8 +4832,8 @@ var DataSpaceManager = class {
         session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
       },
       onAuthFailure: () => {
-        log12.warn("auth failure", void 0, {
-          F: __dxlog_file14,
+        log13.warn("auth failure", void 0, {
+          F: __dxlog_file16,
           L: 289,
           S: this,
           C: (f, a) => f(...a)
@@ -4582,21 +4863,21 @@ var DataSpaceManager = class {
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
-          log12("before space ready", {
+          log13("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file14,
+            F: __dxlog_file16,
             L: 316,
             S: this,
             C: (f, a) => f(...a)
           });
         },
         afterReady: async () => {
-          log12("after space ready", {
+          log13("after space ready", {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file14,
+            F: __dxlog_file16,
             L: 319,
             S: this,
             C: (f, a) => f(...a)
@@ -4612,10 +4893,10 @@ var DataSpaceManager = class {
           }
         },
         beforeClose: async () => {
-          log12("before space close", {
+          log13("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file14,
+            F: __dxlog_file16,
             L: 327,
             S: this,
             C: (f, a) => f(...a)
@@ -4647,19 +4928,19 @@ var DataSpaceManager = class {
       const peers = presence.getPeersByIdentityKey(member.key);
       const sessions = peers.map((p) => p.peerId && spaceProtocol.sessions.get(p.peerId));
       const sessionsToClose = sessions.filter((s) => {
-        return (s && member.role === SpaceMember5.Role.REMOVED !== (s.authStatus === AuthStatus.FAILURE)) ?? false;
+        return (s && member.role === SpaceMember6.Role.REMOVED !== (s.authStatus === AuthStatus.FAILURE)) ?? false;
       });
       sessionsToClose.forEach((session) => {
-        void session.close().catch(log12.error);
+        void session.close().catch(log13.error);
       });
       closedSessions += sessionsToClose.length;
     }
-    log12("processed member role changes", {
+    log13("processed member role changes", {
       roleChangeCount: memberInfo.length,
       peersOnline: presence.getPeersOnline().length,
       closedSessions
     }, {
-      F: __dxlog_file14,
+      F: __dxlog_file16,
       L: 367,
       S: this,
       C: (f, a) => f(...a)
@@ -4668,18 +4949,18 @@ var DataSpaceManager = class {
   }
   _handleNewPeerConnected(space, peerState) {
     const role = space.spaceState.getMemberRole(peerState.identityKey);
-    if (role === SpaceMember5.Role.REMOVED) {
+    if (role === SpaceMember6.Role.REMOVED) {
       const session = peerState.peerId && space.protocol.sessions.get(peerState.peerId);
       if (session != null) {
-        log12("closing a session with a removed peer", {
+        log13("closing a session with a removed peer", {
           peerId: peerState.peerId
         }, {
-          F: __dxlog_file14,
+          F: __dxlog_file16,
           L: 381,
           S: this,
           C: (f, a) => f(...a)
         });
-        void session.close().catch(log12.error);
+        void session.close().catch(log13.error);
       }
     }
   }
@@ -4741,12 +5022,12 @@ import { Stream as Stream10 } from "@dxos/codec-protobuf";
 import { createAdmissionCredentials as createAdmissionCredentials2, getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { raise as raise2 } from "@dxos/debug";
 import { writeMessages as writeMessages3 } from "@dxos/feed-store";
-import { invariant as invariant14 } from "@dxos/invariant";
-import { log as log13 } from "@dxos/log";
+import { invariant as invariant15 } from "@dxos/invariant";
+import { log as log14 } from "@dxos/log";
 import { ApiError, SpaceNotFoundError as SpaceNotFoundError2, encodeError, IdentityNotInitializedError, AuthorizationError as AuthorizationError2 } from "@dxos/protocols";
-import { SpaceMember as SpaceMember6, SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
+import { SpaceMember as SpaceMember7, SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
 import { trace as trace8 } from "@dxos/tracing";
-var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _getDataSpaceManager) {
     this._identityManager = _identityManager;
@@ -4789,8 +5070,8 @@ var SpacesServiceImpl = class {
       });
     }
     const credentials = await createAdmissionCredentials2(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
-    invariant14(credentials[0].credential, void 0, {
-      F: __dxlog_file15,
+    invariant15(credentials[0].credential, void 0, {
+      F: __dxlog_file17,
       L: 97,
       S: this,
       A: [
@@ -4799,8 +5080,8 @@ var SpacesServiceImpl = class {
       ]
     });
     const spaceMemberCredential = credentials[0].credential.credential;
-    invariant14(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file15,
+    invariant15(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file17,
       L: 99,
       S: this,
       A: [
@@ -4815,10 +5096,10 @@ var SpacesServiceImpl = class {
       const scheduler = new UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        log13("update", {
+        log14("update", {
           spaces
         }, {
-          F: __dxlog_file15,
+          F: __dxlog_file17,
           L: 110,
           S: this,
           C: (f, a) => f(...a)
@@ -4901,8 +5182,8 @@ var SpacesServiceImpl = class {
           }
         });
       } else {
-        invariant14(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file15,
+        invariant15(!credential.id, "Id on unsigned credentials is not allowed", {
+          F: __dxlog_file17,
           L: 198,
           S: this,
           A: [
@@ -4910,8 +5191,8 @@ var SpacesServiceImpl = class {
             "'Id on unsigned credentials is not allowed'"
           ]
         });
-        invariant14(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file15,
+        invariant15(this._identityManager.identity, "Identity is not available", {
+          F: __dxlog_file17,
           L: 199,
           S: this,
           A: [
@@ -4920,8 +5201,8 @@ var SpacesServiceImpl = class {
           ]
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
-        invariant14(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file15,
+        invariant15(credential.issuer.equals(signer.getIssuer()), void 0, {
+          F: __dxlog_file17,
           L: 201,
           S: this,
           A: [
@@ -4941,15 +5222,17 @@ var SpacesServiceImpl = class {
       }
     }
   }
-  async createEpoch({ spaceKey, migration }) {
+  async createEpoch({ spaceKey, migration, automergeRootUrl }) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise2(new SpaceNotFoundError2(spaceKey));
     await space.createEpoch({
-      migration
+      migration,
+      newAutomergeRoot: automergeRootUrl
     });
   }
   _serializeSpace(space) {
     return {
+      id: space.id,
       spaceKey: space.key,
       state: space.state,
       error: space.error ? encodeError(space.error) : void 0,
@@ -4978,7 +5261,7 @@ var SpacesServiceImpl = class {
             profile: member.profile ?? {}
           },
           role: member.role,
-          presence: peers.length > 0 ? SpaceMember6.PresenceState.ONLINE : SpaceMember6.PresenceState.OFFLINE,
+          presence: peers.length > 0 ? SpaceMember7.PresenceState.ONLINE : SpaceMember7.PresenceState.OFFLINE,
           peerStates: peers
         };
       }),
@@ -5008,18 +5291,18 @@ var SpacesServiceImpl = class {
 var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-import { Trigger as Trigger6 } from "@dxos/async";
+import { Trigger as Trigger7 } from "@dxos/async";
 import { Context as Context10, Resource } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion4 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
 import { EchoHost } from "@dxos/echo-db";
 import { MetadataStore, SnapshotStore, SpaceManager, valueEncoding } from "@dxos/echo-pipeline";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
-import { invariant as invariant15 } from "@dxos/invariant";
+import { invariant as invariant16 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
-import { log as log14 } from "@dxos/log";
-import { InvalidStorageVersionError, STORAGE_VERSION, trace as trace9 } from "@dxos/protocols";
+import { log as log15 } from "@dxos/log";
+import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace9 } from "@dxos/protocols";
 import { Invitation as Invitation8 } from "@dxos/protocols/proto/dxos/client/services";
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
 import { trace as Trace3 } from "@dxos/tracing";
@@ -5034,7 +5317,7 @@ function _ts_decorate6(decorators, target, key, desc) {
         r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource {
   constructor(storage, level, networkManager, signalManager, _runtimeParams) {
     super();
@@ -5043,7 +5326,7 @@ var ServiceContext = class extends Resource {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
-    this.initialized = new Trigger6();
+    this.initialized = new Trigger7();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = PublicKey12.random().toHex();
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
@@ -5078,16 +5361,16 @@ var ServiceContext = class extends Resource {
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    log14("opening...", void 0, {
-      F: __dxlog_file16,
+    log15("opening...", void 0, {
+      F: __dxlog_file18,
       L: 152,
       S: this,
       C: (f, a) => f(...a)
     });
-    log14.trace("dxos.sdk.service-context.open", trace9.begin({
+    log15.trace("dxos.sdk.service-context.open", trace9.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file16,
+      F: __dxlog_file18,
       L: 153,
       S: this,
       C: (f, a) => f(...a)
@@ -5102,32 +5385,32 @@ var ServiceContext = class extends Resource {
       await this._initialize(ctx);
     }
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
-    log14("loaded persistent invitations", {
+    log15("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file16,
+      F: __dxlog_file18,
       L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
-    log14.trace("dxos.sdk.service-context.open", trace9.end({
+    log15.trace("dxos.sdk.service-context.open", trace9.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file16,
+      F: __dxlog_file18,
       L: 168,
       S: this,
       C: (f, a) => f(...a)
     });
-    log14("opened", void 0, {
-      F: __dxlog_file16,
+    log15("opened", void 0, {
+      F: __dxlog_file18,
       L: 169,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    log14("closing...", void 0, {
-      F: __dxlog_file16,
+    log15("closing...", void 0, {
+      F: __dxlog_file18,
       L: 173,
       S: this,
       C: (f, a) => f(...a)
@@ -5143,8 +5426,8 @@ var ServiceContext = class extends Resource {
     await this.echoHost.close(ctx);
     await this.networkManager.close();
     await this.signalManager.close();
-    log14("closed", void 0, {
-      F: __dxlog_file16,
+    log15("closed", void 0, {
+      F: __dxlog_file18,
       L: 185,
       S: this,
       C: (f, a) => f(...a)
@@ -5157,8 +5440,8 @@ var ServiceContext = class extends Resource {
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    invariant15(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file16,
+    invariant16(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file18,
       L: 196,
       S: this,
       A: [
@@ -5183,14 +5466,14 @@ var ServiceContext = class extends Resource {
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== STORAGE_VERSION) {
-      throw new InvalidStorageVersionError(STORAGE_VERSION, this.metadataStore.version);
+    if (this.metadataStore.version !== STORAGE_VERSION2) {
+      throw new InvalidStorageVersionError(STORAGE_VERSION2, this.metadataStore.version);
     }
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    log14("initializing spaces...", void 0, {
-      F: __dxlog_file16,
+    log15("initializing spaces...", void 0, {
+      F: __dxlog_file18,
       L: 227,
       S: this,
       C: (f, a) => f(...a)
@@ -5212,8 +5495,8 @@ var ServiceContext = class extends Resource {
     this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.echoHost, this.invitationsManager, this._runtimeParams);
     await this.dataSpaceManager.open();
     this._handlerFactories.set(Invitation8.Kind.SPACE, (invitation) => {
-      invariant15(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file16,
+      invariant16(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file18,
         L: 252,
         S: this,
         A: [
@@ -5234,10 +5517,10 @@ var ServiceContext = class extends Resource {
           return;
         }
         if (!this.dataSpaceManager) {
-          log14("dataSpaceManager not initialized yet, ignoring space admission", {
+          log15("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file16,
+            F: __dxlog_file18,
             L: 268,
             S: this,
             C: (f, a) => f(...a)
@@ -5245,10 +5528,10 @@ var ServiceContext = class extends Resource {
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          log14("space already exists, ignoring space admission", {
+          log15("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file16,
+            F: __dxlog_file18,
             L: 272,
             S: this,
             C: (f, a) => f(...a)
@@ -5256,10 +5539,10 @@ var ServiceContext = class extends Resource {
           return;
         }
         try {
-          log14("accepting space recorded in halo", {
+          log15("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file16,
+            F: __dxlog_file18,
             L: 277,
             S: this,
             C: (f, a) => f(...a)
@@ -5269,8 +5552,8 @@ var ServiceContext = class extends Resource {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          log14.catch(err, void 0, {
-            F: __dxlog_file16,
+          log15.catch(err, void 0, {
+            F: __dxlog_file18,
             L: 283,
             S: this,
             C: (f, a) => f(...a)
@@ -5316,281 +5599,218 @@ var ServiceRegistry = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts
-import { asyncTimeout as asyncTimeout2 } from "@dxos/async";
-import { getFirstStreamValue } from "@dxos/codec-protobuf";
-import { credentialTypeFilter } from "@dxos/credentials";
-import { invariant as invariant16 } from "@dxos/invariant";
-import { STORAGE_VERSION as STORAGE_VERSION2 } from "@dxos/protocols";
-import { SpaceMember as SpaceMember7 } from "@dxos/protocols/proto/dxos/client/services";
-import { TRACE_PROCESSOR } from "@dxos/tracing";
-
-// packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.5.8-next.4b7fabd";
-
-// packages/sdk/client-services/src/packlets/services/platform.ts
-import { Platform } from "@dxos/protocols/proto/dxos/client/services";
-var getPlatform = () => {
-  if (process.browser) {
-    if (typeof window !== "undefined") {
-      const { userAgent } = window.navigator;
-      return {
-        type: Platform.PLATFORM_TYPE.BROWSER,
-        userAgent,
-        uptime: Math.floor((Date.now() - window.performance.timeOrigin) / 1e3)
-      };
-    } else {
-      return {
-        type: Platform.PLATFORM_TYPE.SHARED_WORKER,
-        uptime: Math.floor((Date.now() - performance.timeOrigin) / 1e3)
-      };
-    }
-  } else {
-    const { platform: platform2, version, arch } = process;
-    return {
-      type: Platform.PLATFORM_TYPE.NODE,
-      platform: platform2,
-      arch,
-      runtime: version,
-      uptime: Math.floor(process.uptime()),
-      memory: process.memoryUsage()
-    };
+// packages/sdk/client-services/src/packlets/locks/browser.ts
+import { asyncTimeout as asyncTimeout3, Trigger as Trigger8 } from "@dxos/async";
+import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
+import { log as log16, logInfo } from "@dxos/log";
+function _ts_decorate7(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
+    r = Reflect.decorate(decorators, target, key, desc);
+  else
+    for (var i = decorators.length - 1; i >= 0; i--)
+      if (d = decorators[i])
+        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
+var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
+var Message;
+(function(Message2) {
+  Message2["ACQUIRING"] = "acquiring";
+})(Message || (Message = {}));
+var Lock = class {
+  constructor({ lockKey, onAcquire, onRelease }) {
+    this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
+    this._releaseTrigger = new Trigger8();
+    this._lockKey = lockKey;
+    this._onAcquire = onAcquire;
+    this._onRelease = onRelease;
+    this._broadcastChannel.onmessage = this._onMessage.bind(this);
   }
-};
-
-// packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts";
-var DEFAULT_TIMEOUT = 1e3;
-var createDiagnostics = async (clientServices, serviceContext, config) => {
-  const diagnostics = {
-    created: (/* @__PURE__ */ new Date()).toISOString(),
-    platform: getPlatform(),
-    client: {
-      version: DXOS_VERSION,
-      storage: {
-        version: STORAGE_VERSION2
-      }
-    },
-    trace: TRACE_PROCESSOR.getDiagnostics()
-  };
-  await Promise.all([
-    (async () => {
-      invariant16(clientServices.LoggingService, "SystemService is not available.", {
-        F: __dxlog_file17,
-        L: 110,
-        S: void 0,
-        A: [
-          "clientServices.LoggingService",
-          "'SystemService is not available.'"
-        ]
+  get lockKey() {
+    return this._lockKey;
+  }
+  async acquire() {
+    this._broadcastChannel.postMessage({
+      message: "acquiring"
+    });
+    try {
+      log16("aquiring lock...", void 0, {
+        F: __dxlog_file19,
+        L: 42,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await asyncTimeout3(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
+      log16("acquired lock", void 0, {
+        F: __dxlog_file19,
+        L: 44,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } catch {
+      log16("stealing lock...", void 0, {
+        F: __dxlog_file19,
+        L: 46,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await this._requestLock(true);
+      log16("stolen lock", void 0, {
+        F: __dxlog_file19,
+        L: 48,
+        S: this,
+        C: (f, a) => f(...a)
       });
-      diagnostics.metrics = await getFirstStreamValue(clientServices.LoggingService.queryMetrics({}), {
-        timeout: DEFAULT_TIMEOUT
-      }).catch(() => void 0);
-    })(),
-    (async () => {
-      diagnostics.storage = await asyncTimeout2(getStorageDiagnostics(), DEFAULT_TIMEOUT).catch(() => void 0);
-    })(),
-    async () => {
-      const identity = serviceContext.identityManager.identity;
-      if (identity) {
-        diagnostics.identity = {
-          identityKey: identity.identityKey,
-          spaceKey: identity.space.key,
-          profile: identity.profileDocument
-        };
-        const { devices } = await getFirstStreamValue(clientServices.DevicesService.queryDevices(), {
-          timeout: DEFAULT_TIMEOUT
-        }).catch(() => void 0) ?? {};
-        diagnostics.devices = devices;
-        if (serviceContext.dataSpaceManager) {
-          diagnostics.spaces = await Promise.all(Array.from(serviceContext.dataSpaceManager.spaces.values()).map((space) => getSpaceStats(space)) ?? []);
-        }
-        const { feeds = [] } = await getFirstStreamValue(clientServices.DevtoolsHost.subscribeToFeeds({}), {
-          timeout: DEFAULT_TIMEOUT
-        }).catch(() => void 0) ?? {};
-        diagnostics.feeds = feeds.map(({ feedKey, bytes, length }) => ({
-          feedKey,
-          bytes,
-          length
-        }));
-        const status = await getFirstStreamValue(clientServices.NetworkService.queryStatus(), {
-          timeout: DEFAULT_TIMEOUT
-        }).catch(() => void 0);
-        diagnostics.networkStatus = status;
-        diagnostics.swarms = serviceContext.networkManager.connectionLog?.swarms;
-      }
     }
-  ]);
-  diagnostics.config = config.values;
-  return diagnostics;
-};
-var getSpaceStats = async (space) => {
-  const stats = {
-    key: space.key,
-    metrics: space.metrics,
-    epochs: space.inner.spaceState.credentials.filter(credentialTypeFilter("dxos.halo.credentials.Epoch")).map((credential) => ({
-      ...credential.subject.assertion,
-      id: credential.id
-    })),
-    members: Array.from(space.inner.spaceState.members.values()).map((member) => ({
-      role: member.role,
-      identity: {
-        identityKey: member.key,
-        profile: {
-          displayName: member.assertion.profile?.displayName
-        }
-      },
-      presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember7.PresenceState.ONLINE : SpaceMember7.PresenceState.OFFLINE
-    })),
-    pipeline: {
-      // TODO(burdon): Pick properties from credentials if needed.
-      currentEpoch: space.automergeSpaceState.lastEpoch,
-      appliedEpoch: space.automergeSpaceState.lastEpoch,
-      controlFeeds: space.inner.controlPipeline.state.feeds.map((feed) => feed.key),
-      currentControlTimeframe: space.inner.controlPipeline.state.timeframe,
-      targetControlTimeframe: space.inner.controlPipeline.state.targetTimeframe,
-      totalControlTimeframe: space.inner.controlPipeline.state.endTimeframe
+  }
+  async release() {
+    this._releaseTrigger.wake();
+  }
+  _onMessage(event) {
+    if (event.data.message === "acquiring") {
+      this._releaseTrigger.wake();
     }
-  };
-  if (stats.metrics) {
-    const { open, ready } = stats.metrics;
-    stats.metrics.startupTime = open && ready && ready.getTime() - open.getTime();
   }
-  return stats;
+  async _requestLock(steal = false) {
+    log16("requesting lock...", {
+      steal
+    }, {
+      F: __dxlog_file19,
+      L: 63,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const acquired = new Trigger8();
+    void navigator.locks.request(this._lockKey, {
+      steal
+    }, async () => {
+      await this._onAcquire?.();
+      acquired.wake();
+      this._releaseTrigger = new Trigger8();
+      await this._releaseTrigger.wait();
+      log16("releasing lock...", void 0, {
+        F: __dxlog_file19,
+        L: 72,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await this._onRelease?.();
+      log16("released lock", void 0, {
+        F: __dxlog_file19,
+        L: 74,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }).catch(async () => {
+      await this._onRelease?.();
+    });
+    await acquired.wait();
+    log16("recieved lock", {
+      steal
+    }, {
+      F: __dxlog_file19,
+      L: 81,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
 };
-var getStorageDiagnostics = async () => {
-  if (typeof navigator === "undefined" || !navigator.storage) {
-    return void 0;
-  }
-  const map = /* @__PURE__ */ new Map();
-  const dir = await navigator.storage.getDirectory();
-  for await (const filename of dir?.keys()) {
-    const idx = filename.indexOf("-", filename.indexOf("-") + 1);
-    if (idx === -1) {
-      continue;
-    }
-    map.set(filename.slice(0, idx), (map.get(filename.slice(0, idx)) ?? 0) + 1);
-  }
-  return Array.from(map.entries()).sort((a, b) => b[1] - a[1]).map(([file, count]) => ({
-    file,
-    count
-  }));
+_ts_decorate7([
+  logInfo
+], Lock.prototype, "lockKey", null);
+var isLocked = (lockPath) => {
+  throw new Error("Not implemented");
 };
 
-// packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts
-import { Trigger as Trigger7 } from "@dxos/async";
-import { log as log15 } from "@dxos/log";
-var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts";
-var CHANNEL_NAME = "dxos.diagnostics.broadcast";
-var MessageType;
-(function(MessageType2) {
-  MessageType2["PROBE"] = "probe";
-  MessageType2["PROBE_ACK"] = "probe-ack";
-  MessageType2["REQUEST_DIAGNOSTICS"] = "request-diagnostics";
-  MessageType2["RECEIVE_DIAGNOSTICS"] = "receive-diagnostics";
-})(MessageType || (MessageType = {}));
-var createCollectDiagnosticsBroadcastSender = () => {
-  return {
-    broadcastDiagnosticsRequest: async () => {
-      let expectedResponse = "probe-ack";
-      let channel;
-      try {
-        const trigger = new Trigger7();
-        channel = new BroadcastChannel(CHANNEL_NAME);
-        channel.onmessage = (msg) => {
-          if (expectedResponse === msg.data.type) {
-            trigger.wake(msg.data);
-          }
-        };
-        channel.postMessage({
-          type: "probe"
-        });
-        await trigger.wait({
-          timeout: 200
-        });
-        expectedResponse = "receive-diagnostics";
-        trigger.reset();
-        channel.postMessage({
-          type: "request-diagnostics"
-        });
-        const diagnostics = await trigger.wait({
-          timeout: 5e3
-        });
-        return diagnostics.payload;
-      } catch (e) {
-        const errorDescription = e instanceof Error ? e.message : JSON.stringify(e);
-        return {
-          expectedResponse,
-          errorDescription
-        };
-      } finally {
-        safeClose(channel);
-      }
-    }
-  };
+// packages/sdk/client-services/src/packlets/storage/storage.ts
+import { InvalidConfigError } from "@dxos/protocols";
+import { Runtime as Runtime2 } from "@dxos/protocols/proto/dxos/config";
+import { createStorage, StorageType } from "@dxos/random-access-storage";
+
+// packages/sdk/client-services/src/packlets/storage/util.ts
+import { DX_DATA } from "@dxos/client-protocol";
+import { Runtime } from "@dxos/protocols/proto/dxos/config";
+import { isNode as isNode2 } from "@dxos/util";
+var getRootPath = (config) => {
+  const { dataRoot = isNode2() ? DX_DATA : "dxos/storage" } = config ?? {};
+  return `${dataRoot}/`;
 };
-var createCollectDiagnosticsBroadcastHandler = (systemService) => {
-  let channel;
+var isPersistent = (config) => {
+  const { persistent = false } = config ?? {};
+  return config.dataStore !== void 0 && config.dataStore !== Runtime.Client.Storage.StorageDriver.RAM || persistent;
+};
+
+// packages/sdk/client-services/src/packlets/storage/storage.ts
+var StorageDriver = Runtime2.Client.Storage.StorageDriver;
+var createStorageObjects = (config) => {
+  const { persistent = false, keyStore, dataStore } = config ?? {};
+  if (persistent && dataStore === StorageDriver.RAM) {
+    throw new InvalidConfigError("RAM storage cannot be used in persistent mode.");
+  }
+  if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
+    throw new InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+  }
+  if (persistent && keyStore === StorageDriver.RAM) {
+    throw new InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+  }
+  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
+    throw new InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+  }
   return {
-    start: () => {
-      channel = new BroadcastChannel(CHANNEL_NAME);
-      channel.onmessage = async (message) => {
-        try {
-          if (message.data.type === "probe") {
-            channel?.postMessage({
-              type: "probe-ack"
-            });
-          } else if (message.data.type === "request-diagnostics") {
-            const diagnostics = await systemService.getDiagnostics({});
-            channel?.postMessage({
-              type: "receive-diagnostics",
-              payload: diagnostics
-            });
-          }
-        } catch (error) {
-          log15.catch(error, void 0, {
-            F: __dxlog_file18,
-            L: 77,
-            S: void 0,
-            C: (f, a) => f(...a)
-          });
-        }
-      };
-    },
-    stop: () => {
-      safeClose(channel);
-      channel = void 0;
-    }
+    storage: createStorage({
+      type: persistent ? toStorageType(dataStore) : StorageType.RAM,
+      root: getRootPath(config)
+    })
   };
 };
-var safeClose = (channel) => {
-  try {
-    channel?.close();
-  } catch (e) {
+var toStorageType = (type) => {
+  switch (type) {
+    case void 0:
+      return void 0;
+    case StorageDriver.RAM:
+      return StorageType.RAM;
+    case StorageDriver.CHROME:
+      return StorageType.CHROME;
+    case StorageDriver.FIREFOX:
+      return StorageType.FIREFOX;
+    case StorageDriver.IDB:
+      return StorageType.IDB;
+    case StorageDriver.NODE:
+      return StorageType.NODE;
+    case StorageDriver.WEBFS:
+      return StorageType.WEBFS;
+    default:
+      throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
   }
 };
 
-// packages/sdk/client-services/src/packlets/diagnostics/diagnostics-collector.ts
-import { ConfigResource } from "@dxos/config";
-import { GetDiagnosticsRequest as GetDiagnosticsRequest2 } from "@dxos/protocols/proto/dxos/client/services";
-import { TRACE_PROCESSOR as TRACE_PROCESSOR3 } from "@dxos/tracing";
-import { jsonKeyReplacer as jsonKeyReplacer2, nonNullable } from "@dxos/util";
+// packages/sdk/client-services/src/packlets/storage/level.ts
+import path from "@dxos/node-std/path";
+import { PublicKey as PublicKey13 } from "@dxos/keys";
+import { createLevel as createKV } from "@dxos/kv-store";
+var createLevel = async (config) => {
+  const persistent = isPersistent(config);
+  const storagePath = persistent ? path.join(getRootPath(config), "level") : `/tmp/dxos-${PublicKey13.random().toHex()}`;
+  const level = createKV(storagePath);
+  await level.open();
+  return level;
+};
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 import { Event as Event9, synchronized as synchronized3 } from "@dxos/async";
-import { clientServiceBundle, defaultKey, Properties } from "@dxos/client-protocol";
+import { clientServiceBundle, defaultKey, PropertiesType } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
 import { encodeReference } from "@dxos/echo-protocol";
 import { getTypeReference } from "@dxos/echo-schema";
 import { invariant as invariant18 } from "@dxos/invariant";
-import { PublicKey as PublicKey15 } from "@dxos/keys";
+import { PublicKey as PublicKey16 } from "@dxos/keys";
 import { log as log18 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
-import { NetworkManager, createSimplePeerTransportFactory } from "@dxos/network-manager";
+import { SwarmNetworkManager, createSimplePeerTransportFactory } from "@dxos/network-manager";
 import { trace as trace10 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
-import { TRACE_PROCESSOR as TRACE_PROCESSOR2, trace as Trace4 } from "@dxos/tracing";
+import { TRACE_PROCESSOR as TRACE_PROCESSOR3, trace as Trace4 } from "@dxos/tracing";
 import { assignDeep as assignDeep2 } from "@dxos/util";
 import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 
@@ -5599,7 +5819,7 @@ import { EventSubscriptions as EventSubscriptions3 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
 import { invariant as invariant17 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -5617,7 +5837,7 @@ var DevicesServiceImpl = class {
           });
         } else {
           invariant17(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file19,
+            F: __dxlog_file20,
             L: 32,
             S: this,
             A: [
@@ -5645,165 +5865,88 @@ var DevicesServiceImpl = class {
       const subscribeIdentity = () => {
         if (!identitySubscribed) {
           this._identityManager.identity?.stateUpdate.on(() => {
-            update();
-          });
-          identitySubscribed = true;
-        }
-      };
-      const subscribePresence = () => {
-        if (!presenceSubscribed) {
-          this._identityManager.identity?.presence?.updated.on(() => {
-            update();
-          });
-          presenceSubscribed = true;
-        }
-      };
-      const subscriptions = new EventSubscriptions3();
-      if (this._identityManager.identity) {
-        subscribeIdentity();
-        subscribePresence();
-      }
-      subscriptions.add(this._identityManager.stateUpdate.on(() => {
-        update();
-        if (this._identityManager.identity) {
-          subscribeIdentity();
-          subscribePresence();
-        }
-      }));
-      update();
-      return () => subscriptions.clear();
-    });
-  }
-};
-
-// packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout as asyncTimeout3, Trigger as Trigger8 } from "@dxos/async";
-import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
-import { log as log16, logInfo } from "@dxos/log";
-function _ts_decorate7(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    r = Reflect.decorate(decorators, target, key, desc);
-  else
-    for (var i = decorators.length - 1; i >= 0; i--)
-      if (d = decorators[i])
-        r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-  return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
-var Message;
-(function(Message2) {
-  Message2["ACQUIRING"] = "acquiring";
-})(Message || (Message = {}));
-var Lock = class {
-  constructor({ lockKey, onAcquire, onRelease }) {
-    this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
-    this._releaseTrigger = new Trigger8();
-    this._lockKey = lockKey;
-    this._onAcquire = onAcquire;
-    this._onRelease = onRelease;
-    this._broadcastChannel.onmessage = this._onMessage.bind(this);
-  }
-  get lockKey() {
-    return this._lockKey;
-  }
-  async acquire() {
-    this._broadcastChannel.postMessage({
-      message: "acquiring"
+            update();
+          });
+          identitySubscribed = true;
+        }
+      };
+      const subscribePresence = () => {
+        if (!presenceSubscribed) {
+          this._identityManager.identity?.presence?.updated.on(() => {
+            update();
+          });
+          presenceSubscribed = true;
+        }
+      };
+      const subscriptions = new EventSubscriptions3();
+      if (this._identityManager.identity) {
+        subscribeIdentity();
+        subscribePresence();
+      }
+      subscriptions.add(this._identityManager.stateUpdate.on(() => {
+        update();
+        if (this._identityManager.identity) {
+          subscribeIdentity();
+          subscribePresence();
+        }
+      }));
+      update();
+      return () => subscriptions.clear();
     });
-    try {
-      log16("aquiring lock...", void 0, {
-        F: __dxlog_file20,
-        L: 42,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await asyncTimeout3(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
-      log16("acquired lock", void 0, {
-        F: __dxlog_file20,
-        L: 44,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } catch {
-      log16("stealing lock...", void 0, {
-        F: __dxlog_file20,
-        L: 46,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._requestLock(true);
-      log16("stolen lock", void 0, {
-        F: __dxlog_file20,
-        L: 48,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
   }
-  async release() {
-    this._releaseTrigger.wake();
-  }
-  _onMessage(event) {
-    if (event.data.message === "acquiring") {
-      this._releaseTrigger.wake();
-    }
+};
+
+// packages/sdk/client-services/src/packlets/diagnostics/diagnostics-collector.ts
+import { ConfigResource } from "@dxos/config";
+import { GetDiagnosticsRequest } from "@dxos/protocols/proto/dxos/client/services";
+import { TRACE_PROCESSOR as TRACE_PROCESSOR2 } from "@dxos/tracing";
+import { jsonKeyReplacer, nonNullable } from "@dxos/util";
+
+// packages/sdk/client-services/src/packlets/services/util.ts
+import { PublicKey as PublicKey14 } from "@dxos/keys";
+import { humanize } from "@dxos/util";
+var ClientServicesProviderResource = Symbol.for("dxos.resource.ClientServices");
+
+// packages/sdk/client-services/src/packlets/diagnostics/diagnostics-collector.ts
+var GET_DIAGNOSTICS_RPC_TIMEOUT = 1e4;
+var DiagnosticsCollector = class {
+  static {
+    this.broadcastSender = createCollectDiagnosticsBroadcastSender();
   }
-  async _requestLock(steal = false) {
-    log16("requesting lock...", {
-      steal
-    }, {
-      F: __dxlog_file20,
-      L: 63,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    const acquired = new Trigger8();
-    void navigator.locks.request(this._lockKey, {
-      steal
-    }, async () => {
-      await this._onAcquire?.();
-      acquired.wake();
-      this._releaseTrigger = new Trigger8();
-      await this._releaseTrigger.wait();
-      log16("releasing lock...", void 0, {
-        F: __dxlog_file20,
-        L: 72,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._onRelease?.();
-      log16("released lock", void 0, {
-        F: __dxlog_file20,
-        L: 74,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }).catch(async () => {
-      await this._onRelease?.();
-    });
-    await acquired.wait();
-    log16("recieved lock", {
-      steal
+  static async collect(config = findConfigs(), services = findSystemServiceProvider(), options = {}) {
+    const serviceDiagnostics = await services?.services?.SystemService?.getDiagnostics({
+      keys: options.humanize ? GetDiagnosticsRequest.KEY_OPTION.HUMANIZE : options.truncate ? GetDiagnosticsRequest.KEY_OPTION.TRUNCATE : void 0
     }, {
-      F: __dxlog_file20,
-      L: 81,
-      S: this,
-      C: (f, a) => f(...a)
+      timeout: GET_DIAGNOSTICS_RPC_TIMEOUT
     });
+    const clientDiagnostics = {
+      config,
+      trace: TRACE_PROCESSOR2.getDiagnostics()
+    };
+    const diagnostics = serviceDiagnostics != null ? {
+      client: clientDiagnostics,
+      services: serviceDiagnostics
+    } : {
+      client: clientDiagnostics,
+      broadcast: await this.broadcastSender.broadcastDiagnosticsRequest()
+    };
+    return JSON.parse(JSON.stringify(diagnostics, jsonKeyReplacer(options)));
   }
 };
-_ts_decorate7([
-  logInfo
-], Lock.prototype, "lockKey", null);
-var isLocked = (lockPath) => {
-  throw new Error("Not implemented");
+var findSystemServiceProvider = () => {
+  const serviceProviders = TRACE_PROCESSOR2.findResourcesByAnnotation(ClientServicesProviderResource);
+  const providerResource = serviceProviders.find((r) => r.instance.deref()?.services?.SystemService != null);
+  return providerResource?.instance?.deref() ?? null;
+};
+var findConfigs = () => {
+  const configs = TRACE_PROCESSOR2.findResourcesByAnnotation(ConfigResource);
+  return configs.map((r) => r.instance.deref()).filter(nonNullable);
 };
 
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 import { Event as Event8 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
-import { PublicKey as PublicKey13 } from "@dxos/keys";
+import { PublicKey as PublicKey15 } from "@dxos/keys";
 import { getContextFromEntry, log as log17 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
@@ -5811,7 +5954,7 @@ var LoggingServiceImpl = class {
   constructor() {
     this._logs = new Event8();
     this._started = Date.now();
-    this._sessionId = PublicKey13.random().toHex();
+    this._sessionId = PublicKey15.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -5957,84 +6100,10 @@ var NetworkServiceImpl = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/storage/storage.ts
-import { InvalidConfigError } from "@dxos/protocols";
-import { Runtime as Runtime2 } from "@dxos/protocols/proto/dxos/config";
-import { createStorage, StorageType } from "@dxos/random-access-storage";
-
-// packages/sdk/client-services/src/packlets/storage/util.ts
-import { DX_DATA } from "@dxos/client-protocol";
-import { Runtime } from "@dxos/protocols/proto/dxos/config";
-import { isNode as isNode2 } from "@dxos/util";
-var getRootPath = (config) => {
-  const { dataRoot = isNode2() ? DX_DATA : "dxos/storage" } = config ?? {};
-  return `${dataRoot}/`;
-};
-var isPersistent = (config) => {
-  const { persistent = false } = config ?? {};
-  return config.dataStore !== void 0 && config.dataStore !== Runtime.Client.Storage.StorageDriver.RAM || persistent;
-};
-
-// packages/sdk/client-services/src/packlets/storage/storage.ts
-var StorageDriver = Runtime2.Client.Storage.StorageDriver;
-var createStorageObjects = (config) => {
-  const { persistent = false, keyStore, dataStore } = config ?? {};
-  if (persistent && dataStore === StorageDriver.RAM) {
-    throw new InvalidConfigError("RAM storage cannot be used in persistent mode.");
-  }
-  if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
-  }
-  if (persistent && keyStore === StorageDriver.RAM) {
-    throw new InvalidConfigError("RAM key storage cannot be used in persistent mode.");
-  }
-  if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
-  }
-  return {
-    storage: createStorage({
-      type: persistent ? toStorageType(dataStore) : StorageType.RAM,
-      root: getRootPath(config)
-    })
-  };
-};
-var toStorageType = (type) => {
-  switch (type) {
-    case void 0:
-      return void 0;
-    case StorageDriver.RAM:
-      return StorageType.RAM;
-    case StorageDriver.CHROME:
-      return StorageType.CHROME;
-    case StorageDriver.FIREFOX:
-      return StorageType.FIREFOX;
-    case StorageDriver.IDB:
-      return StorageType.IDB;
-    case StorageDriver.NODE:
-      return StorageType.NODE;
-    case StorageDriver.WEBFS:
-      return StorageType.WEBFS;
-    default:
-      throw new Error(`Invalid storage type: ${StorageDriver[type]}`);
-  }
-};
-
-// packages/sdk/client-services/src/packlets/storage/level.ts
-import path from "@dxos/node-std/path";
-import { PublicKey as PublicKey14 } from "@dxos/keys";
-import { createLevel as createKV } from "@dxos/kv-store";
-var createLevel = async (config) => {
-  const persistent = isPersistent(config);
-  const storagePath = persistent ? path.join(getRootPath(config), "level") : `/tmp/dxos-${PublicKey14.random().toHex()}`;
-  const level = createKV(storagePath);
-  await level.open();
-  return level;
-};
-
 // packages/sdk/client-services/src/packlets/system/system-service.ts
 import { Stream as Stream14 } from "@dxos/codec-protobuf";
-import { GetDiagnosticsRequest } from "@dxos/protocols/proto/dxos/client/services";
-import { jsonKeyReplacer } from "@dxos/util";
+import { GetDiagnosticsRequest as GetDiagnosticsRequest2 } from "@dxos/protocols/proto/dxos/client/services";
+import { jsonKeyReplacer as jsonKeyReplacer2 } from "@dxos/util";
 var SystemServiceImpl = class {
   constructor({ config, statusUpdate, getDiagnostics, onUpdateStatus, getCurrentStatus, onReset }) {
     this._config = config;
@@ -6054,9 +6123,9 @@ var SystemServiceImpl = class {
     const diagnostics = await this._getDiagnostics();
     return {
       timestamp: /* @__PURE__ */ new Date(),
-      diagnostics: JSON.parse(JSON.stringify(diagnostics, jsonKeyReplacer({
-        truncate: keys === GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
-        humanize: keys === GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
+      diagnostics: JSON.parse(JSON.stringify(diagnostics, jsonKeyReplacer2({
+        truncate: keys === GetDiagnosticsRequest2.KEY_OPTION.TRUNCATE,
+        humanize: keys === GetDiagnosticsRequest2.KEY_OPTION.HUMANIZE
       })))
     };
   }
@@ -6112,7 +6181,7 @@ var ClientServicesHost = class {
     callbacks,
     runtimeParams
   } = {}) {
-    this._tracingService = TRACE_PROCESSOR2.createTraceSender();
+    this._tracingService = TRACE_PROCESSOR3.createTraceSender();
     this._statusUpdate = new Event9();
     this._opening = false;
     this._open = false;
@@ -6238,7 +6307,7 @@ var ClientServicesHost = class {
         "'network manager already set'"
       ]
     });
-    this._networkManager = new NetworkManager({
+    this._networkManager = new SwarmNetworkManager({
       log: connectionLog,
       transportFactory,
       signalManager
@@ -6254,7 +6323,7 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = PublicKey15.random().toHex();
+    const traceId = PublicKey16.random().toHex();
     log18.trace("dxos.client-services.host.open", trace10.begin({
       id: traceId
     }), {
@@ -6402,7 +6471,7 @@ var ClientServicesHost = class {
     });
   }
   async reset() {
-    const traceId = PublicKey15.random().toHex();
+    const traceId = PublicKey16.random().toHex();
     log18.trace("dxos.sdk.client-services-host.reset", trace10.begin({
       id: traceId
     }), {
@@ -6449,11 +6518,11 @@ var ClientServicesHost = class {
         ""
       ]
     });
-    const document = await this._serviceContext.echoHost.automergeRepo.find(automergeIndex);
+    const document = this._serviceContext.echoHost.automergeRepo.find(automergeIndex);
     await document.whenReady();
     const properties = {
       system: {
-        type: encodeReference(getTypeReference(Properties))
+        type: encodeReference(getTypeReference(PropertiesType))
       },
       data: {
         [defaultKey]: identity.identityKey.toHex()
@@ -6462,7 +6531,7 @@ var ClientServicesHost = class {
         keys: []
       }
     };
-    const propertiesId = PublicKey15.random().toHex();
+    const propertiesId = PublicKey16.random().toHex();
     document.change((doc) => {
       assignDeep2(doc, [
         "objects",
@@ -6491,47 +6560,6 @@ ClientServicesHost = _ts_decorate8([
   Trace4.resource()
 ], ClientServicesHost);
 
-// packages/sdk/client-services/src/packlets/services/util.ts
-import { PublicKey as PublicKey16 } from "@dxos/keys";
-import { humanize } from "@dxos/util";
-var ClientServicesProviderResource = Symbol.for("dxos.resource.ClientServices");
-
-// packages/sdk/client-services/src/packlets/diagnostics/diagnostics-collector.ts
-var GET_DIAGNOSTICS_RPC_TIMEOUT = 1e4;
-var DiagnosticsCollector = class {
-  static {
-    this.broadcastSender = createCollectDiagnosticsBroadcastSender();
-  }
-  static async collect(config = findConfigs(), services = findSystemServiceProvider(), options = {}) {
-    const serviceDiagnostics = await services?.services?.SystemService?.getDiagnostics({
-      keys: options.humanize ? GetDiagnosticsRequest2.KEY_OPTION.HUMANIZE : options.truncate ? GetDiagnosticsRequest2.KEY_OPTION.TRUNCATE : void 0
-    }, {
-      timeout: GET_DIAGNOSTICS_RPC_TIMEOUT
-    });
-    const clientDiagnostics = {
-      config,
-      trace: TRACE_PROCESSOR3.getDiagnostics()
-    };
-    const diagnostics = serviceDiagnostics != null ? {
-      client: clientDiagnostics,
-      services: serviceDiagnostics
-    } : {
-      client: clientDiagnostics,
-      broadcast: await this.broadcastSender.broadcastDiagnosticsRequest()
-    };
-    return JSON.parse(JSON.stringify(diagnostics, jsonKeyReplacer2(options)));
-  }
-};
-var findSystemServiceProvider = () => {
-  const serviceProviders = TRACE_PROCESSOR3.findResourcesByAnnotation(ClientServicesProviderResource);
-  const providerResource = serviceProviders.find((r) => r.instance.deref()?.services?.SystemService != null);
-  return providerResource?.instance?.deref() ?? null;
-};
-var findConfigs = () => {
-  const configs = TRACE_PROCESSOR3.findResourcesByAnnotation(ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(nonNullable);
-};
-
 export {
   Buffer,
   subscribeToFeeds,
@@ -6544,6 +6572,10 @@ export {
   subscribeToSpaces,
   DevtoolsHostEvents,
   DevtoolsServiceImpl,
+  createDiagnostics,
+  createCollectDiagnosticsBroadcastSender,
+  createCollectDiagnosticsBroadcastHandler,
+  ClientRpcServer,
   createAuthProvider,
   TrustedKeySetAuthVerifier,
   Identity,
@@ -6555,22 +6587,18 @@ export {
   InvitationsServiceImpl,
   SpaceInvitationProtocol,
   InvitationsManager,
-  ClientRpcServer,
   DataSpace,
   findPropertiesObject,
   DataSpaceManager,
   SpacesServiceImpl,
   ServiceContext,
   ServiceRegistry,
-  createDiagnostics,
-  createCollectDiagnosticsBroadcastSender,
-  createCollectDiagnosticsBroadcastHandler,
-  DiagnosticsCollector,
   Lock,
   isLocked,
   createStorageObjects,
   createLevel,
   ClientServicesHost,
-  ClientServicesProviderResource
+  ClientServicesProviderResource,
+  DiagnosticsCollector
 };
-//# sourceMappingURL=chunk-ACQUT3OK.mjs.map
+//# sourceMappingURL=chunk-XYEJP6PO.mjs.map