@dxos/client-services 0.6.3-next.2f65b78 → 0.6.3-staging.0f23fb2

package/dist/lib/browser/{chunk-XDR7UKWW.mjs → chunk-UR2AY5N5.mjs}

@@ -359,7 +359,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.6.3-next.2f65b78";
+var DXOS_VERSION = "0.6.3-staging.0f23fb2";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -604,86 +604,46 @@ var safeClose = (channel) => {
   }
 };
 
-// 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();
+// packages/sdk/client-services/src/packlets/diagnostics/diagnostics-collector.ts
+import { ClientServicesProviderResource } from "@dxos/client-protocol";
+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";
+var GET_DIAGNOSTICS_RPC_TIMEOUT = 1e4;
+var DiagnosticsCollector = class {
+  static {
+    this.broadcastSender = createCollectDiagnosticsBroadcastSender();
   }
-  _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);
+  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
+    }, {
+      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_decorate([
-  trace.metricsCounter()
-], ClientRpcServer.prototype, "_callMetrics", void 0);
-_ts_decorate([
-  trace.info()
-], ClientRpcServer.prototype, "_services", null);
-ClientRpcServer = _ts_decorate([
-  trace.resource()
-], ClientRpcServer);
+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/identity/authenticator.ts
 import { Trigger as Trigger2 } from "@dxos/async";
@@ -813,7 +773,7 @@ import { PublicKey as PublicKey3 } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
 import { AdmittedFeed } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Timeframe } from "@dxos/timeframe";
-import { trace as trace2 } from "@dxos/tracing";
+import { trace } from "@dxos/tracing";
 import { ComplexSet } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/identity/default-space-state-machine.ts
@@ -863,7 +823,7 @@ var DefaultSpaceStateMachine = class {
 };
 
 // packages/sdk/client-services/src/packlets/identity/identity.ts
-function _ts_decorate2(decorators, target, key, desc) {
+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);
@@ -1050,14 +1010,14 @@ var Identity = class {
     })));
   }
 };
-_ts_decorate2([
-  trace2.span()
+_ts_decorate([
+  trace.span()
 ], Identity.prototype, "open", null);
-_ts_decorate2([
-  trace2.span()
+_ts_decorate([
+  trace.span()
 ], Identity.prototype, "close", null);
-Identity = _ts_decorate2([
-  trace2.resource()
+Identity = _ts_decorate([
+  trace.resource()
 ], Identity);
 
 // packages/sdk/client-services/src/packlets/identity/identity-manager.ts
@@ -1068,14 +1028,14 @@ import { createCredentialSignerWithKey as createCredentialSignerWithKey2, Creden
 import { invariant as invariant3 } from "@dxos/invariant";
 import { PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log5 } from "@dxos/log";
-import { trace as trace3 } from "@dxos/protocols";
+import { trace as trace2 } 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 as Timeframe2 } from "@dxos/timeframe";
 import { trace as Trace } from "@dxos/tracing";
 import { isNode, deferFunction } from "@dxos/util";
-function _ts_decorate3(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);
@@ -1106,7 +1066,7 @@ var IdentityManager = class {
   }
   async open(ctx) {
     const traceId = PublicKey4.random().toHex();
-    log5.trace("dxos.halo.identity-manager.open", trace3.begin({
+    log5.trace("dxos.halo.identity-manager.open", trace2.begin({
       id: traceId
     }), {
       F: __dxlog_file7,
@@ -1138,7 +1098,7 @@ var IdentityManager = class {
       });
       this.stateUpdate.emit();
     }
-    log5.trace("dxos.halo.identity-manager.open", trace3.end({
+    log5.trace("dxos.halo.identity-manager.open", trace2.end({
       id: traceId
     }), {
       F: __dxlog_file7,
@@ -1525,18 +1485,18 @@ var IdentityManager = class {
     });
   }
 };
-_ts_decorate3([
+_ts_decorate2([
   Trace.span({
     showInBrowserTimeline: true
   })
 ], IdentityManager.prototype, "open", null);
-IdentityManager = _ts_decorate3([
+IdentityManager = _ts_decorate2([
   Trace.resource()
 ], IdentityManager);
 
 // packages/sdk/client-services/src/packlets/identity/identity-service.ts
 import { Trigger as Trigger3, sleep } from "@dxos/async";
-import { Stream as Stream8 } from "@dxos/codec-protobuf";
+import { Stream as Stream7 } from "@dxos/codec-protobuf";
 import { Resource } from "@dxos/context";
 import { signPresentation } from "@dxos/credentials";
 import { todo } from "@dxos/debug";
@@ -1588,7 +1548,7 @@ var IdentityServiceImpl = class extends Resource {
     return todo();
   }
   queryIdentity() {
-    return new Stream8(({ next }) => {
+    return new Stream7(({ next }) => {
       const emitNext = () => next({
         identity: this._getIdentity()
       });
@@ -1644,9 +1604,9 @@ var IdentityServiceImpl = class extends Resource {
     const dataSpaceManager = this._dataSpaceManagerProvider();
     const recordedDefaultSpaceTrigger = new Trigger3();
     const allProcessed = safeAwaitAll(dataSpaceManager.spaces.values(), async (space) => {
-      if (space.state === SpaceState.CLOSED) {
+      if (space.state === SpaceState.SPACE_CLOSED) {
         await space.open();
-        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === SpaceState.REQUIRES_MIGRATION);
+        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === SpaceState.SPACE_REQUIRES_MIGRATION);
         await Promise.race([
           space.initializeDataPipeline(),
           requiresMigration
@@ -1808,10 +1768,10 @@ import { invariant as invariant9 } from "@dxos/invariant";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { createTeleportProtocolFactory } from "@dxos/network-manager";
-import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace5 } from "@dxos/protocols";
+import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace4 } 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 { InvitationOptions as InvitationOptions4 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { trace as _trace } from "@dxos/tracing";
 import { ComplexSet as ComplexSet3 } from "@dxos/util";
 
@@ -1821,7 +1781,7 @@ import { cancelWithContext as cancelWithContext2, Context as Context4 } from "@d
 import { invariant as invariant6 } from "@dxos/invariant";
 import { log as log7 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError, schema as schema2 } from "@dxos/protocols";
-import { Options } from "@dxos/protocols/proto/dxos/halo/invitations";
+import { InvitationOptions } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension } from "@dxos/teleport";
 
 // packages/sdk/client-services/src/packlets/invitations/utils.ts
@@ -1913,11 +1873,11 @@ var InvitationGuestExtension = class extends RpcExtension {
         C: (f, a) => f(...a)
       });
       await cancelWithContext2(this._ctx, this.rpc.InvitationHostService.options({
-        role: Options.Role.GUEST
+        role: InvitationOptions.Role.GUEST
       }));
       log7("options sent", void 0, {
         F: __dxlog_file10,
-        L: 88,
+        L: 91,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1926,13 +1886,13 @@ var InvitationGuestExtension = class extends RpcExtension {
       }));
       log7("options received", void 0, {
         F: __dxlog_file10,
-        L: 90,
+        L: 93,
         S: this,
         C: (f, a) => f(...a)
       });
-      if (this._remoteOptions?.role !== Options.Role.HOST) {
+      if (this._remoteOptions?.role !== InvitationOptions.Role.HOST) {
         throw new InvalidInvitationExtensionRoleError(void 0, {
-          expected: Options.Role.HOST,
+          expected: InvitationOptions.Role.HOST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
         });
@@ -1960,7 +1920,7 @@ var InvitationGuestExtension = class extends RpcExtension {
       this._invitationFlowLock = null;
       log7("invitation flow lock released", void 0, {
         F: __dxlog_file10,
-        L: 123,
+        L: 126,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1975,9 +1935,9 @@ import { randomBytes, verify } from "@dxos/crypto";
 import { invariant as invariant7, InvariantViolation } from "@dxos/invariant";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log8 } from "@dxos/log";
-import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, schema as schema3, trace as trace4 } from "@dxos/protocols";
+import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError2, schema as schema3, trace as trace3 } 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 { AuthenticationResponse, InvitationOptions as InvitationOptions2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
 var OPTIONS_TIMEOUT2 = 1e4;
@@ -2030,7 +1990,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
         introduce: async (request) => {
           const { profile, invitationId } = request;
           const traceId = PublicKey5.random().toHex();
-          log8.trace("dxos.sdk.invitation-handler.host.introduce", trace4.begin({
+          log8.trace("dxos.sdk.invitation-handler.host.introduce", trace3.begin({
             id: traceId
           }), {
             F: __dxlog_file11,
@@ -2067,7 +2027,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
           this.guestProfile = profile;
           this._callbacks.onStateUpdate(Invitation3.State.READY_FOR_AUTHENTICATION);
           this._challenge = invitation.authMethod === Invitation3.AuthMethod.KNOWN_PUBLIC_KEY ? randomBytes(32) : void 0;
-          log8.trace("dxos.sdk.invitation-handler.host.introduce", trace4.end({
+          log8.trace("dxos.sdk.invitation-handler.host.introduce", trace3.end({
             id: traceId
           }), {
             F: __dxlog_file11,
@@ -2082,7 +2042,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
         },
         authenticate: async ({ authCode: code, signedChallenge }) => {
           const traceId = PublicKey5.random().toHex();
-          log8.trace("dxos.sdk.invitation-handler.host.authenticate", trace4.begin({
+          log8.trace("dxos.sdk.invitation-handler.host.authenticate", trace3.begin({
             id: traceId
           }), {
             F: __dxlog_file11,
@@ -2165,7 +2125,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               status
             };
           }
-          log8.trace("dxos.sdk.invitation-handler.host.authenticate", trace4.end({
+          log8.trace("dxos.sdk.invitation-handler.host.authenticate", trace3.end({
             id: traceId,
             data: {
               status
@@ -2182,7 +2142,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
         },
         admit: async (request) => {
           const traceId = PublicKey5.random().toHex();
-          log8.trace("dxos.sdk.invitation-handler.host.admit", trace4.begin({
+          log8.trace("dxos.sdk.invitation-handler.host.admit", trace3.begin({
             id: traceId
           }), {
             F: __dxlog_file11,
@@ -2199,7 +2159,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
               }
             }
             const response = await this._callbacks.admit(request);
-            log8.trace("dxos.sdk.invitation-handler.host.admit", trace4.end({
+            log8.trace("dxos.sdk.invitation-handler.host.admit", trace3.end({
               id: traceId
             }), {
               F: __dxlog_file11,
@@ -2235,7 +2195,7 @@ var InvitationHostExtension = class extends RpcExtension2 {
       const lastState = this._requireActiveInvitation().state;
       this._callbacks.onStateUpdate(Invitation3.State.CONNECTING);
       await this.rpc.InvitationHostService.options({
-        role: Options2.Role.HOST
+        role: InvitationOptions2.Role.HOST
       });
       log8("options sent", void 0, {
         F: __dxlog_file11,
@@ -2252,10 +2212,10 @@ var InvitationHostExtension = class extends RpcExtension2 {
         S: this,
         C: (f, a) => f(...a)
       });
-      if (this._remoteOptions?.role !== Options2.Role.GUEST) {
+      if (this._remoteOptions?.role !== InvitationOptions2.Role.GUEST) {
         this._callbacks.onStateUpdate(lastState);
         throw new InvalidInvitationExtensionRoleError2(void 0, {
-          expected: Options2.Role.GUEST,
+          expected: InvitationOptions2.Role.GUEST,
           remoteOptions: this._remoteOptions,
           remotePeerId: context.remotePeerId
         });
@@ -2315,7 +2275,7 @@ var isAuthenticationRequired = (invitation) => invitation.authMethod !== Invitat
 import { invariant as invariant8 } from "@dxos/invariant";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
-import { Options as Options3 } from "@dxos/protocols/proto/dxos/halo/invitations";
+import { InvitationOptions as InvitationOptions3 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { ComplexSet as ComplexSet2 } from "@dxos/util";
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
 var InvitationTopology = class {
@@ -2346,7 +2306,7 @@ var InvitationTopology = class {
       ]
     });
     const { ownPeerId, candidates, connected, allPeers } = this._controller.getState();
-    if (this._role === Options3.Role.GUEST) {
+    if (this._role === InvitationOptions3.Role.GUEST) {
       return;
     }
     if (connected.length > 0) {
@@ -2385,7 +2345,7 @@ var InvitationTopology = class {
     this._seenPeers.clear();
   }
   toString() {
-    return `InvitationTopology(${this._role === Options3.Role.GUEST ? "guest" : "host"})`;
+    return `InvitationTopology(${this._role === InvitationOptions3.Role.GUEST ? "guest" : "host"})`;
   }
 };
 
@@ -2402,7 +2362,7 @@ var InvitationsHandler = class {
     this._defaultTeleportParams = _defaultTeleportParams;
   }
   handleInvitationFlow(ctx, stream, protocol, invitation) {
-    metrics.increment("invitation.created");
+    metrics.increment("dxos.invitation.created");
     const guardedState = this._createGuardedState(ctx, invitation, stream);
     const createExtension = () => {
       const extension = new InvitationHostExtension(guardedState.mutex, {
@@ -2418,7 +2378,7 @@ var InvitationsHandler = class {
             const deviceKey = admissionRequest.device?.deviceKey ?? admissionRequest.space?.deviceKey;
             invariant9(deviceKey, void 0, {
               F: __dxlog_file13,
-              L: 93,
+              L: 94,
               S: this,
               A: [
                 "deviceKey",
@@ -2443,11 +2403,11 @@ var InvitationsHandler = class {
           scheduleTask3(connectionCtx, async () => {
             const traceId = PublicKey7.random().toHex();
             try {
-              log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.begin({
+              log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace4.begin({
                 id: traceId
               }), {
                 F: __dxlog_file13,
-                L: 118,
+                L: 119,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2455,7 +2415,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 119,
+                L: 120,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2467,17 +2427,17 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 121,
+                L: 122,
                 S: this,
                 C: (f, a) => f(...a)
               });
               guardedState.set(extension, Invitation4.State.SUCCESS);
-              metrics.increment("invitation.success");
-              log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.end({
+              metrics.increment("dxos.invitation.success");
+              log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace4.end({
                 id: traceId
               }), {
                 F: __dxlog_file13,
-                L: 124,
+                L: 125,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2488,33 +2448,33 @@ var InvitationsHandler = class {
             } catch (err) {
               if (err instanceof TimeoutError) {
                 if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-                  metrics.increment("invitation.timeout");
+                  metrics.increment("dxos.invitation.timeout");
                   log10("timeout", {
                     ...protocol.toJSON()
                   }, {
                     F: __dxlog_file13,
-                    L: 134,
+                    L: 135,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                 }
               } else {
                 if (guardedState.error(extension, err)) {
-                  metrics.increment("invitation.failed");
+                  metrics.increment("dxos.invitation.failed");
                   log10.error("failed", err, {
                     F: __dxlog_file13,
-                    L: 139,
+                    L: 140,
                     S: this,
                     C: (f, a) => f(...a)
                   });
                 }
               }
-              log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace5.error({
+              log10.trace("dxos.sdk.invitations-handler.host.onOpen", trace4.error({
                 id: traceId,
                 error: err
               }), {
                 F: __dxlog_file13,
-                L: 142,
+                L: 143,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2528,7 +2488,7 @@ var InvitationsHandler = class {
               ...err.context
             }, {
               F: __dxlog_file13,
-              L: 150,
+              L: 151,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2536,22 +2496,22 @@ var InvitationsHandler = class {
           }
           if (err instanceof TimeoutError) {
             if (guardedState.set(extension, Invitation4.State.TIMEOUT)) {
-              metrics.increment("invitation.timeout");
+              metrics.increment("dxos.invitation.timeout");
               log10("timeout", {
                 err
               }, {
                 F: __dxlog_file13,
-                L: 156,
+                L: 157,
                 S: this,
                 C: (f, a) => f(...a)
               });
             }
           } else {
             if (guardedState.error(extension, err)) {
-              metrics.increment("invitation.failed");
+              metrics.increment("dxos.invitation.failed");
               log10.error("failed", err, {
                 F: __dxlog_file13,
-                L: 161,
+                L: 162,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2565,7 +2525,7 @@ var InvitationsHandler = class {
       if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
         log10.warn("invitation has already expired", void 0, {
           F: __dxlog_file13,
-          L: 172,
+          L: 173,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2573,14 +2533,14 @@ var InvitationsHandler = class {
         scheduleTask3(ctx, async () => {
           await swarmConnection.close();
           guardedState.set(null, Invitation4.State.EXPIRED);
-          metrics.increment("invitation.expired");
+          metrics.increment("dxos.invitation.expired");
           await ctx.dispose();
         }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
       }
     }
     let swarmConnection;
     scheduleTask3(ctx, async () => {
-      swarmConnection = await this._joinSwarm(ctx, invitation, Options4.Role.HOST, createExtension);
+      swarmConnection = await this._joinSwarm(ctx, invitation, InvitationOptions4.Role.HOST, createExtension);
       guardedState.set(null, Invitation4.State.CONNECTING);
     });
   }
@@ -2589,7 +2549,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       invariant9(invitation.kind === Invitation4.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file13,
-        L: 206,
+        L: 207,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -2607,7 +2567,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file13,
-        L: 214,
+        L: 215,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2634,7 +2594,7 @@ var InvitationsHandler = class {
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file13,
-              L: 242,
+              L: 243,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2648,11 +2608,11 @@ var InvitationsHandler = class {
           scheduleTask3(connectionCtx, async () => {
             const traceId = PublicKey7.random().toHex();
             try {
-              log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.begin({
+              log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace4.begin({
                 id: traceId
               }), {
                 F: __dxlog_file13,
-                L: 254,
+                L: 255,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2664,7 +2624,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 265,
+                L: 266,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2673,7 +2633,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 269,
+                L: 270,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2686,7 +2646,7 @@ var InvitationsHandler = class {
                 response: introductionResponse
               }, {
                 F: __dxlog_file13,
-                L: 274,
+                L: 275,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2707,7 +2667,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 300,
+                L: 301,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2719,7 +2679,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file13,
-                L: 311,
+                L: 312,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2728,11 +2688,11 @@ var InvitationsHandler = class {
                 ...result,
                 state: Invitation4.State.SUCCESS
               });
-              log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.end({
+              log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace4.end({
                 id: traceId
               }), {
                 F: __dxlog_file13,
-                L: 317,
+                L: 318,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2742,7 +2702,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file13,
-                  L: 320,
+                  L: 321,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -2750,19 +2710,19 @@ var InvitationsHandler = class {
               } else {
                 log10("auth failed", err, {
                   F: __dxlog_file13,
-                  L: 323,
+                  L: 324,
                   S: this,
                   C: (f, a) => f(...a)
                 });
                 guardedState.error(extension, err);
               }
               extensionCtx.close(err);
-              log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace5.error({
+              log10.trace("dxos.sdk.invitations-handler.guest.onOpen", trace4.error({
                 id: traceId,
                 error: err
               }), {
                 F: __dxlog_file13,
-                L: 327,
+                L: 328,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -2778,7 +2738,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file13,
-              L: 336,
+              L: 337,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2786,7 +2746,7 @@ var InvitationsHandler = class {
           } else {
             log10("auth failed", err, {
               F: __dxlog_file13,
-              L: 339,
+              L: 340,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -2804,21 +2764,21 @@ var InvitationsHandler = class {
       } else {
         invariant9(invitation.swarmKey, void 0, {
           F: __dxlog_file13,
-          L: 354,
+          L: 355,
           S: this,
           A: [
             "invitation.swarmKey",
             ""
           ]
         });
-        await this._joinSwarm(ctx, invitation, Options4.Role.GUEST, createExtension);
+        await this._joinSwarm(ctx, invitation, InvitationOptions4.Role.GUEST, createExtension);
         guardedState.set(null, Invitation4.State.CONNECTING);
       }
     });
   }
   async _joinSwarm(ctx, invitation, role, extensionFactory) {
     let label;
-    if (role === Options4.Role.GUEST) {
+    if (role === InvitationOptions4.Role.GUEST) {
       label = "invitation guest";
     } else if (invitation.kind === Invitation4.Kind.DEVICE) {
       label = "invitation host for device";
@@ -2904,7 +2864,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file13,
-        L: 448,
+        L: 449,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2915,7 +2875,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file13,
-        L: 454,
+        L: 455,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2934,7 +2894,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       log10("guest waiting for authentication code...", void 0, {
         F: __dxlog_file13,
-        L: 479,
+        L: 480,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2942,7 +2902,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       log10("sending authentication request", void 0, {
         F: __dxlog_file13,
-        L: 483,
+        L: 484,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2961,7 +2921,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file13,
-            L: 494,
+            L: 495,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2979,7 +2939,7 @@ var InvitationsHandler = class {
     }
     log10("sending authentication request", void 0, {
       F: __dxlog_file13,
-      L: 513,
+      L: 514,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3002,7 +2962,7 @@ var createAdmissionKeypair = () => {
 };
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-service.ts
-import { Stream as Stream9 } from "@dxos/codec-protobuf";
+import { Stream as Stream8 } from "@dxos/codec-protobuf";
 import { QueryInvitationsResponse } from "@dxos/protocols/proto/dxos/client/services";
 var InvitationsServiceImpl = class {
   constructor(_invitationsManager) {
@@ -3013,13 +2973,13 @@ var InvitationsServiceImpl = class {
     return {};
   }
   createInvitation(options) {
-    return new Stream9(({ next, close }) => {
+    return new Stream8(({ 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 Stream9(({ next, close }) => {
+    return new Stream8(({ next, close }) => {
       invitation.subscribe(next, close, close);
     });
   }
@@ -3030,7 +2990,7 @@ var InvitationsServiceImpl = class {
     return this._invitationsManager.cancelInvitation(request);
   }
   queryInvitations() {
-    return new Stream9(({ next, ctx }) => {
+    return new Stream8(({ next, ctx }) => {
       this._invitationsManager.invitationCreated.on(ctx, (invitation) => {
         next({
           action: QueryInvitationsResponse.Action.ADDED,
@@ -3730,107 +3690,312 @@ var InvitationsManager = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/spaces/data-space.ts
-import { Event as Event6, Mutex as Mutex2, scheduleTask as scheduleTask5, sleep as sleep3, synchronized, trackLeaks } from "@dxos/async";
-import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
-import { Context as Context8, ContextDisposedError as ContextDisposedError3, cancelWithContext as cancelWithContext4 } from "@dxos/context";
-import { timed, warnAfterTimeout } from "@dxos/debug";
-import { createMappedFeedWriter } from "@dxos/echo-pipeline";
-import { SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
-import { failedInvariant } from "@dxos/invariant";
-import { PublicKey as PublicKey10 } from "@dxos/keys";
-import { log as log15 } from "@dxos/log";
-import { CancelledError, SystemError } from "@dxos/protocols";
-import { SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
-import { AdmittedFeed as AdmittedFeed3, SpaceMember as SpaceMember4 } from "@dxos/protocols/proto/dxos/halo/credentials";
-import { Timeframe as Timeframe3 } from "@dxos/timeframe";
-import { trace as trace6 } from "@dxos/tracing";
-import { ComplexSet as ComplexSet5 } from "@dxos/util";
-
-// packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
-import { Event as Event4 } from "@dxos/async";
-import { Resource as Resource2 } from "@dxos/context";
-import { checkCredentialType } from "@dxos/credentials";
-var AutomergeSpaceState = class extends Resource2 {
-  constructor(_onNewRoot) {
-    super();
-    this._onNewRoot = _onNewRoot;
-    this.rootUrl = void 0;
-    this.lastEpoch = void 0;
-    this.onNewEpoch = new Event4();
-    this._isProcessingRootDocs = false;
-  }
-  async _open(ctx) {
-  }
-  async _close(ctx) {
-    this._isProcessingRootDocs = false;
-  }
-  async processCredential(credential) {
-    if (!checkCredentialType(credential, "dxos.halo.credentials.Epoch")) {
-      return;
-    }
-    this.lastEpoch = credential;
-    if (credential.subject.assertion.automergeRoot) {
-      this.rootUrl = credential.subject.assertion.automergeRoot;
-      if (this._isProcessingRootDocs) {
-        this._onNewRoot(this.rootUrl);
-      }
-    }
-    this.onNewEpoch.emit(credential);
-  }
-  startProcessingRootDocs() {
-    if (this._isProcessingRootDocs) {
-      return;
-    }
-    if (this.rootUrl) {
-      this._onNewRoot(this.rootUrl);
-    }
-    this._isProcessingRootDocs = true;
+// packages/sdk/client-services/src/packlets/locks/browser.ts
+import { asyncTimeout as asyncTimeout2, Trigger as Trigger7 } from "@dxos/async";
+import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
+import { log as log13, logInfo } from "@dxos/log";
+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 __dxlog_file16 = "/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 Trigger7();
+    this._lockKey = lockKey;
+    this._onAcquire = onAcquire;
+    this._onRelease = onRelease;
+    this._broadcastChannel.onmessage = this._onMessage.bind(this);
   }
-  async ensureEpochInitialized() {
-    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
+  get lockKey() {
+    return this._lockKey;
   }
-};
-
-// packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts
-import { convertLegacyReferences, convertLegacySpaceRootDoc, findInlineObjectOfType, migrateDocument } from "@dxos/echo-db";
-import { SpaceDocVersion } from "@dxos/echo-protocol";
-import { TYPE_PROPERTIES } from "@dxos/echo-schema";
-import { invariant as invariant12 } from "@dxos/invariant";
-import { log as log13 } from "@dxos/log";
-import { CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
-var LOAD_DOC_TIMEOUT = 1e4;
-var runEpochMigration = async (ctx, context) => {
-  switch (context.migration) {
-    case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
-      const document = context.echoHost.createDoc();
-      await context.echoHost.flush();
-      return {
-        newRoot: document.url
-      };
-    }
-    case CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY: {
-      if (!context.currentRoot) {
-        throw new Error("Space does not have an automerge root");
-      }
-      const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
-        timeout: LOAD_DOC_TIMEOUT
+  async acquire() {
+    this._broadcastChannel.postMessage({
+      message: "acquiring"
+    });
+    try {
+      log13("aquiring lock...", void 0, {
+        F: __dxlog_file16,
+        L: 42,
+        S: this,
+        C: (f, a) => f(...a)
       });
-      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
-      await context.echoHost.flush();
-      return {
-        newRoot: newRoot.url
-      };
-    }
-    case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
-      log13.info("Fragmenting", void 0, {
+      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
+      log13("acquired lock", void 0, {
         F: __dxlog_file16,
-        L: 64,
-        S: void 0,
+        L: 44,
+        S: this,
         C: (f, a) => f(...a)
       });
-      const currentRootUrl = context.currentRoot;
+    } catch {
+      log13("stealing lock...", void 0, {
+        F: __dxlog_file16,
+        L: 46,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await this._requestLock(true);
+      log13("stolen lock", void 0, {
+        F: __dxlog_file16,
+        L: 48,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  async release() {
+    this._releaseTrigger.wake();
+  }
+  _onMessage(event) {
+    if (event.data.message === "acquiring") {
+      this._releaseTrigger.wake();
+    }
+  }
+  async _requestLock(steal = false) {
+    log13("requesting lock...", {
+      steal
+    }, {
+      F: __dxlog_file16,
+      L: 63,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const acquired = new Trigger7();
+    void navigator.locks.request(this._lockKey, {
+      steal
+    }, async () => {
+      await this._onAcquire?.();
+      acquired.wake();
+      this._releaseTrigger = new Trigger7();
+      await this._releaseTrigger.wait();
+      log13("releasing lock...", void 0, {
+        F: __dxlog_file16,
+        L: 72,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      await this._onRelease?.();
+      log13("released lock", void 0, {
+        F: __dxlog_file16,
+        L: 74,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }).catch(async () => {
+      await this._onRelease?.();
+    });
+    await acquired.wait();
+    log13("recieved lock", {
+      steal
+    }, {
+      F: __dxlog_file16,
+      L: 81,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+_ts_decorate3([
+  logInfo
+], Lock.prototype, "lockKey", null);
+var isLocked = (lockPath) => {
+  throw new Error("Not implemented");
+};
+
+// 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_decorate4(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_decorate4([
+  trace5.metricsCounter()
+], ClientRpcServer.prototype, "_callMetrics", void 0);
+_ts_decorate4([
+  trace5.info()
+], ClientRpcServer.prototype, "_services", null);
+ClientRpcServer = _ts_decorate4([
+  trace5.resource()
+], ClientRpcServer);
+
+// packages/sdk/client-services/src/packlets/spaces/data-space.ts
+import { Event as Event6, Mutex as Mutex2, scheduleTask as scheduleTask5, sleep as sleep3, synchronized, trackLeaks } from "@dxos/async";
+import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
+import { Context as Context8, ContextDisposedError as ContextDisposedError3, cancelWithContext as cancelWithContext4 } from "@dxos/context";
+import { timed, warnAfterTimeout } from "@dxos/debug";
+import { createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
+import { failedInvariant } from "@dxos/invariant";
+import { PublicKey as PublicKey10 } from "@dxos/keys";
+import { log as log16 } from "@dxos/log";
+import { CancelledError, SystemError } from "@dxos/protocols";
+import { SpaceState as SpaceState2 } from "@dxos/protocols/proto/dxos/client/services";
+import { AdmittedFeed as AdmittedFeed3, SpaceMember as SpaceMember4 } from "@dxos/protocols/proto/dxos/halo/credentials";
+import { Timeframe as Timeframe3 } from "@dxos/timeframe";
+import { trace as trace6 } from "@dxos/tracing";
+import { ComplexSet as ComplexSet5 } from "@dxos/util";
+
+// packages/sdk/client-services/src/packlets/spaces/automerge-space-state.ts
+import { Event as Event4 } from "@dxos/async";
+import { Resource as Resource2 } from "@dxos/context";
+import { checkCredentialType } from "@dxos/credentials";
+var AutomergeSpaceState = class extends Resource2 {
+  constructor(_onNewRoot) {
+    super();
+    this._onNewRoot = _onNewRoot;
+    this.rootUrl = void 0;
+    this.lastEpoch = void 0;
+    this.onNewEpoch = new Event4();
+    this._isProcessingRootDocs = false;
+  }
+  async _open(ctx) {
+  }
+  async _close(ctx) {
+    this._isProcessingRootDocs = false;
+  }
+  async processCredential(credential) {
+    if (!checkCredentialType(credential, "dxos.halo.credentials.Epoch")) {
+      return;
+    }
+    this.lastEpoch = credential;
+    if (credential.subject.assertion.automergeRoot) {
+      this.rootUrl = credential.subject.assertion.automergeRoot;
+      if (this._isProcessingRootDocs) {
+        this._onNewRoot(this.rootUrl);
+      }
+    }
+    this.onNewEpoch.emit(credential);
+  }
+  startProcessingRootDocs() {
+    if (this._isProcessingRootDocs) {
+      return;
+    }
+    if (this.rootUrl) {
+      this._onNewRoot(this.rootUrl);
+    }
+    this._isProcessingRootDocs = true;
+  }
+  async ensureEpochInitialized() {
+    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
+  }
+};
+
+// packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts
+import { convertLegacyReferences, convertLegacySpaceRootDoc, findInlineObjectOfType, migrateDocument } from "@dxos/echo-db";
+import { SpaceDocVersion } from "@dxos/echo-protocol";
+import { TYPE_PROPERTIES } from "@dxos/echo-schema";
+import { invariant as invariant12 } from "@dxos/invariant";
+import { log as log14 } from "@dxos/log";
+import { CreateEpochRequest } from "@dxos/protocols/proto/dxos/client/services";
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
+var LOAD_DOC_TIMEOUT = 1e4;
+var runEpochMigration = async (ctx, context) => {
+  switch (context.migration) {
+    case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+      const document = context.echoHost.createDoc();
+      await context.echoHost.flush();
+      return {
+        newRoot: document.url
+      };
+    }
+    case CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY: {
+      if (!context.currentRoot) {
+        throw new Error("Space does not have an automerge root");
+      }
+      const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
+      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
+      await context.echoHost.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
+      log14.info("Fragmenting", void 0, {
+        F: __dxlog_file17,
+        L: 64,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      const currentRootUrl = context.currentRoot;
       const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
         timeout: LOAD_DOC_TIMEOUT
       });
@@ -3838,7 +4003,7 @@ var runEpochMigration = async (ctx, context) => {
       const properties = findInlineObjectOfType(rootHandle.docSync(), TYPE_PROPERTIES);
       const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
       invariant12(properties, "Properties not found", {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 75,
         S: void 0,
         A: [
@@ -3853,7 +4018,7 @@ var runEpochMigration = async (ctx, context) => {
         ])
       });
       invariant12(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 82,
         S: void 0,
         A: [
@@ -3894,7 +4059,7 @@ var runEpochMigration = async (ctx, context) => {
         timeout: LOAD_DOC_TIMEOUT
       });
       invariant12(rootHandle.docSync(), "Root doc not found", {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 115,
         S: void 0,
         A: [
@@ -3909,7 +4074,7 @@ var runEpochMigration = async (ctx, context) => {
             timeout: LOAD_DOC_TIMEOUT
           });
           invariant12(handle.docSync(), void 0, {
-            F: __dxlog_file16,
+            F: __dxlog_file17,
             L: 122,
             S: void 0,
             A: [
@@ -3924,12 +4089,12 @@ var runEpochMigration = async (ctx, context) => {
           });
           newRootContent.links[id] = newHandle.url;
         } catch (err) {
-          log13.warn("Failed to migrate reference", {
+          log14.warn("Failed to migrate reference", {
             id,
             url,
             error: err
           }, {
-            F: __dxlog_file16,
+            F: __dxlog_file17,
             L: 128,
             S: void 0,
             C: (f, a) => f(...a)
@@ -3948,7 +4113,7 @@ var runEpochMigration = async (ctx, context) => {
     }
     case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       invariant12(context.newAutomergeRoot, void 0, {
-        F: __dxlog_file16,
+        F: __dxlog_file17,
         L: 143,
         S: void 0,
         A: [
@@ -3966,15 +4131,15 @@ var runEpochMigration = async (ctx, context) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-import { DeferredTask, Event as Event5, scheduleTask as scheduleTask4, sleep as sleep2, TimeoutError as TimeoutError3, Trigger as Trigger7 } from "@dxos/async";
+import { DeferredTask, Event as Event5, scheduleTask as scheduleTask4, sleep as sleep2, TimeoutError as TimeoutError3, Trigger as Trigger8 } from "@dxos/async";
 import { Context as Context7, rejectOnDispose } from "@dxos/context";
 import { invariant as invariant13 } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
-import { log as log14 } from "@dxos/log";
+import { log as log15 } 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_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+var __dxlog_file18 = "/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;
@@ -3982,7 +4147,7 @@ var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
     this._ctx = new Context7(void 0, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 62
     });
     this._extensionOpened = new Event5();
@@ -4002,16 +4167,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 }) {
-    log14("notarize", {
+    log15("notarize", {
       credentials
     }, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant13(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 91,
       S: this,
       A: [
@@ -4019,13 +4184,13 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new Trigger7();
+    const errors = new Trigger8();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        log14.warn("Notarization error", {
+        log15.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -4037,11 +4202,11 @@ var NotarizationPlugin = class {
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
       scheduleTask4(ctx, () => {
-        log14.warn("Notarization timeout", {
+        log15.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 111,
           S: this,
           C: (f, a) => f(...a)
@@ -4061,10 +4226,10 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          log14.info("Exhausted all peers to notarize with", {
+          log15.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file17,
+            F: __dxlog_file18,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
@@ -4074,11 +4239,11 @@ var NotarizationPlugin = class {
           return;
         }
         peersTried.add(peer);
-        log14("try notarizing", {
+        log15("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -4086,8 +4251,8 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        log14("success", void 0, {
-          F: __dxlog_file17,
+        log15("success", void 0, {
+          F: __dxlog_file18,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
@@ -4095,8 +4260,8 @@ var NotarizationPlugin = class {
         await sleep2(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          log14.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file17,
+          log15.info("error notarizing (recoverable)", err, {
+            F: __dxlog_file18,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -4113,8 +4278,8 @@ var NotarizationPlugin = class {
         allNotarized,
         errors.wait()
       ]);
-      log14("done", void 0, {
-        F: __dxlog_file17,
+      log15("done", void 0, {
+        F: __dxlog_file18,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -4136,7 +4301,7 @@ var NotarizationPlugin = class {
   }
   setWriter(writer) {
     invariant13(!this._writer, "Writer already set.", {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 181,
       S: this,
       A: [
@@ -4150,7 +4315,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger7()).value.wait();
+    await entry(this._processCredentialsTriggers, id).orInsert(new Trigger8()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -4161,7 +4326,7 @@ var NotarizationPlugin = class {
     }
     for (const credential of request.credentials ?? []) {
       invariant13(credential.id, "Credential must have an id", {
-        F: __dxlog_file17,
+        F: __dxlog_file18,
         L: 200,
         S: this,
         A: [
@@ -4178,10 +4343,10 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        log14("extension opened", {
+        log15("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -4190,10 +4355,10 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        log14("extension closed", {
+        log15("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -4237,7 +4402,7 @@ var NotarizationTeleportExtension = class extends RpcExtension3 {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-function _ts_decorate4(decorators, target, key, desc) {
+function _ts_decorate5(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);
@@ -4310,11 +4475,11 @@ function _using_ctx() {
     }
   };
 }
-var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
     this._ctx = new Context8(void 0, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 84
     });
     this._notarizationPlugin = new NotarizationPlugin();
@@ -4322,10 +4487,10 @@ var DataSpace = class {
     // TODO(dmaretskyi): Move into Space?
     this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
     this._epochProcessingMutex = new Mutex2();
-    this._state = SpaceState2.CLOSED;
+    this._state = SpaceState2.SPACE_CLOSED;
     this._databaseRoot = null;
     /**
-    * Error for _state === SpaceState.ERROR.
+    * Error for _state === SpaceState.SPACE_ERROR.
     */
     this.error = void 0;
     this.stateUpdate = new Event6();
@@ -4347,10 +4512,10 @@ var DataSpace = class {
     });
     this._cache = params.cache;
     this._state = params.initialState;
-    log15("new state", {
+    log16("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 146,
       S: this,
       C: (f, a) => f(...a)
@@ -4394,7 +4559,7 @@ var DataSpace = class {
     };
   }
   async open() {
-    if (this._state === SpaceState2.CLOSED) {
+    if (this._state === SpaceState2.SPACE_CLOSED) {
       await this._open();
     }
   }
@@ -4406,14 +4571,14 @@ var DataSpace = class {
     await this._automergeSpaceState.open();
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
     await this._inner.open(new Context8(void 0, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 215
     }));
-    this._state = SpaceState2.CONTROL_ONLY;
-    log15("new state", {
+    this._state = SpaceState2.SPACE_CONTROL_ONLY;
+    log16("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 217,
       S: this,
       C: (f, a) => f(...a)
@@ -4427,18 +4592,18 @@ var DataSpace = class {
   }
   async _close() {
     await this._callbacks.beforeClose?.();
-    this._state = SpaceState2.CLOSED;
-    log15("new state", {
+    this._state = SpaceState2.SPACE_CLOSED;
+    log16("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new Context8(void 0, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 233
     });
     await this.authVerifier.close();
@@ -4466,25 +4631,25 @@ var DataSpace = class {
         await this.initializeDataPipeline();
       } catch (err) {
         if (err instanceof CancelledError || err instanceof ContextDisposedError3) {
-          log15("data pipeline initialization cancelled", err, {
-            F: __dxlog_file18,
+          log16("data pipeline initialization cancelled", err, {
+            F: __dxlog_file19,
             L: 265,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
-        log15.error("Error initializing data pipeline", err, {
-          F: __dxlog_file18,
+        log16.error("Error initializing data pipeline", err, {
+          F: __dxlog_file19,
           L: 269,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._state = SpaceState2.ERROR;
-        log15("new state", {
+        this._state = SpaceState2.SPACE_ERROR;
+        log16("new state", {
           state: SpaceState2[this._state]
         }, {
-          F: __dxlog_file18,
+          F: __dxlog_file19,
           L: 271,
           S: this,
           C: (f, a) => f(...a)
@@ -4497,31 +4662,31 @@ var DataSpace = class {
     });
   }
   async initializeDataPipeline() {
-    if (this._state !== SpaceState2.CONTROL_ONLY) {
+    if (this._state !== SpaceState2.SPACE_CONTROL_ONLY) {
       throw new SystemError("Invalid operation");
     }
-    this._state = SpaceState2.INITIALIZING;
-    log15("new state", {
+    this._state = SpaceState2.SPACE_INITIALIZING;
+    log16("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 287,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
     await sleep3(1);
-    const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState2.READY);
+    const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState2.SPACE_READY);
     this._automergeSpaceState.startProcessingRootDocs();
     await ready;
   }
   async _enterReadyState() {
     await this._callbacks.beforeReady?.();
-    this._state = SpaceState2.READY;
-    log15("new state", {
+    this._state = SpaceState2.SPACE_READY;
+    log16("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 306,
       S: this,
       C: (f, a) => f(...a)
@@ -4536,8 +4701,8 @@ var DataSpace = class {
     });
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
-    log15("writable feeds created", void 0, {
-      F: __dxlog_file18,
+    log16("writable feeds created", void 0, {
+      F: __dxlog_file19,
       L: 322,
       S: this,
       C: (f, a) => f(...a)
@@ -4596,11 +4761,11 @@ var DataSpace = class {
     }
   }
   _onNewAutomergeRoot(rootUrl) {
-    log15("loading automerge root doc for space", {
+    log16("loading automerge root doc for space", {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file18,
+      F: __dxlog_file19,
       L: 388,
       S: this,
       C: (f, a) => f(...a)
@@ -4628,17 +4793,15 @@ var DataSpace = class {
               };
             });
           }
-          const root = await this._echoHost.openSpaceRoot(handle.url);
+          const root = await this._echoHost.openSpaceRoot(this.id, handle.url);
           this._databaseRoot = root;
           if (root.getVersion() !== SpaceDocVersion2.CURRENT) {
-            if (this._state !== SpaceState2.REQUIRES_MIGRATION) {
-              this._state = SpaceState2.REQUIRES_MIGRATION;
-              this.stateUpdate.emit();
-            }
+            this._state = SpaceState2.SPACE_REQUIRES_MIGRATION;
+            this.stateUpdate.emit();
+          } else if (this._state !== SpaceState2.SPACE_READY) {
+            await this._enterReadyState();
           } else {
-            if (this._state !== SpaceState2.READY) {
-              await this._enterReadyState();
-            }
+            this.stateUpdate.emit();
           }
         } catch (_) {
           _usingCtx.e = _;
@@ -4649,13 +4812,13 @@ var DataSpace = class {
         if (err instanceof ContextDisposedError3) {
           return;
         }
-        log15.warn("error loading automerge root doc", {
+        log16.warn("error loading automerge root doc", {
           space: this.key,
           rootUrl,
           err
         }, {
-          F: __dxlog_file18,
-          L: 433,
+          F: __dxlog_file19,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4708,91 +4871,95 @@ var DataSpace = class {
         credential
       }
     });
-    await this.inner.controlPipeline.state.waitUntilTimeframe(new Timeframe3([
+    const timeframe = new Timeframe3([
       [
         receipt.feedKey,
         receipt.seq
       ]
-    ]));
+    ]);
+    await this.inner.controlPipeline.state.waitUntilTimeframe(timeframe);
     await this._echoHost.updateIndexes();
-    return credential;
+    return {
+      credential,
+      timeframe
+    };
   }
   async activate() {
     if (![
-      SpaceState2.CLOSED,
-      SpaceState2.INACTIVE
+      SpaceState2.SPACE_CLOSED,
+      SpaceState2.SPACE_INACTIVE
     ].includes(this._state)) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, SpaceState2.ACTIVE);
+    await this._metadataStore.setSpaceState(this.key, SpaceState2.SPACE_ACTIVE);
     await this._open();
     this.initializeDataPipelineAsync();
   }
   async deactivate() {
-    if (this._state === SpaceState2.INACTIVE) {
+    if (this._state === SpaceState2.SPACE_INACTIVE) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, SpaceState2.INACTIVE);
-    if (this._state !== SpaceState2.CLOSED) {
+    await this._metadataStore.setSpaceState(this.key, SpaceState2.SPACE_INACTIVE);
+    if (this._state !== SpaceState2.SPACE_CLOSED) {
       await this._close();
     }
-    this._state = SpaceState2.INACTIVE;
-    log15("new state", {
+    this._state = SpaceState2.SPACE_INACTIVE;
+    log16("new state", {
       state: SpaceState2[this._state]
     }, {
-      F: __dxlog_file18,
-      L: 514,
+      F: __dxlog_file19,
+      L: 513,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
   }
 };
-_ts_decorate4([
+_ts_decorate5([
   trace6.info()
 ], DataSpace.prototype, "_inner", void 0);
-_ts_decorate4([
+_ts_decorate5([
   trace6.info()
 ], DataSpace.prototype, "id", null);
-_ts_decorate4([
+_ts_decorate5([
   trace6.info()
 ], DataSpace.prototype, "key", null);
-_ts_decorate4([
+_ts_decorate5([
   trace6.info({
     enum: SpaceState2
   })
 ], DataSpace.prototype, "state", null);
-_ts_decorate4([
+_ts_decorate5([
   trace6.info({
     depth: null
   })
 ], DataSpace.prototype, "_automergeInfo", null);
-_ts_decorate4([
+_ts_decorate5([
   synchronized
 ], DataSpace.prototype, "open", null);
-_ts_decorate4([
+_ts_decorate5([
   synchronized
 ], DataSpace.prototype, "close", null);
-_ts_decorate4([
+_ts_decorate5([
   trace6.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "initializeDataPipeline", null);
-_ts_decorate4([
+_ts_decorate5([
   trace6.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "_initializeAndReadControlPipeline", null);
-_ts_decorate4([
+_ts_decorate5([
   timed(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
-_ts_decorate4([
+_ts_decorate5([
   synchronized
 ], DataSpace.prototype, "activate", null);
-_ts_decorate4([
+_ts_decorate5([
   synchronized
 ], DataSpace.prototype, "deactivate", null);
-DataSpace = _ts_decorate4([
+DataSpace = _ts_decorate5([
   trackLeaks("open", "close"),
   trace6.resource()
 ], DataSpace);
@@ -4810,7 +4977,7 @@ import { TYPE_PROPERTIES as TYPE_PROPERTIES2, generateEchoId, getTypeReference }
 import { writeMessages as writeMessages3 } from "@dxos/feed-store";
 import { invariant as invariant14 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
-import { log as log16 } from "@dxos/log";
+import { log as log17 } from "@dxos/log";
 import { trace as Trace2, AlreadyJoinedError as AlreadyJoinedError3 } from "@dxos/protocols";
 import { Invitation as Invitation7, SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember6 } from "@dxos/protocols/proto/dxos/halo/credentials";
@@ -4889,7 +5056,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-function _ts_decorate5(decorators, target, key, desc) {
+function _ts_decorate6(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);
@@ -4899,7 +5066,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_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
+var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DEFAULT_SPACE_KEY = "__DEFAULT__";
@@ -4914,7 +5081,7 @@ var DataSpaceManager = class {
     this._invitationsManager = _invitationsManager;
     this._params = _params;
     this._ctx = new Context9(void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 104
     });
     this.updated = new Event7();
@@ -4949,45 +5116,45 @@ var DataSpaceManager = class {
     return this._spaces;
   }
   async open() {
-    log16("open", void 0, {
-      F: __dxlog_file19,
+    log17("open", void 0, {
+      F: __dxlog_file20,
       L: 156,
       S: this,
       C: (f, a) => f(...a)
     });
-    log16.trace("dxos.echo.data-space-manager.open", Trace2.begin({
+    log17.trace("dxos.echo.data-space-manager.open", Trace2.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
-    log16("metadata loaded", {
+    log17("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 158,
       S: this,
       C: (f, a) => f(...a)
     });
     await forEachAsync(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
-        log16("load space", {
+        log17("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file19,
+          F: __dxlog_file20,
           L: 162,
           S: this,
           C: (f, a) => f(...a)
         });
         await this._constructSpace(spaceMetadata);
       } catch (err) {
-        log16.error("Error loading space", {
+        log17.error("Error loading space", {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file19,
+          F: __dxlog_file20,
           L: 165,
           S: this,
           C: (f, a) => f(...a)
@@ -4996,18 +5163,18 @@ var DataSpaceManager = class {
     });
     this._isOpen = true;
     this.updated.emit();
-    log16.trace("dxos.echo.data-space-manager.open", Trace2.end({
+    log17.trace("dxos.echo.data-space-manager.open", Trace2.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async close() {
-    log16("close", void 0, {
-      F: __dxlog_file19,
+    log17("close", void 0, {
+      F: __dxlog_file20,
       L: 177,
       S: this,
       C: (f, a) => f(...a)
@@ -5024,7 +5191,7 @@ var DataSpaceManager = class {
   */
   async createSpace() {
     invariant14(this._isOpen, "Not open.", {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 191,
       S: this,
       A: [
@@ -5040,12 +5207,12 @@ var DataSpaceManager = class {
       genesisFeedKey: controlFeedKey,
       controlFeedKey,
       dataFeedKey,
-      state: SpaceState3.ACTIVE
+      state: SpaceState3.SPACE_ACTIVE
     };
-    log16("creating space...", {
+    log17("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 203,
       S: this,
       C: (f, a) => f(...a)
@@ -5057,7 +5224,7 @@ var DataSpaceManager = class {
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     invariant14(getCredentialAssertion3(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 213,
       S: this,
       A: [
@@ -5085,11 +5252,11 @@ var DataSpaceManager = class {
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       default:
-        log16.warn("unknown space version", {
+        log17.warn("unknown space version", {
           version: space.databaseRoot.getVersion(),
           spaceId: space.id
         }, {
-          F: __dxlog_file19,
+          F: __dxlog_file20,
           L: 238,
           S: this,
           C: (f, a) => f(...a)
@@ -5124,7 +5291,7 @@ var DataSpaceManager = class {
   async _getSpaceRootDocument(space) {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant14(automergeIndex, void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 271,
       S: this,
       A: [
@@ -5138,16 +5305,16 @@ var DataSpaceManager = class {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    log16("accept space", {
+    log17("accept space", {
       opts
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 280,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant14(this._isOpen, "Not open.", {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 281,
       S: this,
       A: [
@@ -5156,7 +5323,7 @@ var DataSpaceManager = class {
       ]
     });
     invariant14(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 282,
       S: this,
       A: [
@@ -5180,7 +5347,7 @@ var DataSpaceManager = class {
   async admitMember(options) {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     invariant14(space, void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 302,
       S: this,
       A: [
@@ -5193,7 +5360,7 @@ var DataSpaceManager = class {
     }
     const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
     invariant14(credentials[0].credential, void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 321,
       S: this,
       A: [
@@ -5203,7 +5370,7 @@ var DataSpaceManager = class {
     });
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant14(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 323,
       S: this,
       A: [
@@ -5222,7 +5389,7 @@ var DataSpaceManager = class {
   async waitUntilSpaceReady(spaceKey) {
     await cancelWithContext5(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
-      return !!space && space.state === SpaceState3.READY;
+      return !!space && space.state === SpaceState3.SPACE_READY;
     }));
   }
   async requestSpaceAdmissionCredential(spaceKey) {
@@ -5238,10 +5405,10 @@ var DataSpaceManager = class {
     });
   }
   async _constructSpace(metadata) {
-    log16("construct space", {
+    log17("construct space", {
       metadata
     }, {
-      F: __dxlog_file19,
+      F: __dxlog_file20,
       L: 358,
       S: this,
       C: (f, a) => f(...a)
@@ -5269,25 +5436,43 @@ var DataSpaceManager = class {
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
         credentialAuthenticator: deferFunction2(() => dataSpace.authVerifier.verifier)
       },
-      onAuthorizedConnection: (session) => {
-        session.addExtension("dxos.mesh.teleport.admission-discovery", new CredentialServerExtension(space));
-        session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
-          remotePeerId: session.remotePeerId
-        }));
-        session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
-        this._echoHost.authorizeDevice(space.key, session.remotePeerId);
-        session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
-      },
+      onAuthorizedConnection: (session) => queueMicrotask(async () => {
+        try {
+          if (!session.isOpen) {
+            return;
+          }
+          session.addExtension("dxos.mesh.teleport.admission-discovery", new CredentialServerExtension(space));
+          session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
+            remotePeerId: session.remotePeerId
+          }));
+          session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
+          await this._echoHost.authorizeDevice(space.key, session.remotePeerId);
+          if (!session.isOpen) {
+            return;
+          }
+          session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
+        } catch (err) {
+          log17.warn("error on authorized connection", {
+            err
+          }, {
+            F: __dxlog_file20,
+            L: 403,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await session.close(err);
+        }
+      }),
       onAuthFailure: () => {
-        log16.warn("auth failure", void 0, {
-          F: __dxlog_file19,
-          L: 396,
+        log17.warn("auth failure", void 0, {
+          F: __dxlog_file20,
+          L: 408,
           S: this,
           C: (f, a) => f(...a)
         });
       },
       onMemberRolesChanged: async (members) => {
-        if (dataSpace?.state === SpaceState3.READY) {
+        if (dataSpace?.state === SpaceState3.SPACE_READY) {
           this._handleMemberRoleChanges(presence, space.protocol, members);
         }
       },
@@ -5300,7 +5485,7 @@ var DataSpaceManager = class {
     dataFeed && await space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
-      initialState: metadata.state === SpaceState3.INACTIVE ? SpaceState3.INACTIVE : SpaceState3.CLOSED,
+      initialState: metadata.state === SpaceState3.SPACE_INACTIVE ? SpaceState3.SPACE_INACTIVE : SpaceState3.SPACE_CLOSED,
       metadataStore: this._metadataStore,
       gossip,
       presence,
@@ -5310,22 +5495,22 @@ var DataSpaceManager = class {
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
-          log16("before space ready", {
+          log17("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file19,
-            L: 423,
+            F: __dxlog_file20,
+            L: 435,
             S: this,
             C: (f, a) => f(...a)
           });
         },
         afterReady: async () => {
-          log16("after space ready", {
+          log17("after space ready", {
             space: space.key,
             open: this._isOpen
           }, {
-            F: __dxlog_file19,
-            L: 426,
+            F: __dxlog_file20,
+            L: 438,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5340,11 +5525,11 @@ var DataSpaceManager = class {
           }
         },
         beforeClose: async () => {
-          log16("before space close", {
+          log17("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file19,
-            L: 434,
+            F: __dxlog_file20,
+            L: 446,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5353,7 +5538,7 @@ var DataSpaceManager = class {
       cache: metadata.cache
     });
     presence.newPeer.on((peerState) => {
-      if (dataSpace.state === SpaceState3.READY) {
+      if (dataSpace.state === SpaceState3.SPACE_READY) {
         this._handleNewPeerConnected(space, peerState);
       }
     });
@@ -5375,17 +5560,17 @@ var DataSpaceManager = class {
         return (s && member.role === SpaceMember6.Role.REMOVED !== (s.authStatus === AuthStatus.FAILURE)) ?? false;
       });
       sessionsToClose.forEach((session) => {
-        void session.close().catch(log16.error);
+        void session.close().catch(log17.error);
       });
       closedSessions += sessionsToClose.length;
     }
-    log16("processed member role changes", {
+    log17("processed member role changes", {
       roleChangeCount: memberInfo.length,
       peersOnline: presence.getPeersOnline().length,
       closedSessions
     }, {
-      F: __dxlog_file19,
-      L: 470,
+      F: __dxlog_file20,
+      L: 482,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5396,20 +5581,20 @@ var DataSpaceManager = class {
     if (role === SpaceMember6.Role.REMOVED) {
       const session = peerState.peerId && space.protocol.sessions.get(peerState.peerId);
       if (session != null) {
-        log16("closing a session with a removed peer", {
+        log17("closing a session with a removed peer", {
           peerId: peerState.peerId
         }, {
-          F: __dxlog_file19,
-          L: 484,
+          F: __dxlog_file20,
+          L: 496,
           S: this,
           C: (f, a) => f(...a)
         });
-        void session.close().catch(log16.error);
+        void session.close().catch(log17.error);
       }
     }
   }
   async _handleInvitationStatusChange(dataSpace, delegatedInvitation, isActive) {
-    if (dataSpace?.state !== SpaceState3.READY) {
+    if (dataSpace?.state !== SpaceState3.SPACE_READY) {
       return;
     }
     if (isActive) {
@@ -5444,19 +5629,19 @@ var DataSpaceManager = class {
     await Promise.all(tasks);
   }
 };
-_ts_decorate5([
+_ts_decorate6([
   synchronized2
 ], DataSpaceManager.prototype, "open", null);
-_ts_decorate5([
+_ts_decorate6([
   synchronized2
 ], DataSpaceManager.prototype, "close", null);
-_ts_decorate5([
+_ts_decorate6([
   synchronized2
 ], DataSpaceManager.prototype, "createSpace", null);
-_ts_decorate5([
+_ts_decorate6([
   synchronized2
 ], DataSpaceManager.prototype, "acceptSpace", null);
-DataSpaceManager = _ts_decorate5([
+DataSpaceManager = _ts_decorate6([
   trackLeaks2("open", "close")
 ], DataSpaceManager);
 
@@ -5467,11 +5652,11 @@ import { createAdmissionCredentials as createAdmissionCredentials2, getCredentia
 import { raise as raise2 } from "@dxos/debug";
 import { writeMessages as writeMessages4 } from "@dxos/feed-store";
 import { invariant as invariant15 } from "@dxos/invariant";
-import { log as log17 } from "@dxos/log";
+import { log as log18 } from "@dxos/log";
 import { ApiError, SpaceNotFoundError as SpaceNotFoundError2, encodeError, IdentityNotInitializedError, AuthorizationError as AuthorizationError2 } from "@dxos/protocols";
 import { SpaceMember as SpaceMember7, SpaceState as SpaceState4 } from "@dxos/protocols/proto/dxos/client/services";
 import { trace as trace8 } from "@dxos/tracing";
-var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file21 = "/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;
@@ -5490,10 +5675,10 @@ var SpacesServiceImpl = class {
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise2(new SpaceNotFoundError2(spaceKey));
     if (state) {
       switch (state) {
-        case SpaceState4.ACTIVE:
+        case SpaceState4.SPACE_ACTIVE:
           await space.activate();
           break;
-        case SpaceState4.INACTIVE:
+        case SpaceState4.SPACE_INACTIVE:
           await space.deactivate();
           break;
         default:
@@ -5515,7 +5700,7 @@ var SpacesServiceImpl = class {
     }
     const credentials = await createAdmissionCredentials2(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     invariant15(credentials[0].credential, void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 102,
       S: this,
       A: [
@@ -5525,7 +5710,7 @@ var SpacesServiceImpl = class {
     });
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant15(getCredentialAssertion4(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 104,
       S: this,
       A: [
@@ -5540,10 +5725,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));
-        log17("update", {
-          spaces
-        }, {
-          F: __dxlog_file20,
+        log18("update", () => ({
+          ids: spaces.map((space) => space.id)
+        }), {
+          F: __dxlog_file21,
           L: 115,
           S: this,
           C: (f, a) => f(...a)
@@ -5635,7 +5820,7 @@ var SpacesServiceImpl = class {
         });
       } else {
         invariant15(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file20,
+          F: __dxlog_file21,
           L: 213,
           S: this,
           A: [
@@ -5644,7 +5829,7 @@ var SpacesServiceImpl = class {
           ]
         });
         invariant15(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file20,
+          F: __dxlog_file21,
           L: 214,
           S: this,
           A: [
@@ -5654,7 +5839,7 @@ var SpacesServiceImpl = class {
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant15(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file20,
+          F: __dxlog_file21,
           L: 216,
           S: this,
           A: [
@@ -5677,12 +5862,13 @@ var SpacesServiceImpl = class {
   async createEpoch({ spaceKey, migration, automergeRootUrl }) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise2(new SpaceNotFoundError2(spaceKey));
-    const credential = await space.createEpoch({
+    const result = await space.createEpoch({
       migration,
       newAutomergeRoot: automergeRootUrl
     });
     return {
-      epochCredential: credential ?? void 0
+      epochCredential: result?.credential,
+      controlTimeframe: result?.timeframe
     };
   }
   async admitContact(request) {
@@ -5703,7 +5889,7 @@ var SpacesServiceImpl = class {
   async _joinByAdmission({ credential }) {
     const assertion = getCredentialAssertion4(credential);
     invariant15(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 250,
       S: this,
       A: [
@@ -5713,7 +5899,7 @@ var SpacesServiceImpl = class {
     });
     const myIdentity = this._identityManager.identity;
     invariant15(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
-      F: __dxlog_file20,
+      F: __dxlog_file21,
       L: 252,
       S: this,
       A: [
@@ -5789,7 +5975,7 @@ var SpacesServiceImpl = class {
     const dataSpaceManager = await this._getDataSpaceManager();
     const identity = this._identityManager.identity?.identityKey.truncate();
     if (identity) {
-      trace8.metrics.gauge("echo.space.count", dataSpaceManager.spaces.size, {
+      trace8.metrics.gauge("dxos.echo.space.count", dataSpaceManager.spaces.size, {
         tags: {
           identity
         }
@@ -5800,7 +5986,7 @@ var SpacesServiceImpl = class {
 var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-import { Trigger as Trigger8 } from "@dxos/async";
+import { Trigger as Trigger9 } from "@dxos/async";
 import { Context as Context10, Resource as Resource3 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion5 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
@@ -5810,13 +5996,13 @@ import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { invariant as invariant16 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey12 } from "@dxos/keys";
-import { log as log18 } from "@dxos/log";
+import { log as log19 } 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";
 import { safeInstanceof } from "@dxos/util";
-function _ts_decorate6(decorators, target, key, desc) {
+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);
@@ -5826,7 +6012,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_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource3 {
   constructor(storage, level, networkManager, signalManager, _runtimeParams) {
     super();
@@ -5835,7 +6021,7 @@ var ServiceContext = class extends Resource3 {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
-    this.initialized = new Trigger8();
+    this.initialized = new Trigger9();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = PublicKey12.random().toHex();
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
@@ -5869,16 +6055,16 @@ var ServiceContext = class extends Resource3 {
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    log18("opening...", void 0, {
-      F: __dxlog_file21,
+    log19("opening...", void 0, {
+      F: __dxlog_file22,
       L: 149,
       S: this,
       C: (f, a) => f(...a)
     });
-    log18.trace("dxos.sdk.service-context.open", trace9.begin({
+    log19.trace("dxos.sdk.service-context.open", trace9.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 150,
       S: this,
       C: (f, a) => f(...a)
@@ -5893,32 +6079,32 @@ var ServiceContext = class extends Resource3 {
       await this._initialize(ctx);
     }
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
-    log18("loaded persistent invitations", {
+    log19("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 163,
       S: this,
       C: (f, a) => f(...a)
     });
-    log18.trace("dxos.sdk.service-context.open", trace9.end({
+    log19.trace("dxos.sdk.service-context.open", trace9.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 165,
       S: this,
       C: (f, a) => f(...a)
     });
-    log18("opened", void 0, {
-      F: __dxlog_file21,
+    log19("opened", void 0, {
+      F: __dxlog_file22,
       L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    log18("closing...", void 0, {
-      F: __dxlog_file21,
+    log19("closing...", void 0, {
+      F: __dxlog_file22,
       L: 170,
       S: this,
       C: (f, a) => f(...a)
@@ -5934,8 +6120,8 @@ var ServiceContext = class extends Resource3 {
     await this.echoHost.close(ctx);
     await this.networkManager.close();
     await this.signalManager.close();
-    log18("closed", void 0, {
-      F: __dxlog_file21,
+    log19("closed", void 0, {
+      F: __dxlog_file22,
       L: 182,
       S: this,
       C: (f, a) => f(...a)
@@ -5944,7 +6130,7 @@ var ServiceContext = class extends Resource3 {
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
     await this._initialize(new Context10(void 0, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 187
     }));
     return identity;
@@ -5952,7 +6138,7 @@ var ServiceContext = class extends Resource3 {
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant16(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 193,
       S: this,
       A: [
@@ -5973,7 +6159,7 @@ var ServiceContext = class extends Resource3 {
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
     await this._initialize(new Context10(void 0, {
-      F: __dxlog_file21,
+      F: __dxlog_file22,
       L: 209
     }));
     return identity;
@@ -5986,8 +6172,8 @@ var ServiceContext = class extends Resource3 {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    log18("initializing spaces...", void 0, {
-      F: __dxlog_file21,
+    log19("initializing spaces...", void 0, {
+      F: __dxlog_file22,
       L: 224,
       S: this,
       C: (f, a) => f(...a)
@@ -6010,7 +6196,7 @@ var ServiceContext = class extends Resource3 {
     await this.dataSpaceManager.open();
     this._handlerFactories.set(Invitation8.Kind.SPACE, (invitation) => {
       invariant16(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file21,
+        F: __dxlog_file22,
         L: 249,
         S: this,
         A: [
@@ -6031,10 +6217,10 @@ var ServiceContext = class extends Resource3 {
           return;
         }
         if (!this.dataSpaceManager) {
-          log18("dataSpaceManager not initialized yet, ignoring space admission", {
+          log19("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file21,
+            F: __dxlog_file22,
             L: 265,
             S: this,
             C: (f, a) => f(...a)
@@ -6042,10 +6228,10 @@ var ServiceContext = class extends Resource3 {
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          log18("space already exists, ignoring space admission", {
+          log19("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file21,
+            F: __dxlog_file22,
             L: 269,
             S: this,
             C: (f, a) => f(...a)
@@ -6053,10 +6239,10 @@ var ServiceContext = class extends Resource3 {
           return;
         }
         try {
-          log18("accepting space recorded in halo", {
+          log19("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file21,
+            F: __dxlog_file22,
             L: 274,
             S: this,
             C: (f, a) => f(...a)
@@ -6066,8 +6252,8 @@ var ServiceContext = class extends Resource3 {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          log18.catch(err, void 0, {
-            F: __dxlog_file21,
+          log19.catch(err, void 0, {
+            F: __dxlog_file22,
             L: 280,
             S: this,
             C: (f, a) => f(...a)
@@ -6078,13 +6264,13 @@ var ServiceContext = class extends Resource3 {
     await identity.space.spaceState.addCredentialProcessor(this._deviceSpaceSync);
   }
 };
-_ts_decorate6([
+_ts_decorate7([
   Trace3.span()
 ], ServiceContext.prototype, "_open", null);
-_ts_decorate6([
+_ts_decorate7([
   Trace3.span()
 ], ServiceContext.prototype, "_initialize", null);
-ServiceContext = _ts_decorate6([
+ServiceContext = _ts_decorate7([
   safeInstanceof("dxos.client-services.ServiceContext"),
   Trace3.resource()
 ], ServiceContext);
@@ -6113,130 +6299,6 @@ var ServiceRegistry = class {
   }
 };
 
-// packages/sdk/client-services/src/packlets/locks/browser.ts
-import { asyncTimeout as asyncTimeout2, Trigger as Trigger9 } from "@dxos/async";
-import { RESOURCE_LOCK_TIMEOUT } from "@dxos/client-protocol";
-import { log as log19, logInfo } from "@dxos/log";
-function _ts_decorate7(decorators, target, key, desc) {
-  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-  if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
-    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_file22 = "/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 Trigger9();
-    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"
-    });
-    try {
-      log19("aquiring lock...", void 0, {
-        F: __dxlog_file22,
-        L: 42,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await asyncTimeout2(this._requestLock(), RESOURCE_LOCK_TIMEOUT);
-      log19("acquired lock", void 0, {
-        F: __dxlog_file22,
-        L: 44,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } catch {
-      log19("stealing lock...", void 0, {
-        F: __dxlog_file22,
-        L: 46,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._requestLock(true);
-      log19("stolen lock", void 0, {
-        F: __dxlog_file22,
-        L: 48,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  async release() {
-    this._releaseTrigger.wake();
-  }
-  _onMessage(event) {
-    if (event.data.message === "acquiring") {
-      this._releaseTrigger.wake();
-    }
-  }
-  async _requestLock(steal = false) {
-    log19("requesting lock...", {
-      steal
-    }, {
-      F: __dxlog_file22,
-      L: 63,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    const acquired = new Trigger9();
-    void navigator.locks.request(this._lockKey, {
-      steal
-    }, async () => {
-      await this._onAcquire?.();
-      acquired.wake();
-      this._releaseTrigger = new Trigger9();
-      await this._releaseTrigger.wait();
-      log19("releasing lock...", void 0, {
-        F: __dxlog_file22,
-        L: 72,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      await this._onRelease?.();
-      log19("released lock", void 0, {
-        F: __dxlog_file22,
-        L: 74,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    }).catch(async () => {
-      await this._onRelease?.();
-    });
-    await acquired.wait();
-    log19("recieved lock", {
-      steal
-    }, {
-      F: __dxlog_file22,
-      L: 81,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
-};
-_ts_decorate7([
-  logInfo
-], Lock.prototype, "lockKey", null);
-var isLocked = (lockPath) => {
-  throw new Error("Not implemented");
-};
-
 // packages/sdk/client-services/src/packlets/storage/storage.ts
 import { InvalidConfigError } from "@dxos/protocols";
 import { Runtime as Runtime2 } from "@dxos/protocols/proto/dxos/config";
@@ -6475,7 +6537,7 @@ import { Event as Event9, synchronized as synchronized3 } from "@dxos/async";
 import { clientServiceBundle } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
 import { invariant as invariant19 } from "@dxos/invariant";
-import { PublicKey as PublicKey17 } from "@dxos/keys";
+import { PublicKey as PublicKey16 } from "@dxos/keys";
 import { log as log22 } from "@dxos/log";
 import { WebsocketSignalManager } from "@dxos/messaging";
 import { SwarmNetworkManager, createSimplePeerTransportFactory } from "@dxos/network-manager";
@@ -6566,57 +6628,10 @@ var DevicesServiceImpl = class {
   }
 };
 
-// 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();
-  }
-  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
-    }, {
-      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)));
-  }
-};
-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/identity/contacts-service.ts
 import { EventSubscriptions as EventSubscriptions4, scheduleTask as scheduleTask7, UpdateScheduler as UpdateScheduler2 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf";
-import { PublicKey as PublicKey15 } from "@dxos/keys";
+import { PublicKey as PublicKey14 } from "@dxos/keys";
 import { ComplexMap as ComplexMap4, ComplexSet as ComplexSet6 } from "@dxos/util";
 var ContactsServiceImpl = class {
   constructor(_identityManager, _spaceManager, _dataSpaceManagerProvider) {
@@ -6657,7 +6672,7 @@ var ContactsServiceImpl = class {
         });
       }
       return acc;
-    }, new ComplexMap4(PublicKey15.hash));
+    }, new ComplexMap4(PublicKey14.hash));
     return {
       contacts: [
         ...contacts.values()
@@ -6665,7 +6680,7 @@ var ContactsServiceImpl = class {
     };
   }
   queryContacts() {
-    const subscribedSpaceKeySet = new ComplexSet6(PublicKey15.hash);
+    const subscribedSpaceKeySet = new ComplexSet6(PublicKey14.hash);
     return new Stream12(({ next, ctx }) => {
       const pushUpdateTask = new UpdateScheduler2(ctx, async () => {
         const contacts = await this.getContacts();
@@ -6699,7 +6714,7 @@ var ContactsServiceImpl = class {
 // packages/sdk/client-services/src/packlets/logging/logging-service.ts
 import { Event as Event8 } from "@dxos/async";
 import { Stream as Stream13 } from "@dxos/codec-protobuf";
-import { PublicKey as PublicKey16 } from "@dxos/keys";
+import { PublicKey as PublicKey15 } from "@dxos/keys";
 import { getContextFromEntry, log as log21 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
@@ -6707,7 +6722,7 @@ var LoggingServiceImpl = class {
   constructor() {
     this._logs = new Event8();
     this._started = Date.now();
-    this._sessionId = PublicKey16.random().toHex();
+    this._sessionId = PublicKey15.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
@@ -7079,7 +7094,7 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = PublicKey17.random().toHex();
+    const traceId = PublicKey16.random().toHex();
     log22.trace("dxos.client-services.host.open", trace10.begin({
       id: traceId
     }), {
@@ -7231,7 +7246,7 @@ var ClientServicesHost = class {
     });
   }
   async reset() {
-    const traceId = PublicKey17.random().toHex();
+    const traceId = PublicKey16.random().toHex();
     log22.trace("dxos.sdk.client-services-host.reset", trace10.begin({
       id: traceId
     }), {
@@ -7303,7 +7318,7 @@ export {
   createDiagnostics,
   createCollectDiagnosticsBroadcastSender,
   createCollectDiagnosticsBroadcastHandler,
-  ClientRpcServer,
+  DiagnosticsCollector,
   createAuthProvider,
   TrustedKeySetAuthVerifier,
   Identity,
@@ -7315,21 +7330,20 @@ export {
   InvitationsServiceImpl,
   SpaceInvitationProtocol,
   InvitationsManager,
+  Lock,
+  isLocked,
+  ClientRpcServer,
   DataSpace,
   DataSpaceManager,
   SpacesServiceImpl,
   ServiceContext,
   ServiceRegistry,
-  Lock,
-  isLocked,
   createStorageObjects,
   createLevel,
   encodeProfileArchive,
   decodeProfileArchive,
   exportProfileData,
   importProfileData,
-  ClientServicesHost,
-  ClientServicesProviderResource,
-  DiagnosticsCollector
+  ClientServicesHost
 };
-//# sourceMappingURL=chunk-XDR7UKWW.mjs.map
+//# sourceMappingURL=chunk-UR2AY5N5.mjs.map