@dxos/client-services 0.8.4-main.1da679c → 0.8.4-main.21d9917

package/dist/lib/node-esm/{chunk-MDSLKO5V.mjs → chunk-2ZEVKBWH.mjs}

@@ -1,4 +1,11 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
+import {
+  createCollectDiagnosticsBroadcastSender
+} from "./chunk-PKEGMOQ4.mjs";
+import {
+  __export,
+  __reExport
+} from "./chunk-2SZHAWBN.mjs";
 
 // src/packlets/devtools/feeds.ts
 import { SubscriptionList } from "@dxos/async";
@@ -274,25 +281,14 @@ var subscribeToMetadata = ({ context }) => new Stream5(({ next, ctx }) => {
 });
 
 // src/packlets/devtools/devtools.ts
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var DevtoolsHostEvents = class {
-  constructor() {
-    _define_property(this, "ready", new AsyncEvent());
-  }
+  ready = new AsyncEvent();
 };
 var DevtoolsServiceImpl = class {
+  params;
+  constructor(params) {
+    this.params = params;
+  }
   events(_request) {
     return new Stream6(({ next }) => {
       this.params.events.ready.on(() => {
@@ -395,10 +391,6 @@ var DevtoolsServiceImpl = class {
       context: this.params.context
     });
   }
-  constructor(params) {
-    _define_property(this, "params", void 0);
-    this.params = params;
-  }
 };
 
 // src/packlets/diagnostics/diagnostics.ts
@@ -411,7 +403,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // src/version.ts
-var DXOS_VERSION = "0.8.4-main.1da679c";
+var DXOS_VERSION = "0.8.4-main.21d9917";
 
 // src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -565,42 +557,15 @@ var getStorageDiagnostics = async () => {
   }));
 };
 
-// src/packlets/diagnostics/diagnostics-broadcast.ts
-var createCollectDiagnosticsBroadcastSender = () => {
-  return {
-    broadcastDiagnosticsRequest: async () => void 0
-  };
-};
-var createCollectDiagnosticsBroadcastHandler = (_) => {
-  return {
-    start: () => {
-    },
-    stop: () => {
-    }
-  };
-};
-
 // 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 { isNonNullable, jsonKeyReplacer } from "@dxos/util";
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var GET_DIAGNOSTICS_RPC_TIMEOUT = 1e4;
 var DiagnosticsCollector = class {
+  static 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
@@ -621,7 +586,6 @@ var DiagnosticsCollector = class {
     return JSON.parse(JSON.stringify(diagnostics, jsonKeyReplacer(options)));
   }
 };
-_define_property2(DiagnosticsCollector, "broadcastSender", createCollectDiagnosticsBroadcastSender());
 var findSystemServiceProvider = () => {
   const serviceProviders = TRACE_PROCESSOR2.findResourcesByAnnotation(ClientServicesProviderResource);
   const providerResource = serviceProviders.find((r) => r.instance.deref()?.services?.SystemService != null);
@@ -632,25 +596,21 @@ var findConfigs = () => {
   return configs.map((r) => r.instance.deref()).filter(isNonNullable);
 };
 
+// src/packlets/diagnostics/index.ts
+var diagnostics_exports = {};
+__export(diagnostics_exports, {
+  DiagnosticsCollector: () => DiagnosticsCollector,
+  createDiagnostics: () => createDiagnostics
+});
+__reExport(diagnostics_exports, diagnostics_broadcast_star);
+import * as diagnostics_broadcast_star from "#diagnostics-broadcast";
+
 // src/packlets/identity/authenticator.ts
 import { Trigger } from "@dxos/async";
 import { Context as Context2 } from "@dxos/context";
 import { verifyCredential } from "@dxos/credentials";
 import { log as log2 } from "@dxos/log";
 import { schema } from "@dxos/protocols/proto";
-function _define_property3(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file4 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
 var Credential = schema.getCodecForType("dxos.halo.credentials.Credential");
 var createAuthProvider = (signer) => async (nonce) => {
@@ -664,6 +624,14 @@ var createAuthProvider = (signer) => async (nonce) => {
   return Credential.encode(credential);
 };
 var TrustedKeySetAuthVerifier = class {
+  _params;
+  _ctx = new Context2(void 0, {
+    F: __dxlog_file4,
+    L: 45
+  });
+  constructor(_params) {
+    this._params = _params;
+  }
   async close() {
     await this._ctx.dispose();
   }
@@ -757,15 +725,6 @@ var TrustedKeySetAuthVerifier = class {
     const deviceSet = this._params.trustedKeysProvider();
     return deviceSet.has(deviceKey);
   }
-  constructor(_params) {
-    _define_property3(this, "_params", void 0);
-    _define_property3(this, "_ctx", void 0);
-    this._params = _params;
-    this._ctx = new Context2(void 0, {
-      F: __dxlog_file4,
-      L: 45
-    });
-  }
 };
 
 // src/packlets/spaces/edge-feed-replicator.ts
@@ -781,19 +740,6 @@ import { buf } from "@dxos/protocols/buf";
 import { MessageSchema as RouterMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 import { EdgeStatus } from "@dxos/protocols/proto/dxos/client/services";
 import { ComplexMap as ComplexMap2, arrayToBuffer, bufferToArray, defaultMap, rangeFromTo } from "@dxos/util";
-function _define_property4(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -867,6 +813,24 @@ function _ts_dispose_resources(env) {
 }
 var __dxlog_file5 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/edge-feed-replicator.ts";
 var EdgeFeedReplicator = class extends Resource {
+  _messenger;
+  _spaceId;
+  _feeds = new ComplexMap2(PublicKey3.hash);
+  _connectionCtx = void 0;
+  _connected = false;
+  /**
+  * Feed length at service.
+  */
+  _remoteLength = new ComplexMap2(PublicKey3.hash);
+  /**
+  * Protects against concurrent pushes so that remote length is updated consistently.
+  */
+  _pushMutex = new ComplexMap2(PublicKey3.hash);
+  constructor({ messenger, spaceId }) {
+    super();
+    this._messenger = messenger;
+    this._spaceId = spaceId;
+  }
   async _open() {
     log3("open", void 0, {
       F: __dxlog_file5,
@@ -914,7 +878,7 @@ var EdgeFeedReplicator = class extends Resource {
   }
   async _handleReconnect() {
     await this._resetConnection();
-    if (this._messenger.status === EdgeStatus.CONNECTED) {
+    if (this._messenger.status.state === EdgeStatus.ConnectionState.CONNECTED) {
       this._startReplication();
     }
   }
@@ -1263,17 +1227,6 @@ var EdgeFeedReplicator = class extends Resource {
     });
     return connectionCtx;
   }
-  constructor({ messenger, spaceId }) {
-    super(), _define_property4(this, "_messenger", void 0), _define_property4(this, "_spaceId", void 0), _define_property4(this, "_feeds", new ComplexMap2(PublicKey3.hash)), _define_property4(this, "_connectionCtx", void 0), _define_property4(this, "_connected", false), /**
-    * Feed length at service.
-    */
-    _define_property4(this, "_remoteLength", new ComplexMap2(PublicKey3.hash)), /**
-    * Protects against concurrent pushes so that remote length is updated consistently.
-    */
-    _define_property4(this, "_pushMutex", new ComplexMap2(PublicKey3.hash));
-    this._messenger = messenger;
-    this._spaceId = spaceId;
-  }
 };
 _ts_decorate([
   logInfo
@@ -1295,7 +1248,7 @@ import { Event as Event7, Mutex as Mutex2, scheduleTask as scheduleTask4, sleep
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
 import { Context as Context6, ContextDisposedError, cancelWithContext as cancelWithContext2 } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
-import { FIND_PARAMS as FIND_PARAMS2, createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
 import { failedInvariant as failedInvariant3, invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
@@ -1323,15 +1276,16 @@ import { ComplexSet } from "@dxos/util";
 // src/packlets/spaces/data-space-manager.ts
 import { interpretAsDocumentId } from "@automerge/automerge-repo";
 import { Event as Event2, synchronized, trackLeaks } from "@dxos/async";
-import { PropertiesType, TYPE_PROPERTIES } from "@dxos/client-protocol";
+import { SpaceProperties } from "@dxos/client-protocol";
 import { Context as Context4, LifecycleState, Resource as Resource2, cancelWithContext } from "@dxos/context";
 import { createAdmissionCredentials, getCredentialAssertion } from "@dxos/credentials";
-import { AuthStatus, CredentialServerExtension, DatabaseRoot, FIND_PARAMS, findInlineObjectOfType } from "@dxos/echo-pipeline";
-import { SpaceDocVersion, createIdFromSpaceKey, encodeReference } from "@dxos/echo-protocol";
-import { ObjectId, getTypeReference } from "@dxos/echo-schema";
+import { Type } from "@dxos/echo";
+import { getSchemaDXN } from "@dxos/echo/internal";
+import { AuthStatus, CredentialServerExtension, DatabaseRoot, findInlineObjectOfType } from "@dxos/echo-pipeline";
+import { EncodedReference, SpaceDocVersion, createIdFromSpaceKey } from "@dxos/echo-protocol";
 import { writeMessages } from "@dxos/feed-store";
 import { assertArgument, assertState, failedInvariant, invariant as invariant3 } from "@dxos/invariant";
-import { PublicKey as PublicKey4 } from "@dxos/keys";
+import { ObjectId, PublicKey as PublicKey4 } from "@dxos/keys";
 import { log as log4 } from "@dxos/log";
 import { AlreadyJoinedError, trace as Trace } from "@dxos/protocols";
 import { Invitation, SpaceState } from "@dxos/protocols/proto/dxos/client/services";
@@ -1412,19 +1366,6 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
 };
 
 // src/packlets/spaces/data-space-manager.ts
-function _define_property5(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -1436,6 +1377,64 @@ var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DEFAULT_SPACE_KEY = "__DEFAULT__";
 var DataSpaceManager = class extends Resource2 {
+  updated = new Event2();
+  _spaces = new ComplexMap3(PublicKey4.hash);
+  _instanceId = PublicKey4.random().toHex();
+  _spaceManager;
+  _metadataStore;
+  _keyring;
+  _signingContext;
+  _feedStore;
+  _echoHost;
+  _invitationsManager;
+  _edgeConnection = void 0;
+  _edgeHttpClient = void 0;
+  _edgeFeatures = void 0;
+  _meshReplicator = void 0;
+  _echoEdgeReplicator = void 0;
+  _runtimeProps = void 0;
+  constructor(params) {
+    super();
+    this._spaceManager = params.spaceManager;
+    this._metadataStore = params.metadataStore;
+    this._keyring = params.keyring;
+    this._signingContext = params.signingContext;
+    this._feedStore = params.feedStore;
+    this._echoHost = params.echoHost;
+    this._meshReplicator = params.meshReplicator;
+    this._invitationsManager = params.invitationsManager;
+    this._edgeConnection = params.edgeConnection;
+    this._edgeFeatures = params.edgeFeatures;
+    this._echoEdgeReplicator = params.echoEdgeReplicator;
+    this._edgeHttpClient = params.edgeHttpClient;
+    this._runtimeProps = params.runtimeProps;
+    trace.diagnostic({
+      id: "spaces",
+      name: "Spaces",
+      fetch: async () => {
+        return Promise.all(Array.from(this._spaces.values()).map(async (space) => {
+          const rootUrl = space.automergeSpaceState.rootUrl;
+          const rootHandle = rootUrl ? await this._echoHost.loadDoc(Context4.default(void 0, {
+            F: __dxlog_file6,
+            L: 187
+          }), rootUrl) : void 0;
+          await rootHandle?.whenReady();
+          const rootDoc = rootHandle?.doc();
+          const properties = rootDoc && findInlineObjectOfType(rootDoc, Type.getTypename(SpaceProperties));
+          return {
+            key: space.key.toHex(),
+            state: SpaceState[space.state],
+            name: properties?.[1].data.name ?? null,
+            inlineObjects: rootDoc ? Object.keys(rootDoc.objects ?? {}).length : null,
+            linkedObjects: rootDoc ? Object.keys(rootDoc.links ?? {}).length : null,
+            credentials: space.inner.spaceState.credentials.length,
+            members: space.inner.spaceState.members.size,
+            rootUrl
+          };
+        }));
+      }
+    });
+  }
   // TODO(burdon): Remove.
   get spaces() {
     return this._spaces;
@@ -1448,7 +1447,7 @@ var DataSpaceManager = class extends Resource2 {
   async _open() {
     log4("open", void 0, {
       F: __dxlog_file6,
-      L: 216,
+      L: 221,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1456,7 +1455,7 @@ var DataSpaceManager = class extends Resource2 {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 217,
+      L: 222,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1464,39 +1463,64 @@ var DataSpaceManager = class extends Resource2 {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file6,
-      L: 218,
+      L: 223,
       S: this,
       C: (f, a) => f(...a)
     });
+    const spacesToActivate = [];
     await forEachAsync(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
         log4("load space", {
           spaceMetadata
         }, {
           F: __dxlog_file6,
-          L: 222,
+          L: 228,
           S: this,
           C: (f, a) => f(...a)
         });
-        await this._constructSpace(spaceMetadata);
+        const space = await this._constructSpace(spaceMetadata);
+        if (this._runtimeProps?.autoActivateSpaces && spaceMetadata.state === SpaceState.SPACE_ACTIVE) {
+          spacesToActivate.push(space);
+        }
       } catch (err) {
         log4.error("Error loading space", {
           spaceMetadata,
           err
         }, {
           F: __dxlog_file6,
-          L: 225,
+          L: 235,
           S: this,
           C: (f, a) => f(...a)
         });
       }
     });
+    for (const space of spacesToActivate) {
+      log4("auto-activating space", {
+        spaceKey: space.key
+      }, {
+        F: __dxlog_file6,
+        L: 241,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      space.activate().catch((err) => {
+        log4.error("Error auto-activating space", {
+          spaceKey: space.key,
+          err
+        }, {
+          F: __dxlog_file6,
+          L: 243,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      });
+    }
     this.updated.emit();
     log4.trace("dxos.echo.data-space-manager.open", Trace.end({
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 231,
+      L: 249,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1504,7 +1528,7 @@ var DataSpaceManager = class extends Resource2 {
   async _close() {
     log4("close", void 0, {
       F: __dxlog_file6,
-      L: 236,
+      L: 254,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1535,7 +1559,7 @@ var DataSpaceManager = class extends Resource2 {
       spaceKey
     }, {
       F: __dxlog_file6,
-      L: 269,
+      L: 287,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1543,7 +1567,7 @@ var DataSpaceManager = class extends Resource2 {
     if (options.documents) {
       invariant3(Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId)), "Invalid document IDs", {
         F: __dxlog_file6,
-        L: 274,
+        L: 292,
         S: this,
         A: [
           "Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId))",
@@ -1555,13 +1579,18 @@ var DataSpaceManager = class extends Resource2 {
           documentId
         }, {
           F: __dxlog_file6,
-          L: 281,
+          L: 299,
           S: this,
           C: (f, a) => f(...a)
         });
         const newDoc = await this._echoHost.createDoc(data, {
           preserveHistory: true
         });
+        if (newDoc.doc().access !== void 0 && newDoc.doc().access.spaceKey !== spaceKey.toHex()) {
+          newDoc.change((doc) => {
+            doc.access.spaceKey = spaceKey.toHex();
+          });
+        }
         documentIdMapping[documentId] = newDoc.documentId;
       }));
     }
@@ -1569,7 +1598,7 @@ var DataSpaceManager = class extends Resource2 {
       spaceKey
     }, {
       F: __dxlog_file6,
-      L: 288,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1578,18 +1607,19 @@ var DataSpaceManager = class extends Resource2 {
       const newRootDocId = documentIdMapping[interpretAsDocumentId(options.rootUrl)] ?? failedInvariant();
       const rootDocHandle = await this._echoHost.loadDoc(Context4.default(void 0, {
         F: __dxlog_file6,
-        L: 293
+        L: 322
       }), newRootDocId);
       DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
       root = await this._echoHost.openSpaceRoot(spaceId, `automerge:${newRootDocId}`);
     } else {
       root = await this._echoHost.createSpaceRoot(spaceKey);
     }
+    await this._echoHost.flush();
     log4("constructing space...", {
       spaceKey
     }, {
       F: __dxlog_file6,
-      L: 301,
+      L: 331,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1599,7 +1629,7 @@ var DataSpaceManager = class extends Resource2 {
       spaceKey
     }, {
       F: __dxlog_file6,
-      L: 306,
+      L: 336,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1608,7 +1638,7 @@ var DataSpaceManager = class extends Resource2 {
     const memberCredential = credentials[1];
     invariant3(getCredentialAssertion(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file6,
-      L: 312,
+      L: 342,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -1622,7 +1652,7 @@ var DataSpaceManager = class extends Resource2 {
       spaceKey
     }, {
       F: __dxlog_file6,
-      L: 317,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1640,13 +1670,13 @@ var DataSpaceManager = class extends Resource2 {
             spaceId: space.id
           }, {
             F: __dxlog_file6,
-            L: 330,
+            L: 360,
             S: this,
             C: (f, a) => f(...a)
           });
           await space.databaseRoot.handle.whenReady();
         }
-        const [_, properties] = findInlineObjectOfType(space.databaseRoot.doc(), TYPE_PROPERTIES) ?? [];
+        const [_, properties] = findInlineObjectOfType(space.databaseRoot.doc(), Type.getTypename(SpaceProperties)) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       case SpaceDocVersion.LEGACY: {
@@ -1658,7 +1688,7 @@ var DataSpaceManager = class extends Resource2 {
           spaceId: space.id
         }, {
           F: __dxlog_file6,
-          L: 341,
+          L: 374,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1670,7 +1700,7 @@ var DataSpaceManager = class extends Resource2 {
     const document = await this._getSpaceRootDocument(space);
     const properties = {
       system: {
-        type: encodeReference(getTypeReference(PropertiesType))
+        type: EncodedReference.fromDXN(getSchemaDXN(SpaceProperties))
       },
       data: {
         [DEFAULT_SPACE_KEY]: this._signingContext.identityKey.toHex()
@@ -1693,14 +1723,19 @@ var DataSpaceManager = class extends Resource2 {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant3(automergeIndex, void 0, {
       F: __dxlog_file6,
-      L: 374,
+      L: 407,
       S: this,
       A: [
         "automergeIndex",
         ""
       ]
     });
-    const document = await this._echoHost.automergeRepo.find(automergeIndex, FIND_PARAMS);
+    const document = await this._echoHost.loadDoc(Context4.default(void 0, {
+      F: __dxlog_file6,
+      L: 408
+    }), automergeIndex, {
+      fetchFromNetwork: true
+    });
     await document.whenReady();
     return document;
   }
@@ -1710,13 +1745,13 @@ var DataSpaceManager = class extends Resource2 {
       opts
     }, {
       F: __dxlog_file6,
-      L: 383,
+      L: 418,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file6,
-      L: 384,
+      L: 419,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1725,7 +1760,7 @@ var DataSpaceManager = class extends Resource2 {
     });
     invariant3(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file6,
-      L: 385,
+      L: 420,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -1749,7 +1784,7 @@ var DataSpaceManager = class extends Resource2 {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     invariant3(space, void 0, {
       F: __dxlog_file6,
-      L: 405,
+      L: 440,
       S: this,
       A: [
         "space",
@@ -1762,7 +1797,7 @@ var DataSpaceManager = class extends Resource2 {
     const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
     invariant3(credentials[0].credential, void 0, {
       F: __dxlog_file6,
-      L: 424,
+      L: 459,
       S: this,
       A: [
         "credentials[0].credential",
@@ -1772,7 +1807,7 @@ var DataSpaceManager = class extends Resource2 {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant3(getCredentialAssertion(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file6,
-      L: 426,
+      L: 461,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -1810,7 +1845,7 @@ var DataSpaceManager = class extends Resource2 {
     const space = this._spaces.get(spaceKey);
     invariant3(space, "Space not found.", {
       F: __dxlog_file6,
-      L: 463,
+      L: 498,
       S: this,
       A: [
         "space",
@@ -1835,7 +1870,7 @@ var DataSpaceManager = class extends Resource2 {
       metadata
     }, {
       F: __dxlog_file6,
-      L: 482,
+      L: 517,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1843,8 +1878,8 @@ var DataSpaceManager = class extends Resource2 {
       localPeerId: this._signingContext.deviceKey
     });
     const presence = new Presence({
-      announceInterval: this._runtimeParams?.spaceMemberPresenceAnnounceInterval ?? PRESENCE_ANNOUNCE_INTERVAL,
-      offlineTimeout: this._runtimeParams?.spaceMemberPresenceOfflineTimeout ?? PRESENCE_OFFLINE_TIMEOUT,
+      announceInterval: this._runtimeProps?.spaceMemberPresenceAnnounceInterval ?? PRESENCE_ANNOUNCE_INTERVAL,
+      offlineTimeout: this._runtimeProps?.spaceMemberPresenceOfflineTimeout ?? PRESENCE_OFFLINE_TIMEOUT,
       identityKey: this._signingContext.identityKey,
       gossip
     });
@@ -1879,7 +1914,7 @@ var DataSpaceManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file6,
-            L: 524,
+            L: 559,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1889,7 +1924,7 @@ var DataSpaceManager = class extends Resource2 {
       onAuthFailure: () => {
         log4.warn("auth failure", void 0, {
           F: __dxlog_file6,
-          L: 529,
+          L: 564,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1922,7 +1957,7 @@ var DataSpaceManager = class extends Resource2 {
             space: space.key
           }, {
             F: __dxlog_file6,
-            L: 556,
+            L: 591,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1933,7 +1968,7 @@ var DataSpaceManager = class extends Resource2 {
             open: this._lifecycleState === LifecycleState.OPEN
           }, {
             F: __dxlog_file6,
-            L: 559,
+            L: 594,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1952,7 +1987,7 @@ var DataSpaceManager = class extends Resource2 {
             space: space.key
           }, {
             F: __dxlog_file6,
-            L: 567,
+            L: 602,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1962,7 +1997,7 @@ var DataSpaceManager = class extends Resource2 {
       edgeConnection: this._edgeConnection,
       edgeHttpClient: this._edgeHttpClient,
       edgeFeatures: this._edgeFeatures,
-      activeEdgeNotarizationPollingInterval: this._runtimeParams?.activeEdgeNotarizationPollingInterval
+      activeEdgeNotarizationPollingInterval: this._runtimeProps?.activeEdgeNotarizationPollingInterval
     });
     dataSpace.postOpen.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
@@ -1973,7 +2008,7 @@ var DataSpaceManager = class extends Resource2 {
           spaceId: dataSpace.id
         }, {
           F: __dxlog_file6,
-          L: 581,
+          L: 616,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2003,7 +2038,7 @@ var DataSpaceManager = class extends Resource2 {
         space: space.key
       }, {
         F: __dxlog_file6,
-        L: 608,
+        L: 643,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2036,7 +2071,7 @@ var DataSpaceManager = class extends Resource2 {
       closedSessions
     }, {
       F: __dxlog_file6,
-      L: 634,
+      L: 669,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2051,7 +2086,7 @@ var DataSpaceManager = class extends Resource2 {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file6,
-          L: 648,
+          L: 683,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2094,45 +2129,6 @@ var DataSpaceManager = class extends Resource2 {
     });
     await Promise.all(tasks);
   }
-  constructor(params) {
-    super(), _define_property5(this, "updated", new Event2()), _define_property5(this, "_spaces", new ComplexMap3(PublicKey4.hash)), _define_property5(this, "_instanceId", PublicKey4.random().toHex()), _define_property5(this, "_spaceManager", void 0), _define_property5(this, "_metadataStore", void 0), _define_property5(this, "_keyring", void 0), _define_property5(this, "_signingContext", void 0), _define_property5(this, "_feedStore", void 0), _define_property5(this, "_echoHost", void 0), _define_property5(this, "_invitationsManager", void 0), _define_property5(this, "_edgeConnection", void 0), _define_property5(this, "_edgeHttpClient", void 0), _define_property5(this, "_edgeFeatures", void 0), _define_property5(this, "_meshReplicator", void 0), _define_property5(this, "_echoEdgeReplicator", void 0), _define_property5(this, "_runtimeParams", void 0);
-    this._spaceManager = params.spaceManager;
-    this._metadataStore = params.metadataStore;
-    this._keyring = params.keyring;
-    this._signingContext = params.signingContext;
-    this._feedStore = params.feedStore;
-    this._echoHost = params.echoHost;
-    this._meshReplicator = params.meshReplicator;
-    this._invitationsManager = params.invitationsManager;
-    this._edgeConnection = params.edgeConnection;
-    this._edgeFeatures = params.edgeFeatures;
-    this._echoEdgeReplicator = params.echoEdgeReplicator;
-    this._edgeHttpClient = params.edgeHttpClient;
-    this._runtimeParams = params.runtimeParams;
-    trace.diagnostic({
-      id: "spaces",
-      name: "Spaces",
-      fetch: async () => {
-        return Promise.all(Array.from(this._spaces.values()).map(async (space) => {
-          const rootUrl = space.automergeSpaceState.rootUrl;
-          const rootHandle = rootUrl ? await this._echoHost.automergeRepo.find(rootUrl, FIND_PARAMS) : void 0;
-          await rootHandle?.whenReady();
-          const rootDoc = rootHandle?.doc();
-          const properties = rootDoc && findInlineObjectOfType(rootDoc, TYPE_PROPERTIES);
-          return {
-            key: space.key.toHex(),
-            state: SpaceState[space.state],
-            name: properties?.[1].data.name ?? null,
-            inlineObjects: rootDoc ? Object.keys(rootDoc.objects ?? {}).length : null,
-            linkedObjects: rootDoc ? Object.keys(rootDoc.links ?? {}).length : null,
-            credentials: space.inner.spaceState.credentials.length,
-            members: space.inner.spaceState.members.size,
-            rootUrl
-          };
-        }));
-      }
-    });
-  }
 };
 _ts_decorate2([
   synchronized
@@ -2167,21 +2163,13 @@ import { trace as trace2 } from "@dxos/tracing";
 import { Resource as Resource3 } from "@dxos/context";
 import { assertArgument as assertArgument2, assertState as assertState2 } from "@dxos/invariant";
 import { SpaceArchiveFileStructure, SpaceArchiveVersion } from "@dxos/protocols";
-function _define_property6(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { createFilename } from "@dxos/util";
 var CURRENT_VERSION = SpaceArchiveVersion.V1;
 var SpaceArchiveWriter = class extends Resource3 {
+  _tar;
+  _archive;
+  _meta = void 0;
+  _currentRootUrl = void 0;
   async _open(ctx) {
     this._tar = await import("@obsidize/tar-browserify");
   }
@@ -2208,6 +2196,7 @@ var SpaceArchiveWriter = class extends Resource3 {
   async finish() {
     assertState2(this._archive, "Not open");
     assertState2(this._meta, "Not started");
+    assertState2(this._meta.spaceId, "No space ID set");
     assertState2(this._currentRootUrl, "No root URL set");
     const metadata = {
       version: CURRENT_VERSION,
@@ -2221,13 +2210,15 @@ var SpaceArchiveWriter = class extends Resource3 {
     this._archive.addTextFile(SpaceArchiveFileStructure.metadata, JSON.stringify(metadata));
     const binary = this._archive.toUint8Array();
     return {
-      filename: `${this._meta.spaceId}.tar`,
+      filename: createFilename({
+        parts: [
+          this._meta.spaceId
+        ],
+        ext: "tar"
+      }),
       contents: binary
     };
   }
-  constructor(...args) {
-    super(...args), _define_property6(this, "_tar", void 0), _define_property6(this, "_archive", void 0), _define_property6(this, "_meta", void 0), _define_property6(this, "_currentRootUrl", void 0);
-  }
 };
 
 // src/packlets/space-export/space-archive-reader.ts
@@ -2255,7 +2246,7 @@ var extractSpaceArchive = async (archive) => {
     });
     documents[documentId] = entry2.content ?? failedInvariant2();
   }
-  log5.info("extracted space archive", {
+  log5("extracted space archive", {
     metadata,
     documents
   }, {
@@ -2271,19 +2262,6 @@ var extractSpaceArchive = async (archive) => {
 };
 
 // src/packlets/spaces/spaces-service.ts
-function _define_property7(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 function _ts_add_disposable_resource2(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
@@ -2351,6 +2329,14 @@ function _ts_dispose_resources2(env) {
 }
 var __dxlog_file8 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
+  _identityManager;
+  _spaceManager;
+  _getDataSpaceManager;
+  constructor(_identityManager, _spaceManager, _getDataSpaceManager) {
+    this._identityManager = _identityManager;
+    this._spaceManager = _spaceManager;
+    this._getDataSpaceManager = _getDataSpaceManager;
+  }
   async createSpace() {
     this._requireIdentity();
     const dataSpaceManager = await this._getDataSpaceManager();
@@ -2370,7 +2356,9 @@ var SpacesServiceImpl = class {
           await space.deactivate();
           break;
         default:
-          throw new ApiError("Invalid space state");
+          throw new ApiError({
+            message: "Invalid space state"
+          });
       }
     }
     if (edgeReplication !== void 0) {
@@ -2384,15 +2372,18 @@ var SpacesServiceImpl = class {
       throw new SpaceNotFoundError(request.spaceKey);
     }
     if (!space.spaceState.hasMembershipManagementPermission(identity.identityKey)) {
-      throw new AuthorizationError("No member management permission.", {
-        spaceKey: space.key,
-        role: space.spaceState.getMemberRole(identity.identityKey)
+      throw new AuthorizationError({
+        message: "No member management permission.",
+        context: {
+          spaceKey: space.key,
+          role: space.spaceState.getMemberRole(identity.identityKey)
+        }
       });
     }
     const credentials = await createAdmissionCredentials2(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     invariant5(credentials[0].credential, void 0, {
       F: __dxlog_file8,
-      L: 120,
+      L: 123,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2402,7 +2393,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant5(getCredentialAssertion2(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file8,
-      L: 122,
+      L: 125,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2420,7 +2411,7 @@ var SpacesServiceImpl = class {
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file8,
-          L: 135,
+          L: 138,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2512,7 +2503,7 @@ var SpacesServiceImpl = class {
       } else {
         invariant5(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file8,
-          L: 233,
+          L: 236,
           S: this,
           A: [
             "!credential.id",
@@ -2521,7 +2512,7 @@ var SpacesServiceImpl = class {
         });
         invariant5(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file8,
-          L: 234,
+          L: 237,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -2531,7 +2522,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant5(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file8,
-          L: 236,
+          L: 239,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -2614,7 +2605,7 @@ var SpacesServiceImpl = class {
     const extracted = await extractSpaceArchive(request.archive);
     invariant5(extracted.metadata.echo?.currentRootUrl, "Space archive does not contain a root URL", {
       F: __dxlog_file8,
-      L: 290,
+      L: 293,
       S: this,
       A: [
         "extracted.metadata.echo?.currentRootUrl",
@@ -2634,7 +2625,7 @@ var SpacesServiceImpl = class {
     const assertion = getCredentialAssertion2(credential);
     invariant5(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file8,
-      L: 301,
+      L: 304,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2644,7 +2635,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     invariant5(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
       F: __dxlog_file8,
-      L: 303,
+      L: 306,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -2713,7 +2704,9 @@ var SpacesServiceImpl = class {
   }
   _requireIdentity() {
     if (!this._identityManager.identity) {
-      throw new IdentityNotInitializedError("This device has no HALO identity available. See https://docs.dxos.org/guide/platform/halo");
+      throw new IdentityNotInitializedError({
+        message: "This device has no HALO identity available. See https://docs.dxos.org/guide/platform/halo"
+      });
     }
     return this._identityManager.identity;
   }
@@ -2728,14 +2721,6 @@ var SpacesServiceImpl = class {
       });
     }
   }
-  constructor(_identityManager, _spaceManager, _getDataSpaceManager) {
-    _define_property7(this, "_identityManager", void 0);
-    _define_property7(this, "_spaceManager", void 0);
-    _define_property7(this, "_getDataSpaceManager", void 0);
-    this._identityManager = _identityManager;
-    this._spaceManager = _spaceManager;
-    this._getDataSpaceManager = _getDataSpaceManager;
-  }
 };
 var getChannelId = (channel) => `user-channel/${channel}`;
 
@@ -2743,21 +2728,13 @@ var getChannelId = (channel) => `user-channel/${channel}`;
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { SpaceId as SpaceId2 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
-function _define_property8(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file9 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/identity/default-space-state-machine.ts";
 var DefaultSpaceStateMachine = class {
+  _params;
+  _spaceId;
+  constructor(_params) {
+    this._params = _params;
+  }
   get spaceId() {
     return this._spaceId;
   }
@@ -2793,27 +2770,9 @@ var DefaultSpaceStateMachine = class {
       }
     }
   }
-  constructor(_params) {
-    _define_property8(this, "_params", void 0);
-    _define_property8(this, "_spaceId", void 0);
-    this._params = _params;
-  }
 };
 
 // src/packlets/identity/identity.ts
-function _define_property9(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -2822,42 +2781,94 @@ function _ts_decorate3(decorators, target, key, desc) {
 }
 var __dxlog_file10 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity.ts";
 var Identity = class {
-  // TODO(burdon): Expose state object?
-  get authorizedDeviceKeys() {
-    return this._deviceStateMachine.authorizedDeviceKeys;
-  }
-  get defaultSpaceId() {
-    return this._defaultSpaceStateMachine.spaceId;
-  }
-  async open(ctx) {
-    await this._presence?.open();
-    await this.space.spaceState.addCredentialProcessor(this._deviceStateMachine);
-    await this.space.spaceState.addCredentialProcessor(this._profileStateMachine);
-    await this.space.spaceState.addCredentialProcessor(this._defaultSpaceStateMachine);
-    if (this._edgeFeedReplicator) {
-      this.space.protocol.feedAdded.append(this._onFeedAdded);
-    }
-    await this.space.open(ctx);
-  }
-  async joinNetwork() {
-    await this.space.startProtocol();
-    await this._edgeFeedReplicator?.open();
-  }
-  async close(ctx) {
-    await this._presence?.close();
-    await this.authVerifier.close();
-    await this.space.spaceState.removeCredentialProcessor(this._defaultSpaceStateMachine);
-    await this.space.spaceState.removeCredentialProcessor(this._profileStateMachine);
-    await this.space.spaceState.removeCredentialProcessor(this._deviceStateMachine);
-    if (this._edgeFeedReplicator) {
-      this.space.protocol.feedAdded.remove(this._onFeedAdded);
-    }
-    await this._edgeFeedReplicator?.close();
-    await this.space.close();
-  }
-  async ready() {
-    await this._deviceStateMachine.deviceChainReady.wait();
-    await this.controlPipeline.state.waitUntilReachedTargetTimeframe({
+  space;
+  _signer;
+  _presence;
+  _deviceStateMachine;
+  _profileStateMachine;
+  _defaultSpaceStateMachine;
+  _edgeFeedReplicator = void 0;
+  authVerifier;
+  did;
+  identityKey;
+  deviceKey;
+  stateUpdate = new Event3();
+  constructor(params) {
+    this.space = params.space;
+    this._signer = params.signer;
+    this._presence = params.presence;
+    this.did = params.did;
+    this.identityKey = params.identityKey;
+    this.deviceKey = params.deviceKey;
+    log8.trace("dxos.halo.device", {
+      deviceKey: params.deviceKey
+    }, {
+      F: __dxlog_file10,
+      L: 83,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._deviceStateMachine = new DeviceStateMachine({
+      identityKey: this.identityKey,
+      deviceKey: this.deviceKey,
+      onUpdate: () => this.stateUpdate.emit()
+    });
+    this._profileStateMachine = new ProfileStateMachine({
+      identityKey: this.identityKey,
+      onUpdate: () => this.stateUpdate.emit()
+    });
+    this._defaultSpaceStateMachine = new DefaultSpaceStateMachine({
+      identityKey: this.identityKey,
+      onUpdate: () => this.stateUpdate.emit()
+    });
+    this.authVerifier = new TrustedKeySetAuthVerifier({
+      trustedKeysProvider: () => new ComplexSet(PublicKey5.hash, this.authorizedDeviceKeys.keys()),
+      update: this.stateUpdate,
+      authTimeout: AUTH_TIMEOUT
+    });
+    if (params.edgeConnection && params.edgeFeatures?.feedReplicator) {
+      this._edgeFeedReplicator = new EdgeFeedReplicator({
+        messenger: params.edgeConnection,
+        spaceId: this.space.id
+      });
+    }
+  }
+  // TODO(burdon): Expose state object?
+  get authorizedDeviceKeys() {
+    return this._deviceStateMachine.authorizedDeviceKeys;
+  }
+  get defaultSpaceId() {
+    return this._defaultSpaceStateMachine.spaceId;
+  }
+  async open(ctx) {
+    await this._presence?.open();
+    await this.space.spaceState.addCredentialProcessor(this._deviceStateMachine);
+    await this.space.spaceState.addCredentialProcessor(this._profileStateMachine);
+    await this.space.spaceState.addCredentialProcessor(this._defaultSpaceStateMachine);
+    if (this._edgeFeedReplicator) {
+      this.space.protocol.feedAdded.append(this._onFeedAdded);
+    }
+    await this.space.open(ctx);
+  }
+  async joinNetwork() {
+    await this.space.startProtocol();
+    await this._edgeFeedReplicator?.open();
+  }
+  async close(ctx) {
+    await this._presence?.close();
+    await this.authVerifier.close();
+    await this.space.spaceState.removeCredentialProcessor(this._defaultSpaceStateMachine);
+    await this.space.spaceState.removeCredentialProcessor(this._profileStateMachine);
+    await this.space.spaceState.removeCredentialProcessor(this._deviceStateMachine);
+    if (this._edgeFeedReplicator) {
+      this.space.protocol.feedAdded.remove(this._onFeedAdded);
+    }
+    await this._edgeFeedReplicator?.close();
+    await this.space.close();
+  }
+  async ready() {
+    await this._deviceStateMachine.deviceChainReady.wait();
+    await this.controlPipeline.state.waitUntilReachedTargetTimeframe({
       timeout: LOAD_CONTROL_FEEDS_TIMEOUT
     });
   }
@@ -2981,61 +2992,9 @@ var Identity = class {
     })));
     return deviceCredential;
   }
-  constructor(params) {
-    _define_property9(this, "space", void 0);
-    _define_property9(this, "_signer", void 0);
-    _define_property9(this, "_presence", void 0);
-    _define_property9(this, "_deviceStateMachine", void 0);
-    _define_property9(this, "_profileStateMachine", void 0);
-    _define_property9(this, "_defaultSpaceStateMachine", void 0);
-    _define_property9(this, "_edgeFeedReplicator", void 0);
-    _define_property9(this, "authVerifier", void 0);
-    _define_property9(this, "did", void 0);
-    _define_property9(this, "identityKey", void 0);
-    _define_property9(this, "deviceKey", void 0);
-    _define_property9(this, "stateUpdate", new Event3());
-    _define_property9(this, "_onFeedAdded", async (feed) => {
-      await this._edgeFeedReplicator.addFeed(feed);
-    });
-    this.space = params.space;
-    this._signer = params.signer;
-    this._presence = params.presence;
-    this.did = params.did;
-    this.identityKey = params.identityKey;
-    this.deviceKey = params.deviceKey;
-    log8.trace("dxos.halo.device", {
-      deviceKey: params.deviceKey
-    }, {
-      F: __dxlog_file10,
-      L: 83,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._deviceStateMachine = new DeviceStateMachine({
-      identityKey: this.identityKey,
-      deviceKey: this.deviceKey,
-      onUpdate: () => this.stateUpdate.emit()
-    });
-    this._profileStateMachine = new ProfileStateMachine({
-      identityKey: this.identityKey,
-      onUpdate: () => this.stateUpdate.emit()
-    });
-    this._defaultSpaceStateMachine = new DefaultSpaceStateMachine({
-      identityKey: this.identityKey,
-      onUpdate: () => this.stateUpdate.emit()
-    });
-    this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new ComplexSet(PublicKey5.hash, this.authorizedDeviceKeys.keys()),
-      update: this.stateUpdate,
-      authTimeout: AUTH_TIMEOUT
-    });
-    if (params.edgeConnection && params.edgeFeatures?.feedReplicator) {
-      this._edgeFeedReplicator = new EdgeFeedReplicator({
-        messenger: params.edgeConnection,
-        spaceId: this.space.id
-      });
-    }
-  }
+  _onFeedAdded = async (feed) => {
+    await this._edgeFeedReplicator.addFeed(feed);
+  };
 };
 _ts_decorate3([
   trace3.span()
@@ -3062,19 +3021,6 @@ import { Gossip as Gossip2, Presence as Presence2 } from "@dxos/teleport-extensi
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 import { trace as Trace2 } from "@dxos/tracing";
 import { deferFunction as deferFunction2, isNode } from "@dxos/util";
-function _define_property10(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -3085,6 +3031,27 @@ var __dxlog_file11 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/i
 var DEVICE_PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var DEVICE_PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var IdentityManager = class {
+  stateUpdate = new Event4();
+  _metadataStore;
+  _keyring;
+  _feedStore;
+  _spaceManager;
+  _devicePresenceAnnounceInterval;
+  _devicePresenceOfflineTimeout;
+  _edgeConnection;
+  _edgeFeatures;
+  _identity;
+  // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
+  constructor(params) {
+    this._metadataStore = params.metadataStore;
+    this._keyring = params.keyring;
+    this._feedStore = params.feedStore;
+    this._spaceManager = params.spaceManager;
+    this._edgeConnection = params.edgeConnection;
+    this._edgeFeatures = params.edgeFeatures;
+    this._devicePresenceAnnounceInterval = params.devicePresenceAnnounceInterval ?? DEVICE_PRESENCE_ANNOUNCE_INTERVAL;
+    this._devicePresenceOfflineTimeout = params.devicePresenceOfflineTimeout ?? DEVICE_PRESENCE_OFFLINE_TIMEOUT;
+  }
   get identity() {
     return this._identity;
   }
@@ -3519,27 +3486,6 @@ var IdentityManager = class {
       }
     });
   }
-  // TODO(dmaretskyi): Perhaps this should take/generate the peerKey outside of an initialized identity.
-  constructor(params) {
-    _define_property10(this, "stateUpdate", new Event4());
-    _define_property10(this, "_metadataStore", void 0);
-    _define_property10(this, "_keyring", void 0);
-    _define_property10(this, "_feedStore", void 0);
-    _define_property10(this, "_spaceManager", void 0);
-    _define_property10(this, "_devicePresenceAnnounceInterval", void 0);
-    _define_property10(this, "_devicePresenceOfflineTimeout", void 0);
-    _define_property10(this, "_edgeConnection", void 0);
-    _define_property10(this, "_edgeFeatures", void 0);
-    _define_property10(this, "_identity", void 0);
-    this._metadataStore = params.metadataStore;
-    this._keyring = params.keyring;
-    this._feedStore = params.feedStore;
-    this._spaceManager = params.spaceManager;
-    this._edgeConnection = params.edgeConnection;
-    this._edgeFeatures = params.edgeFeatures;
-    this._devicePresenceAnnounceInterval = params.devicePresenceAnnounceInterval ?? DEVICE_PRESENCE_ANNOUNCE_INTERVAL;
-    this._devicePresenceOfflineTimeout = params.devicePresenceOfflineTimeout ?? DEVICE_PRESENCE_OFFLINE_TIMEOUT;
-  }
 };
 _ts_decorate4([
   Trace2.span({
@@ -3559,22 +3505,18 @@ import { invariant as invariant8 } from "@dxos/invariant";
 import { log as log10 } from "@dxos/log";
 import { SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/services";
 import { safeAwaitAll } from "@dxos/util";
-function _define_property11(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file12 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
 var DEFAULT_SPACE_SEARCH_TIMEOUT = 1e4;
 var IdentityServiceImpl = class extends Resource4 {
+  _identityManager;
+  _recoveryManager;
+  _keyring;
+  _dataSpaceManagerProvider;
+  _createIdentity;
+  _onProfileUpdate;
+  constructor(_identityManager, _recoveryManager, _keyring, _dataSpaceManagerProvider, _createIdentity, _onProfileUpdate) {
+    super(), this._identityManager = _identityManager, this._recoveryManager = _recoveryManager, this._keyring = _keyring, this._dataSpaceManagerProvider = _dataSpaceManagerProvider, this._createIdentity = _createIdentity, this._onProfileUpdate = _onProfileUpdate;
+  }
   async _open() {
     const identity = this._identityManager.identity;
     if (identity && !identity.defaultSpaceId) {
@@ -3749,29 +3691,21 @@ var IdentityServiceImpl = class extends Resource4 {
       await this._createDefaultSpace(dataSpaceManager);
     }
   }
-  constructor(_identityManager, _recoveryManager, _keyring, _dataSpaceManagerProvider, _createIdentity, _onProfileUpdate) {
-    super(), _define_property11(this, "_identityManager", void 0), _define_property11(this, "_recoveryManager", void 0), _define_property11(this, "_keyring", void 0), _define_property11(this, "_dataSpaceManagerProvider", void 0), _define_property11(this, "_createIdentity", void 0), _define_property11(this, "_onProfileUpdate", void 0), this._identityManager = _identityManager, this._recoveryManager = _recoveryManager, this._keyring = _keyring, this._dataSpaceManagerProvider = _dataSpaceManagerProvider, this._createIdentity = _createIdentity, this._onProfileUpdate = _onProfileUpdate;
-  }
 };
 
 // src/packlets/spaces/automerge-space-state.ts
 import { Event as Event5 } from "@dxos/async";
 import { Resource as Resource5 } from "@dxos/context";
 import { checkCredentialType } from "@dxos/credentials";
-function _define_property12(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var AutomergeSpaceState = class extends Resource5 {
+  _onNewRoot;
+  rootUrl = void 0;
+  lastEpoch = void 0;
+  onNewEpoch = new Event5();
+  _isProcessingRootDocs = false;
+  constructor(_onNewRoot) {
+    super(), this._onNewRoot = _onNewRoot;
+  }
   async _open(ctx) {
   }
   async _close(ctx) {
@@ -3802,9 +3736,6 @@ var AutomergeSpaceState = class extends Resource5 {
   async ensureEpochInitialized() {
     await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
   }
-  constructor(_onNewRoot) {
-    super(), _define_property12(this, "_onNewRoot", void 0), _define_property12(this, "rootUrl", void 0), _define_property12(this, "lastEpoch", void 0), _define_property12(this, "onNewEpoch", void 0), _define_property12(this, "_isProcessingRootDocs", void 0), this._onNewRoot = _onNewRoot, this.rootUrl = void 0, this.lastEpoch = void 0, this.onNewEpoch = new Event5(), this._isProcessingRootDocs = false;
-  }
 };
 
 // src/packlets/spaces/epoch-migrations.ts
@@ -3815,7 +3746,7 @@ var LOAD_DOC_TIMEOUT = 1e4;
 var runEpochMigration = async (ctx, context) => {
   switch (context.migration) {
     case CreateEpochRequest.Migration.INIT_AUTOMERGE: {
-      const document = context.echoHost.createDoc();
+      const document = await context.echoHost.createDoc();
       await context.echoHost.flush();
       return {
         newRoot: document.url
@@ -3828,7 +3759,7 @@ var runEpochMigration = async (ctx, context) => {
       const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
         timeout: LOAD_DOC_TIMEOUT
       });
-      const newRoot = context.echoHost.createDoc(rootHandle.doc());
+      const newRoot = await context.echoHost.createDoc(rootHandle.doc());
       await context.echoHost.flush();
       return {
         newRoot: newRoot.url
@@ -3871,19 +3802,6 @@ import { EdgeCallFailedError } from "@dxos/protocols";
 import { schema as schema2 } from "@dxos/protocols/proto";
 import { RpcExtension } from "@dxos/teleport";
 import { ComplexMap as ComplexMap4, ComplexSet as ComplexSet2, entry } from "@dxos/util";
-function _define_property13(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -3899,6 +3817,24 @@ var MAX_EDGE_RETRIES = 2;
 var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var credentialCodec = schema2.getCodecForType("dxos.halo.credentials.Credential");
 var NotarizationPlugin = class extends Resource6 {
+  _extensionOpened = new Event6();
+  _writer;
+  _extensions = /* @__PURE__ */ new Set();
+  _processedCredentials = new ComplexSet2(PublicKey7.hash);
+  _processCredentialsTriggers = new ComplexMap4(PublicKey7.hash);
+  _activeEdgePollingIntervalHandle = void 0;
+  _activeEdgePollingInterval;
+  _activeEdgePollingEnabled = false;
+  _spaceId;
+  _edgeClient;
+  constructor(params) {
+    super();
+    this._spaceId = params.spaceId;
+    this._activeEdgePollingInterval = params.activeEdgePollingInterval ?? DEFAULT_ACTIVE_EDGE_POLLING_INTERVAL;
+    if (params.edgeClient && params.edgeFeatures?.feedReplicator) {
+      this._edgeClient = params.edgeClient;
+    }
+  }
   setActiveEdgePollingEnabled(enabled) {
     const client = this._edgeClient;
     invariant10(client, void 0, {
@@ -4258,20 +4194,12 @@ var NotarizationPlugin = class extends Resource6 {
       errors.throw(new TimeoutError(timeout, "Notarization timed out"));
     }, timeout);
   }
-  constructor(params) {
-    super(), _define_property13(this, "_extensionOpened", new Event6()), _define_property13(this, "_writer", void 0), _define_property13(this, "_extensions", /* @__PURE__ */ new Set()), _define_property13(this, "_processedCredentials", new ComplexSet2(PublicKey7.hash)), _define_property13(this, "_processCredentialsTriggers", new ComplexMap4(PublicKey7.hash)), _define_property13(this, "_activeEdgePollingIntervalHandle", void 0), _define_property13(this, "_activeEdgePollingInterval", void 0), _define_property13(this, "_activeEdgePollingEnabled", false), _define_property13(this, "_spaceId", void 0), _define_property13(this, "_edgeClient", void 0);
-    this._spaceId = params.spaceId;
-    this._activeEdgePollingInterval = params.activeEdgePollingInterval ?? DEFAULT_ACTIVE_EDGE_POLLING_INTERVAL;
-    if (params.edgeClient && params.edgeFeatures?.feedReplicator) {
-      this._edgeClient = params.edgeClient;
-    }
-  }
 };
 _ts_decorate5([
   logInfo2
 ], NotarizationPlugin.prototype, "_spaceId", void 0);
 var handleEdgeError = (error) => {
-  if (!(error instanceof EdgeCallFailedError) || error.errorData) {
+  if (!(error instanceof EdgeCallFailedError) || error.data) {
     log11.catch(error, void 0, {
       F: __dxlog_file14,
       L: 396,
@@ -4280,7 +4208,7 @@ var handleEdgeError = (error) => {
     });
   } else {
     log11.info("Edge notarization failure", {
-      reason: error.reason
+      message: error.message
     }, {
       F: __dxlog_file14,
       L: 398,
@@ -4290,6 +4218,17 @@ var handleEdgeError = (error) => {
   }
 };
 var NotarizationTeleportExtension = class extends RpcExtension {
+  _params;
+  constructor(_params) {
+    super({
+      requested: {
+        NotarizationService: schema2.getService("dxos.mesh.teleport.notarization.NotarizationService")
+      },
+      exposed: {
+        NotarizationService: schema2.getService("dxos.mesh.teleport.notarization.NotarizationService")
+      }
+    }), this._params = _params;
+  }
   async getHandlers() {
     return {
       NotarizationService: {
@@ -4307,32 +4246,9 @@ var NotarizationTeleportExtension = class extends RpcExtension {
     await this._params.onClose();
     await super.onClose(err);
   }
-  constructor(_params) {
-    super({
-      requested: {
-        NotarizationService: schema2.getService("dxos.mesh.teleport.notarization.NotarizationService")
-      },
-      exposed: {
-        NotarizationService: schema2.getService("dxos.mesh.teleport.notarization.NotarizationService")
-      }
-    }), _define_property13(this, "_params", void 0), this._params = _params;
-  }
 };
 
 // src/packlets/spaces/data-space.ts
-function _define_property14(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 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);
@@ -4406,6 +4322,75 @@ function _ts_dispose_resources3(env) {
 }
 var __dxlog_file15 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
+  _ctx = new Context6(void 0, {
+    F: __dxlog_file15,
+    L: 100
+  });
+  _inner;
+  _gossip;
+  _presence;
+  _keyring;
+  _feedStore;
+  _metadataStore;
+  _signingContext;
+  _notarizationPlugin;
+  _callbacks;
+  _cache = void 0;
+  _echoHost;
+  _edgeFeedReplicator = void 0;
+  // TODO(dmaretskyi): Move into Space?
+  _automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
+  _epochProcessingMutex = new Mutex2();
+  _state = SpaceState4.SPACE_CLOSED;
+  _databaseRoot = null;
+  /**
+  * Error for _state === SpaceState.SPACE_ERROR.
+  */
+  error = void 0;
+  authVerifier;
+  stateUpdate = new Event7();
+  postOpen = new CallbackCollection();
+  preClose = new CallbackCollection();
+  metrics = {};
+  constructor(params) {
+    this._inner = params.inner;
+    this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
+    this._gossip = params.gossip;
+    this._presence = params.presence;
+    this._keyring = params.keyring;
+    this._feedStore = params.feedStore;
+    this._metadataStore = params.metadataStore;
+    this._signingContext = params.signingContext;
+    this._callbacks = params.callbacks ?? {};
+    this._echoHost = params.echoHost;
+    this._notarizationPlugin = new NotarizationPlugin({
+      spaceId: this._inner.id,
+      edgeClient: params.edgeHttpClient,
+      edgeFeatures: params.edgeFeatures,
+      activeEdgePollingInterval: params.activeEdgeNotarizationPollingInterval
+    });
+    this.authVerifier = new TrustedKeySetAuthVerifier({
+      trustedKeysProvider: () => new ComplexSet3(PublicKey8.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== SpaceMember5.Role.REMOVED).map((member) => member.key)),
+      update: this._inner.stateUpdate,
+      authTimeout: AUTH_TIMEOUT2
+    });
+    this._cache = params.cache;
+    if (params.edgeConnection && params.edgeFeatures?.feedReplicator) {
+      this._edgeFeedReplicator = new EdgeFeedReplicator({
+        messenger: params.edgeConnection,
+        spaceId: this.id
+      });
+    }
+    this._state = params.initialState;
+    log12("new state", {
+      state: SpaceState4[this._state]
+    }, {
+      F: __dxlog_file15,
+      L: 176,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   get id() {
     return this._inner.id;
   }
@@ -4460,7 +4445,7 @@ var DataSpace = class {
     }
     await this._inner.open(new Context6(void 0, {
       F: __dxlog_file15,
-      L: 251
+      L: 250
     }));
     await this._inner.startProtocol();
     await this._edgeFeedReplicator?.open();
@@ -4469,7 +4454,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 257,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4489,14 +4474,14 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 276,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new Context6(void 0, {
       F: __dxlog_file15,
-      L: 278
+      L: 277
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4529,7 +4514,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log12("data pipeline initialization cancelled", err, {
             F: __dxlog_file15,
-            L: 316,
+            L: 315,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4537,7 +4522,7 @@ var DataSpace = class {
         }
         log12.error("Error initializing data pipeline", err, {
           F: __dxlog_file15,
-          L: 320,
+          L: 319,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4546,7 +4531,7 @@ var DataSpace = class {
           state: SpaceState4[this._state]
         }, {
           F: __dxlog_file15,
-          L: 322,
+          L: 321,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4559,20 +4544,22 @@ var DataSpace = class {
   }
   async initializeDataPipeline() {
     if (this._state !== SpaceState4.SPACE_CONTROL_ONLY) {
-      throw new SystemError("Invalid operation");
+      throw new SystemError({
+        message: "Invalid operation"
+      });
     }
     this._state = SpaceState4.SPACE_INITIALIZING;
     log12("new state", {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 338,
+      L: 337,
       S: this,
       C: (f, a) => f(...a)
     });
     log12("initializing control pipeline", void 0, {
       F: __dxlog_file15,
-      L: 340,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4581,21 +4568,21 @@ var DataSpace = class {
     const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState4.SPACE_READY);
     log12("initializing automerge root", void 0, {
       F: __dxlog_file15,
-      L: 348,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
     this._automergeSpaceState.startProcessingRootDocs();
     log12("waiting for space to be ready", void 0, {
       F: __dxlog_file15,
-      L: 352,
+      L: 351,
       S: this,
       C: (f, a) => f(...a)
     });
     await ready;
     log12("space is ready", void 0, {
       F: __dxlog_file15,
-      L: 354,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4603,7 +4590,7 @@ var DataSpace = class {
   async *getAllDocuments() {
     invariant11(this._databaseRoot, "Space is not ready", {
       F: __dxlog_file15,
-      L: 358,
+      L: 357,
       S: this,
       A: [
         "this._databaseRoot",
@@ -4619,7 +4606,7 @@ var DataSpace = class {
     for (const documentUrl of this._databaseRoot.getAllLinkedDocuments()) {
       const data = await this._echoHost.exportDoc(Context6.default(void 0, {
         F: __dxlog_file15,
-        L: 364
+        L: 363
       }), documentUrl);
       yield [
         documentUrl.replace(/^automerge:/, ""),
@@ -4634,7 +4621,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 373,
+      L: 372,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4651,7 +4638,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log12("writable feeds created", void 0, {
       F: __dxlog_file15,
-      L: 390,
+      L: 389,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4705,7 +4692,7 @@ var DataSpace = class {
           count: credentials.length
         }, {
           F: __dxlog_file15,
-          L: 448,
+          L: 447,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4716,14 +4703,14 @@ var DataSpace = class {
         });
         log12("credentials notarized", void 0, {
           F: __dxlog_file15,
-          L: 452,
+          L: 451,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         log12.error("error notarizing credentials for feed admission", err, {
           F: __dxlog_file15,
-          L: 454,
+          L: 453,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4738,7 +4725,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file15,
-      L: 464,
+      L: 463,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4752,7 +4739,12 @@ var DataSpace = class {
         };
         try {
           await warnAfterTimeout(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
-            handle = await cancelWithContext2(this._ctx, this._echoHost.automergeRepo.find(rootUrl, FIND_PARAMS2));
+            handle = await cancelWithContext2(this._ctx, this._echoHost.loadDoc(Context6.default(void 0, {
+              F: __dxlog_file15,
+              L: 473
+            }), rootUrl, {
+              fetchFromNetwork: true
+            }));
             await cancelWithContext2(this._ctx, handle.whenReady());
           });
           if (this._ctx.disposed) {
@@ -4793,7 +4785,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file15,
-          L: 511,
+          L: 512,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4883,7 +4875,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 593,
+      L: 594,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4892,74 +4884,9 @@ var DataSpace = class {
   getEdgeReplicationSetting() {
     return this._metadataStore.getSpaceEdgeReplicationSetting(this.key);
   }
-  constructor(params) {
-    _define_property14(this, "_ctx", new Context6(void 0, {
-      F: __dxlog_file15,
-      L: 101
-    }));
-    _define_property14(this, "_inner", void 0);
-    _define_property14(this, "_gossip", void 0);
-    _define_property14(this, "_presence", void 0);
-    _define_property14(this, "_keyring", void 0);
-    _define_property14(this, "_feedStore", void 0);
-    _define_property14(this, "_metadataStore", void 0);
-    _define_property14(this, "_signingContext", void 0);
-    _define_property14(this, "_notarizationPlugin", void 0);
-    _define_property14(this, "_callbacks", void 0);
-    _define_property14(this, "_cache", void 0);
-    _define_property14(this, "_echoHost", void 0);
-    _define_property14(this, "_edgeFeedReplicator", void 0);
-    _define_property14(this, "_automergeSpaceState", new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl)));
-    _define_property14(this, "_epochProcessingMutex", new Mutex2());
-    _define_property14(this, "_state", SpaceState4.SPACE_CLOSED);
-    _define_property14(this, "_databaseRoot", null);
-    _define_property14(this, "error", void 0);
-    _define_property14(this, "authVerifier", void 0);
-    _define_property14(this, "stateUpdate", new Event7());
-    _define_property14(this, "postOpen", new CallbackCollection());
-    _define_property14(this, "preClose", new CallbackCollection());
-    _define_property14(this, "metrics", {});
-    _define_property14(this, "_onFeedAdded", async (feed) => {
-      await this._edgeFeedReplicator.addFeed(feed);
-    });
-    this._inner = params.inner;
-    this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
-    this._gossip = params.gossip;
-    this._presence = params.presence;
-    this._keyring = params.keyring;
-    this._feedStore = params.feedStore;
-    this._metadataStore = params.metadataStore;
-    this._signingContext = params.signingContext;
-    this._callbacks = params.callbacks ?? {};
-    this._echoHost = params.echoHost;
-    this._notarizationPlugin = new NotarizationPlugin({
-      spaceId: this._inner.id,
-      edgeClient: params.edgeHttpClient,
-      edgeFeatures: params.edgeFeatures,
-      activeEdgePollingInterval: params.activeEdgeNotarizationPollingInterval
-    });
-    this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new ComplexSet3(PublicKey8.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== SpaceMember5.Role.REMOVED).map((member) => member.key)),
-      update: this._inner.stateUpdate,
-      authTimeout: AUTH_TIMEOUT2
-    });
-    this._cache = params.cache;
-    if (params.edgeConnection && params.edgeFeatures?.feedReplicator) {
-      this._edgeFeedReplicator = new EdgeFeedReplicator({
-        messenger: params.edgeConnection,
-        spaceId: this.id
-      });
-    }
-    this._state = params.initialState;
-    log12("new state", {
-      state: SpaceState4[this._state]
-    }, {
-      F: __dxlog_file15,
-      L: 177,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
+  _onFeedAdded = async (feed) => {
+    await this._edgeFeedReplicator.addFeed(feed);
+  };
 };
 _ts_decorate6([
   trace5.info()
@@ -5015,21 +4942,16 @@ import { getCredentialAssertion as getCredentialAssertion4 } from "@dxos/credent
 import { invariant as invariant12 } from "@dxos/invariant";
 import { AlreadyJoinedError as AlreadyJoinedError2 } from "@dxos/protocols";
 import { Invitation as Invitation2 } from "@dxos/protocols/proto/dxos/client/services";
-function _define_property15(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file16 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/device-invitation-protocol.ts";
 var DeviceInvitationProtocol = class {
+  _keyring;
+  _getIdentity;
+  _acceptIdentity;
+  constructor(_keyring, _getIdentity, _acceptIdentity) {
+    this._keyring = _keyring;
+    this._getIdentity = _getIdentity;
+    this._acceptIdentity = _acceptIdentity;
+  }
   toJSON() {
     return {
       kind: "device"
@@ -5084,7 +5006,9 @@ var DeviceInvitationProtocol = class {
     try {
       const identity = this._getIdentity();
       if (identity) {
-        return new AlreadyJoinedError2("Currently only one identity per client is supported.");
+        return new AlreadyJoinedError2({
+          message: "Currently only one identity per client is supported."
+        });
       }
     } catch {
     }
@@ -5141,14 +5065,6 @@ var DeviceInvitationProtocol = class {
       identityKey
     };
   }
-  constructor(_keyring, _getIdentity, _acceptIdentity) {
-    _define_property15(this, "_keyring", void 0);
-    _define_property15(this, "_getIdentity", void 0);
-    _define_property15(this, "_acceptIdentity", void 0);
-    this._keyring = _keyring;
-    this._getIdentity = _getIdentity;
-    this._acceptIdentity = _acceptIdentity;
-  }
 };
 
 // src/packlets/invitations/invitations-handler.ts
@@ -5203,24 +5119,22 @@ var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
 };
 
 // src/packlets/invitations/edge-invitation-handler.ts
-function _define_property16(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file17 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/edge-invitation-handler.ts";
 var MAX_RETRIES_PER_INVITATION = 5;
 var DEFAULT_REQUEST_RETRY_INTERVAL_MS = 3e3;
 var DEFAULT_REQUEST_RETRY_JITTER_MS = 500;
 var EdgeInvitationHandler = class {
+  _client;
+  _callbacks;
+  _flowLock;
+  _retryInterval;
+  _retryJitter;
+  constructor(config, _client, _callbacks) {
+    this._client = _client;
+    this._callbacks = _callbacks;
+    this._retryInterval = config?.retryInterval ?? DEFAULT_REQUEST_RETRY_INTERVAL_MS;
+    this._retryJitter = config?.retryJitter ?? DEFAULT_REQUEST_RETRY_JITTER_MS;
+  }
   handle(ctx, guardedState, protocol, deviceProfile) {
     if (!this._client) {
       log13("edge disabled", void 0, {
@@ -5363,17 +5277,6 @@ var EdgeInvitationHandler = class {
   _calculateNextRetryMs() {
     return this._retryInterval + Math.random() * this._retryJitter;
   }
-  constructor(config, _client, _callbacks) {
-    _define_property16(this, "_client", void 0);
-    _define_property16(this, "_callbacks", void 0);
-    _define_property16(this, "_flowLock", void 0);
-    _define_property16(this, "_retryInterval", void 0);
-    _define_property16(this, "_retryJitter", void 0);
-    this._client = _client;
-    this._callbacks = _callbacks;
-    this._retryInterval = config?.retryInterval ?? DEFAULT_REQUEST_RETRY_INTERVAL_MS;
-    this._retryJitter = config?.retryJitter ?? DEFAULT_REQUEST_RETRY_JITTER_MS;
-  }
 };
 
 // src/packlets/invitations/invitation-guest-extenstion.ts
@@ -5385,22 +5288,31 @@ import { InvalidInvitationExtensionRoleError } from "@dxos/protocols";
 import { schema as schema4 } from "@dxos/protocols/proto";
 import { InvitationOptions } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension as RpcExtension2 } from "@dxos/teleport";
-function _define_property17(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file18 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts";
 var OPTIONS_TIMEOUT = 1e4;
 var InvitationGuestExtension = class extends RpcExtension2 {
+  _invitationFlowMutex;
+  _callbacks;
+  _ctx = new Context7(void 0, {
+    F: __dxlog_file18,
+    L: 38
+  });
+  _remoteOptions;
+  _remoteOptionsTrigger = new Trigger4();
+  /**
+  * Held to allow only one invitation flow at a time to be active.
+  */
+  _invitationFlowLock = null;
+  constructor(_invitationFlowMutex, _callbacks) {
+    super({
+      requested: {
+        InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
+      },
+      exposed: {
+        InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
+      }
+    }), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks;
+  }
   hasFlowLock() {
     return this._invitationFlowLock != null;
   }
@@ -5467,10 +5379,12 @@ var InvitationGuestExtension = class extends RpcExtension2 {
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== InvitationOptions.Role.HOST) {
-        throw new InvalidInvitationExtensionRoleError(void 0, {
-          expected: InvitationOptions.Role.HOST,
-          remoteOptions: this._remoteOptions,
-          remotePeerId: context.remotePeerId
+        throw new InvalidInvitationExtensionRoleError({
+          context: {
+            expected: InvitationOptions.Role.HOST,
+            remoteOptions: this._remoteOptions,
+            remotePeerId: context.remotePeerId
+          }
         });
       }
       this._callbacks.onOpen(this._ctx, context);
@@ -5496,28 +5410,12 @@ var InvitationGuestExtension = class extends RpcExtension2 {
       this._invitationFlowLock = null;
       log14.verbose("invitation flow lock released", void 0, {
         F: __dxlog_file18,
-        L: 131,
+        L: 133,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
-  constructor(_invitationFlowMutex, _callbacks) {
-    super({
-      requested: {
-        InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
-      },
-      exposed: {
-        InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
-      }
-    }), _define_property17(this, "_invitationFlowMutex", void 0), _define_property17(this, "_callbacks", void 0), _define_property17(this, "_ctx", void 0), _define_property17(this, "_remoteOptions", void 0), _define_property17(this, "_remoteOptionsTrigger", void 0), /**
-    * Held to allow only one invitation flow at a time to be active.
-    */
-    _define_property17(this, "_invitationFlowLock", void 0), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks, this._ctx = new Context7(void 0, {
-      F: __dxlog_file18,
-      L: 38
-    }), this._remoteOptionsTrigger = new Trigger4(), this._invitationFlowLock = null;
-  }
 };
 
 // src/packlets/invitations/invitation-host-extension.ts
@@ -5532,23 +5430,46 @@ import { schema as schema5 } from "@dxos/protocols/proto";
 import { Invitation as Invitation5 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse, InvitationOptions as InvitationOptions2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { RpcExtension as RpcExtension3 } from "@dxos/teleport";
-function _define_property18(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file19 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts";
 var OPTIONS_TIMEOUT2 = 1e4;
 var MAX_OTP_ATTEMPTS = 3;
 var InvitationHostExtension = class extends RpcExtension3 {
+  _invitationFlowMutex;
+  _callbacks;
+  /**
+  * @internal
+  */
+  _ctx = new Context8(void 0, {
+    F: __dxlog_file19,
+    L: 57
+  });
+  _remoteOptions;
+  _remoteOptionsTrigger = new Trigger5();
+  _challenge = void 0;
+  guestProfile = void 0;
+  authenticationPassed = false;
+  /**
+  * Retry counter for SHARED_SECRET authentication method.
+  */
+  authenticationRetry = 0;
+  /**
+  * Resolved when admission is completed.
+  */
+  completedTrigger = new Trigger5();
+  /**
+  * Held to allow only one invitation flow at a time to be active.
+  */
+  _invitationFlowLock = null;
+  constructor(_invitationFlowMutex, _callbacks) {
+    super({
+      requested: {
+        InvitationHostService: schema5.getService("dxos.halo.invitations.InvitationHostService")
+      },
+      exposed: {
+        InvitationHostService: schema5.getService("dxos.halo.invitations.InvitationHostService")
+      }
+    }), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks;
+  }
   hasFlowLock() {
     return this._invitationFlowLock != null;
   }
@@ -5795,10 +5716,12 @@ var InvitationHostExtension = class extends RpcExtension3 {
         C: (f, a) => f(...a)
       });
       if (this._remoteOptions?.role !== InvitationOptions2.Role.GUEST) {
-        throw new InvalidInvitationExtensionRoleError2(void 0, {
-          expected: InvitationOptions2.Role.GUEST,
-          remoteOptions: this._remoteOptions,
-          remotePeerId: context.remotePeerId
+        throw new InvalidInvitationExtensionRoleError2({
+          context: {
+            expected: InvitationOptions2.Role.GUEST,
+            remoteOptions: this._remoteOptions,
+            remotePeerId: context.remotePeerId
+          }
         });
       }
       this._callbacks.onStateUpdate(Invitation5.State.CONNECTED);
@@ -5843,37 +5766,12 @@ var InvitationHostExtension = class extends RpcExtension3 {
       this._invitationFlowLock = null;
       log15.verbose("invitation flow lock released", void 0, {
         F: __dxlog_file19,
-        L: 299,
+        L: 301,
         S: this,
         C: (f, a) => f(...a)
       });
     }
   }
-  constructor(_invitationFlowMutex, _callbacks) {
-    super({
-      requested: {
-        InvitationHostService: schema5.getService("dxos.halo.invitations.InvitationHostService")
-      },
-      exposed: {
-        InvitationHostService: schema5.getService("dxos.halo.invitations.InvitationHostService")
-      }
-    }), _define_property18(this, "_invitationFlowMutex", void 0), _define_property18(this, "_callbacks", void 0), /**
-    * @internal
-    */
-    _define_property18(this, "_ctx", void 0), _define_property18(this, "_remoteOptions", void 0), _define_property18(this, "_remoteOptionsTrigger", void 0), _define_property18(this, "_challenge", void 0), _define_property18(this, "guestProfile", void 0), _define_property18(this, "authenticationPassed", void 0), /**
-    * Retry counter for SHARED_SECRET authentication method.
-    */
-    _define_property18(this, "authenticationRetry", void 0), /**
-    * Resolved when admission is completed.
-    */
-    _define_property18(this, "completedTrigger", void 0), /**
-    * Held to allow only one invitation flow at a time to be active.
-    */
-    _define_property18(this, "_invitationFlowLock", void 0), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks, this._ctx = new Context8(void 0, {
-      F: __dxlog_file19,
-      L: 57
-    }), this._remoteOptionsTrigger = new Trigger5(), this._challenge = void 0, this.guestProfile = void 0, this.authenticationPassed = false, this.authenticationRetry = 0, this.completedTrigger = new Trigger5(), this._invitationFlowLock = null;
-  }
 };
 var isAuthenticationRequired = (invitation) => invitation.authMethod !== Invitation5.AuthMethod.NONE;
 
@@ -5979,21 +5877,22 @@ import { PublicKey as PublicKey10 } from "@dxos/keys";
 import { log as log17 } from "@dxos/log";
 import { InvitationOptions as InvitationOptions3 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { ComplexSet as ComplexSet4 } from "@dxos/util";
-function _define_property19(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file21 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
 var InvitationTopology = class {
+  _role;
+  _controller;
+  /**
+  * Peers we tried to establish a connection with.
+  * In invitation flow peers are assigned random ids when they join the swarm, so we'll retry
+  * a peer if they reload an invitation.
+  *
+  * Consider keeping a separate set for peers we know are hosts and have some retry timeout
+  * for guests we failed an invitation flow with (potentially due to a network error).
+  */
+  _seenPeers = new ComplexSet4(PublicKey10.hash);
+  constructor(_role) {
+    this._role = _role;
+  }
   init(controller) {
     invariant16(!this._controller, "Already initialized.", {
       F: __dxlog_file21,
@@ -6058,33 +5957,24 @@ var InvitationTopology = class {
   toString() {
     return `InvitationTopology(${this._role === InvitationOptions3.Role.GUEST ? "guest" : "host"})`;
   }
-  constructor(_role) {
-    _define_property19(this, "_role", void 0);
-    _define_property19(this, "_controller", void 0);
-    _define_property19(this, "_seenPeers", void 0);
-    this._role = _role;
-    this._seenPeers = new ComplexSet4(PublicKey10.hash);
-  }
 };
 
 // src/packlets/invitations/invitations-handler.ts
-function _define_property20(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file22 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts";
 var metrics = _trace.metrics;
 var MAX_DELEGATED_INVITATION_HOST_TRIES = 3;
 var InvitationsHandler = class {
+  _networkManager;
+  _edgeClient;
+  _connectionProps;
+  /**
+  * @internal
+  */
+  constructor(_networkManager, _edgeClient, _connectionProps) {
+    this._networkManager = _networkManager;
+    this._edgeClient = _edgeClient;
+    this._connectionProps = _connectionProps;
+  }
   handleInvitationFlow(ctx, stream, protocol, invitation) {
     log18.verbose("dxos.sdk.invitations-handler.handleInvitationFlow", {
       state: invitation.state,
@@ -6527,7 +6417,7 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    const edgeInvitationHandler = new EdgeInvitationHandler(this._connectionParams?.edgeInvitations, this._edgeClient, {
+    const edgeInvitationHandler = new EdgeInvitationHandler(this._connectionProps?.edgeInvitations, this._edgeClient, {
       onInvitationSuccess: async (admissionResponse, admissionRequest) => {
         const result = await protocol.accept(admissionResponse, admissionRequest);
         log18.info("admitted by edge", {
@@ -6587,7 +6477,7 @@ var InvitationsHandler = class {
       topic: invitation.swarmKey,
       protocolProvider: createTeleportProtocolFactory(async (teleport) => {
         teleport.addExtension("dxos.halo.invitations", extensionFactory());
-      }, this._connectionParams?.teleport),
+      }, this._connectionProps?.teleport),
       topology: new InvitationTopology(role),
       label
     });
@@ -6655,22 +6545,13 @@ var InvitationsHandler = class {
       throw new Error(`Authentication failed with code: ${response.status}`);
     }
   }
-  /**
-  * @internal
-  */
-  constructor(_networkManager, _edgeClient, _connectionParams) {
-    _define_property20(this, "_networkManager", void 0);
-    _define_property20(this, "_edgeClient", void 0);
-    _define_property20(this, "_connectionParams", void 0);
-    this._networkManager = _networkManager;
-    this._edgeClient = _edgeClient;
-    this._connectionParams = _connectionParams;
-  }
 };
 var checkInvitation = (protocol, invitation) => {
   const expiresOn = getExpirationTime(invitation);
   if (expiresOn && expiresOn.getTime() < Date.now()) {
-    return new InvalidInvitationError("Invitation already expired.");
+    return new InvalidInvitationError({
+      message: "Invitation already expired."
+    });
   }
   return protocol.checkInvitation(invitation);
 };
@@ -6686,20 +6567,11 @@ var createAdmissionKeypair = () => {
 import { Stream as Stream9 } from "@dxos/codec-protobuf/stream";
 import { QueryInvitationsResponse } from "@dxos/protocols/proto/dxos/client/services";
 import { trace as trace8 } from "@dxos/tracing";
-function _define_property21(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var InvitationsServiceImpl = class {
+  _invitationsManager;
+  constructor(_invitationsManager) {
+    this._invitationsManager = _invitationsManager;
+  }
   // TODO(burdon): Guest/host label.
   getLoggingContext() {
     return {};
@@ -6791,10 +6663,6 @@ var InvitationsServiceImpl = class {
       });
     });
   }
-  constructor(_invitationsManager) {
-    _define_property21(this, "_invitationsManager", void 0);
-    this._invitationsManager = _invitationsManager;
-  }
 };
 
 // src/packlets/invitations/space-invitation-protocol.ts
@@ -6805,21 +6673,18 @@ import { log as log19 } from "@dxos/log";
 import { AlreadyJoinedError as AlreadyJoinedError3, AuthorizationError as AuthorizationError2, InvalidInvitationError as InvalidInvitationError2, SpaceNotFoundError as SpaceNotFoundError2 } from "@dxos/protocols";
 import { Invitation as Invitation8 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember6 } from "@dxos/protocols/proto/dxos/halo/credentials";
-function _define_property22(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file23 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
 var SpaceInvitationProtocol = class {
+  _spaceManager;
+  _signingContext;
+  _keyring;
+  _spaceKey;
+  constructor(_spaceManager, _signingContext, _keyring, _spaceKey) {
+    this._spaceManager = _spaceManager;
+    this._signingContext = _signingContext;
+    this._keyring = _keyring;
+    this._spaceKey = _spaceKey;
+  }
   toJSON() {
     return {
       kind: "space",
@@ -6829,21 +6694,25 @@ var SpaceInvitationProtocol = class {
   }
   checkCanInviteNewMembers() {
     if (this._spaceKey == null) {
-      return new InvalidInvitationError2("No spaceKey was provided for a space invitation.");
+      return new InvalidInvitationError2({
+        message: "No spaceKey was provided for a space invitation."
+      });
     }
     const space = this._spaceManager.spaces.get(this._spaceKey);
     if (space == null) {
       return new SpaceNotFoundError2(this._spaceKey);
     }
     if (!space?.inner.spaceState.hasMembershipManagementPermission(this._signingContext.identityKey)) {
-      return new AuthorizationError2("No member management permission.");
+      return new AuthorizationError2({
+        message: "No member management permission."
+      });
     }
     return void 0;
   }
   getInvitationContext() {
     invariant18(this._spaceKey, void 0, {
       F: __dxlog_file23,
-      L: 66,
+      L: 60,
       S: this,
       A: [
         "this._spaceKey",
@@ -6853,7 +6722,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant18(space, void 0, {
       F: __dxlog_file23,
-      L: 68,
+      L: 62,
       S: this,
       A: [
         "space",
@@ -6869,7 +6738,7 @@ var SpaceInvitationProtocol = class {
   async admit(invitation, request, guestProfile) {
     invariant18(this._spaceKey && request.space, void 0, {
       F: __dxlog_file23,
-      L: 81,
+      L: 75,
       S: this,
       A: [
         "this._spaceKey && request.space",
@@ -6881,7 +6750,7 @@ var SpaceInvitationProtocol = class {
       guest: request.space.deviceKey
     }, {
       F: __dxlog_file23,
-      L: 82,
+      L: 76,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6903,7 +6772,7 @@ var SpaceInvitationProtocol = class {
   async delegate(invitation) {
     invariant18(this._spaceKey, void 0, {
       F: __dxlog_file23,
-      L: 102,
+      L: 96,
       S: this,
       A: [
         "this._spaceKey",
@@ -6913,7 +6782,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant18(space, void 0, {
       F: __dxlog_file23,
-      L: 104,
+      L: 98,
       S: this,
       A: [
         "space",
@@ -6923,7 +6792,7 @@ var SpaceInvitationProtocol = class {
     if (invitation.authMethod === Invitation8.AuthMethod.KNOWN_PUBLIC_KEY) {
       invariant18(invitation.guestKeypair?.publicKey, void 0, {
         F: __dxlog_file23,
-        L: 106,
+        L: 100,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -6936,7 +6805,7 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file23,
-      L: 109,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6951,7 +6820,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant18(credential.credential, void 0, {
       F: __dxlog_file23,
-      L: 127,
+      L: 121,
       S: this,
       A: [
         "credential.credential",
@@ -6966,7 +6835,7 @@ var SpaceInvitationProtocol = class {
   async cancelDelegation(invitation) {
     invariant18(this._spaceKey, void 0, {
       F: __dxlog_file23,
-      L: 133,
+      L: 127,
       S: this,
       A: [
         "this._spaceKey",
@@ -6975,7 +6844,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant18(invitation.type === Invitation8.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
       F: __dxlog_file23,
-      L: 134,
+      L: 128,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -6985,7 +6854,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant18(space, void 0, {
       F: __dxlog_file23,
-      L: 136,
+      L: 130,
       S: this,
       A: [
         "space",
@@ -6997,14 +6866,14 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file23,
-      L: 138,
+      L: 132,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await createCancelDelegatedSpaceInvitationCredential(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     invariant18(credential.credential, void 0, {
       F: __dxlog_file23,
-      L: 145,
+      L: 139,
       S: this,
       A: [
         "credential.credential",
@@ -7017,10 +6886,14 @@ var SpaceInvitationProtocol = class {
   }
   checkInvitation(invitation) {
     if (invitation.spaceKey == null) {
-      return new InvalidInvitationError2("No spaceKey was provided for a space invitation.");
+      return new InvalidInvitationError2({
+        message: "No spaceKey was provided for a space invitation."
+      });
     }
     if (this._spaceManager.spaces.has(invitation.spaceKey)) {
-      return new AlreadyJoinedError3("Already joined space.");
+      return new AlreadyJoinedError3({
+        message: "Already joined space."
+      });
     }
   }
   createIntroduction() {
@@ -7043,7 +6916,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     invariant18(response.space, void 0, {
       F: __dxlog_file23,
-      L: 180,
+      L: 174,
       S: this,
       A: [
         "response.space",
@@ -7054,7 +6927,7 @@ var SpaceInvitationProtocol = class {
     const assertion = getCredentialAssertion5(credential);
     invariant18(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file23,
-      L: 183,
+      L: 177,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -7063,7 +6936,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant18(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
       F: __dxlog_file23,
-      L: 184,
+      L: 178,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -7071,7 +6944,9 @@ var SpaceInvitationProtocol = class {
       ]
     });
     if (this._spaceManager.spaces.has(assertion.spaceKey)) {
-      throw new AlreadyJoinedError3("Already joined space.");
+      throw new AlreadyJoinedError3({
+        message: "Already joined space."
+      });
     }
     await this._spaceManager.acceptSpace({
       spaceKey: assertion.spaceKey,
@@ -7084,16 +6959,6 @@ var SpaceInvitationProtocol = class {
       spaceKey: assertion.spaceKey
     };
   }
-  constructor(_spaceManager, _signingContext, _keyring, _spaceKey) {
-    _define_property22(this, "_spaceManager", void 0);
-    _define_property22(this, "_signingContext", void 0);
-    _define_property22(this, "_keyring", void 0);
-    _define_property22(this, "_spaceKey", void 0);
-    this._spaceManager = _spaceManager;
-    this._signingContext = _signingContext;
-    this._keyring = _keyring;
-    this._spaceKey = _spaceKey;
-  }
 };
 
 // src/packlets/invitations/invitations-manager.ts
@@ -7107,21 +6972,25 @@ import { PublicKey as PublicKey12 } from "@dxos/keys";
 import { log as log20 } from "@dxos/log";
 import { Invitation as Invitation9 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember7 } from "@dxos/protocols/proto/dxos/halo/credentials";
-function _define_property23(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var __dxlog_file24 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts";
 var InvitationsManager = class {
+  _invitationsHandler;
+  _getHandler;
+  _metadataStore;
+  _createInvitations = /* @__PURE__ */ new Map();
+  _acceptInvitations = /* @__PURE__ */ new Map();
+  invitationCreated = new Event8();
+  invitationAccepted = new Event8();
+  removedCreated = new Event8();
+  removedAccepted = new Event8();
+  saved = new Event8();
+  _persistentInvitationsLoadedEvent = new Event8();
+  _persistentInvitationsLoaded = false;
+  constructor(_invitationsHandler, _getHandler, _metadataStore) {
+    this._invitationsHandler = _invitationsHandler;
+    this._getHandler = _getHandler;
+    this._metadataStore = _metadataStore;
+  }
   async createInvitation(options) {
     if (options.invitationId) {
       const existingInvitation = this._createInvitations.get(options.invitationId);
@@ -7465,233 +7334,45 @@ var InvitationsManager = class {
     }, () => {
     }, callback);
   }
-  constructor(_invitationsHandler, _getHandler, _metadataStore) {
-    _define_property23(this, "_invitationsHandler", void 0);
-    _define_property23(this, "_getHandler", void 0);
-    _define_property23(this, "_metadataStore", void 0);
-    _define_property23(this, "_createInvitations", void 0);
-    _define_property23(this, "_acceptInvitations", void 0);
-    _define_property23(this, "invitationCreated", void 0);
-    _define_property23(this, "invitationAccepted", void 0);
-    _define_property23(this, "removedCreated", void 0);
-    _define_property23(this, "removedAccepted", void 0);
-    _define_property23(this, "saved", void 0);
-    _define_property23(this, "_persistentInvitationsLoadedEvent", void 0);
-    _define_property23(this, "_persistentInvitationsLoaded", void 0);
-    this._invitationsHandler = _invitationsHandler;
-    this._getHandler = _getHandler;
-    this._metadataStore = _metadataStore;
-    this._createInvitations = /* @__PURE__ */ new Map();
-    this._acceptInvitations = /* @__PURE__ */ new Map();
-    this.invitationCreated = new Event8();
-    this.invitationAccepted = new Event8();
-    this.removedCreated = new Event8();
-    this.removedAccepted = new Event8();
-    this.saved = new Event8();
-    this._persistentInvitationsLoadedEvent = new Event8();
-    this._persistentInvitationsLoaded = false;
-  }
 };
 
-// src/packlets/locks/node.ts
+// src/packlets/locks/index.ts
+var locks_exports = {};
+__reExport(locks_exports, locks_platform_star);
+import * as locks_platform_star from "#locks-platform";
+
+// src/packlets/agents/edge-agent-manager.ts
+import { DeferredTask as DeferredTask2, Event as Event9, scheduleTask as scheduleTask8, synchronized as synchronized3 } from "@dxos/async";
+import { Resource as Resource7 } from "@dxos/context";
 import { invariant as invariant20 } from "@dxos/invariant";
-import { LockFile } from "@dxos/lock-file";
-import { log as log21, logInfo as logInfo3 } from "@dxos/log";
-function _define_property24(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { PublicKey as PublicKey13 } from "@dxos/keys";
+import { log as log21 } from "@dxos/log";
+import { EdgeAgentStatus, EdgeCallFailedError as EdgeCallFailedError3 } from "@dxos/protocols";
+import { SpaceState as SpaceState5 } from "@dxos/protocols/proto/dxos/client/services";
+import { EdgeReplicationSetting as EdgeReplicationSetting2 } from "@dxos/protocols/proto/dxos/echo/metadata";
 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_file25 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/locks/node.ts";
-var Lock = class {
-  get lockKey() {
-    return this._lockPath;
-  }
-  async acquire() {
-    log21("acquiring lock...", void 0, {
-      F: __dxlog_file25,
-      L: 32,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    this._fileHandle = await LockFile.acquire(this._lockPath);
-    await this._onAcquire?.();
-    log21("acquired lock", void 0, {
-      F: __dxlog_file25,
-      L: 37,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-  }
-  async release() {
-    await this._onRelease?.();
-    invariant20(this._fileHandle, "Lock is not acquired", {
-      F: __dxlog_file25,
-      L: 42,
-      S: this,
-      A: [
-        "this._fileHandle",
-        "'Lock is not acquired'"
-      ]
-    });
-    await LockFile.release(this._fileHandle);
-  }
-  constructor({ lockKey: lockPath, onAcquire, onRelease }) {
-    _define_property24(this, "_lockPath", void 0);
-    _define_property24(this, "_onAcquire", void 0);
-    _define_property24(this, "_onRelease", void 0);
-    _define_property24(this, "_fileHandle", void 0);
-    this._lockPath = lockPath;
-    this._onAcquire = onAcquire;
-    this._onRelease = onRelease;
-  }
-};
-_ts_decorate7([
-  logInfo3
-], Lock.prototype, "lockKey", null);
-var isLocked = (lockPath) => LockFile.isLocked(lockPath);
-
-// src/packlets/services/client-rpc-server.ts
-import { Stream as Stream10 } from "@dxos/codec-protobuf";
-import { raise as raise2 } from "@dxos/debug";
-import { RpcPeer, parseMethodName } from "@dxos/rpc";
-import { MapCounter, trace as trace9 } from "@dxos/tracing";
-function _define_property25(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _ts_decorate8(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 {
-  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) ?? raise2(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);
-  }
-  constructor(params) {
-    _define_property25(this, "_serviceRegistry", void 0);
-    _define_property25(this, "_rpcPeer", void 0);
-    _define_property25(this, "_handlerCache", /* @__PURE__ */ new Map());
-    _define_property25(this, "_handleCall", void 0);
-    _define_property25(this, "_handleStream", void 0);
-    _define_property25(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 Stream10.map(Stream10.unwrapPromise(this._handleStream(methodName, params2, handler)), (data) => {
-            this._callMetrics.inc(`${serviceName}.${methodName} response stream`);
-            return data;
-          });
-        } else {
-          return handler(methodName, params2);
-        }
-      }
-    });
-  }
-};
-_ts_decorate8([
-  trace9.metricsCounter()
-], ClientRpcServer.prototype, "_callMetrics", void 0);
-_ts_decorate8([
-  trace9.info()
-], ClientRpcServer.prototype, "_services", null);
-ClientRpcServer = _ts_decorate8([
-  trace9.resource()
-], ClientRpcServer);
-
-// src/packlets/agents/edge-agent-manager.ts
-import { DeferredTask as DeferredTask2, Event as Event9, scheduleTask as scheduleTask8, synchronized as synchronized3 } from "@dxos/async";
-import { Resource as Resource7 } from "@dxos/context";
-import { invariant as invariant21 } from "@dxos/invariant";
-import { PublicKey as PublicKey13 } from "@dxos/keys";
-import { log as log22 } from "@dxos/log";
-import { EdgeAgentStatus, EdgeCallFailedError as EdgeCallFailedError3 } from "@dxos/protocols";
-import { SpaceState as SpaceState5 } from "@dxos/protocols/proto/dxos/client/services";
-import { EdgeReplicationSetting as EdgeReplicationSetting2 } from "@dxos/protocols/proto/dxos/echo/metadata";
-function _define_property26(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _ts_decorate9(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_file26 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/agents/edge-agent-manager.ts";
+var __dxlog_file25 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/agents/edge-agent-manager.ts";
 var AGENT_STATUS_QUERY_RETRY_INTERVAL = 5e3;
 var AGENT_STATUS_QUERY_RETRY_JITTER = 1e3;
 var AGENT_FEED_ADDED_CHECK_INTERVAL_MS = 3e3;
 var EdgeAgentManager = class extends Resource7 {
+  _edgeFeatures;
+  _edgeHttpClient;
+  _dataSpaceManager;
+  _identity;
+  agentStatusChanged = new Event9();
+  _agentDeviceKey;
+  _agentStatus;
+  _lastKnownDeviceCount = 0;
+  _fetchAgentStatusTask;
+  constructor(_edgeFeatures, _edgeHttpClient, _dataSpaceManager, _identity) {
+    super(), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity;
+  }
   get agentStatus() {
     return this._agentStatus;
   }
@@ -7699,8 +7380,8 @@ var EdgeAgentManager = class extends Resource7 {
     return this._agentStatus && this._agentStatus !== EdgeAgentStatus.NOT_FOUND;
   }
   async createAgent() {
-    invariant21(this.isOpen, void 0, {
-      F: __dxlog_file26,
+    invariant20(this.isOpen, void 0, {
+      F: __dxlog_file25,
       L: 54,
       S: this,
       A: [
@@ -7708,8 +7389,8 @@ var EdgeAgentManager = class extends Resource7 {
         ""
       ]
     });
-    invariant21(this._edgeHttpClient, void 0, {
-      F: __dxlog_file26,
+    invariant20(this._edgeHttpClient, void 0, {
+      F: __dxlog_file25,
       L: 55,
       S: this,
       A: [
@@ -7717,8 +7398,8 @@ var EdgeAgentManager = class extends Resource7 {
         ""
       ]
     });
-    invariant21(this._edgeFeatures?.agents, void 0, {
-      F: __dxlog_file26,
+    invariant20(this._edgeFeatures?.agents, void 0, {
+      F: __dxlog_file25,
       L: 56,
       S: this,
       A: [
@@ -7733,10 +7414,10 @@ var EdgeAgentManager = class extends Resource7 {
     });
     const deviceKey = PublicKey13.fromHex(response.deviceKey);
     if (await this._identity.authorizedDeviceKeys.has(deviceKey)) {
-      log22.info("agent was already added to HALO, ignoring response", {
+      log21.info("agent was already added to HALO, ignoring response", {
         response
       }, {
-        F: __dxlog_file26,
+        F: __dxlog_file25,
         L: 67,
         S: this,
         C: (f, a) => f(...a)
@@ -7750,8 +7431,8 @@ var EdgeAgentManager = class extends Resource7 {
       // TODO: agents don't have data feed, should be removed
       dataFeedKey: PublicKey13.random()
     });
-    log22("agent created", response, {
-      F: __dxlog_file26,
+    log21("agent created", response, {
+      F: __dxlog_file25,
       L: 79,
       S: this,
       C: (f, a) => f(...a)
@@ -7760,10 +7441,10 @@ var EdgeAgentManager = class extends Resource7 {
   }
   async _open() {
     const isEnabled = this._edgeHttpClient && this._edgeFeatures?.agents;
-    log22("edge agent manager open", {
+    log21("edge agent manager open", {
       isEnabled
     }, {
-      F: __dxlog_file26,
+      F: __dxlog_file25,
       L: 87,
       S: this,
       C: (f, a) => f(...a)
@@ -7795,8 +7476,8 @@ var EdgeAgentManager = class extends Resource7 {
     this._lastKnownDeviceCount = 0;
   }
   async _fetchAgentStatus() {
-    invariant21(this._edgeHttpClient, void 0, {
-      F: __dxlog_file26,
+    invariant20(this._edgeHttpClient, void 0, {
+      F: __dxlog_file25,
       L: 121,
       S: this,
       A: [
@@ -7805,8 +7486,8 @@ var EdgeAgentManager = class extends Resource7 {
       ]
     });
     try {
-      log22("fetching agent status", void 0, {
-        F: __dxlog_file26,
+      log21("fetching agent status", void 0, {
+        F: __dxlog_file25,
         L: 123,
         S: this,
         C: (f, a) => f(...a)
@@ -7822,10 +7503,10 @@ var EdgeAgentManager = class extends Resource7 {
     } catch (err) {
       if (err instanceof EdgeCallFailedError3) {
         if (!err.isRetryable) {
-          log22.warn("non retryable error on agent status fetch attempt", {
+          log21.warn("non retryable error on agent status fetch attempt", {
             err
           }, {
-            F: __dxlog_file26,
+            F: __dxlog_file25,
             L: 133,
             S: this,
             C: (f, a) => f(...a)
@@ -7834,11 +7515,11 @@ var EdgeAgentManager = class extends Resource7 {
         }
       }
       const retryAfterMs = AGENT_STATUS_QUERY_RETRY_INTERVAL + Math.random() * AGENT_STATUS_QUERY_RETRY_JITTER;
-      log22.info("agent status fetching failed", {
+      log21.info("agent status fetching failed", {
         err,
         retryAfterMs
       }, {
-        F: __dxlog_file26,
+        F: __dxlog_file25,
         L: 138,
         S: this,
         C: (f, a) => f(...a)
@@ -7870,11 +7551,11 @@ var EdgeAgentManager = class extends Resource7 {
       ].some((feed) => feed.assertion.deviceKey.equals(agentDeviceKey));
       space.notarizationPlugin.setActiveEdgePollingEnabled(agentFeedNeedsNotarization);
       activePollingEnabled = activePollingEnabled || agentFeedNeedsNotarization;
-      log22.verbose("set active edge polling", {
+      log21.verbose("set active edge polling", {
         enabled: agentFeedNeedsNotarization,
         spaceId: space.id
       }, {
-        F: __dxlog_file26,
+        F: __dxlog_file25,
         L: 165,
         S: this,
         C: (f, a) => f(...a)
@@ -7891,47 +7572,45 @@ var EdgeAgentManager = class extends Resource7 {
     if (deviceKey) {
       this._ensureAgentIsInSpaces(deviceKey);
     }
-    log22.verbose("agent status update", {
+    log21.verbose("agent status update", {
       status
     }, {
-      F: __dxlog_file26,
+      F: __dxlog_file25,
       L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  constructor(_edgeFeatures, _edgeHttpClient, _dataSpaceManager, _identity) {
-    super(), _define_property26(this, "_edgeFeatures", void 0), _define_property26(this, "_edgeHttpClient", void 0), _define_property26(this, "_dataSpaceManager", void 0), _define_property26(this, "_identity", void 0), _define_property26(this, "agentStatusChanged", void 0), _define_property26(this, "_agentDeviceKey", void 0), _define_property26(this, "_agentStatus", void 0), _define_property26(this, "_lastKnownDeviceCount", void 0), _define_property26(this, "_fetchAgentStatusTask", void 0), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity, this.agentStatusChanged = new Event9(), this._lastKnownDeviceCount = 0;
-  }
 };
-_ts_decorate9([
+_ts_decorate7([
   synchronized3
 ], EdgeAgentManager.prototype, "createAgent", null);
 
 // src/packlets/agents/edge-agent-service.ts
-import { Stream as Stream11 } from "@dxos/codec-protobuf/stream";
+import { Stream as Stream10 } from "@dxos/codec-protobuf/stream";
 import { EdgeAgentStatus as EdgeAgentStatus2 } from "@dxos/protocols";
 import { EdgeStatus as EdgeStatus2, QueryAgentStatusResponse } from "@dxos/protocols/proto/dxos/client/services";
-function _define_property27(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var EdgeAgentServiceImpl = class {
+  _agentManagerProvider;
+  _edgeConnection;
+  constructor(_agentManagerProvider, _edgeConnection) {
+    this._agentManagerProvider = _agentManagerProvider;
+    this._edgeConnection = _edgeConnection;
+  }
   // TODO(mykola): Reconcile with NetworkService.queryStatus.
   queryEdgeStatus() {
-    return new Stream11(({ ctx, next }) => {
+    return new Stream10(({ ctx, next }) => {
       const update = () => {
         next({
-          status: this._edgeConnection?.status ?? EdgeStatus2.NOT_CONNECTED
+          status: this._edgeConnection?.status ?? {
+            state: EdgeStatus2.ConnectionState.NOT_CONNECTED,
+            rtt: 0,
+            uptime: 0,
+            rateBytesUp: 0,
+            rateBytesDown: 0,
+            messagesSent: 0,
+            messagesReceived: 0
+          }
         });
       };
       this._edgeConnection?.statusChanged.on(ctx, update);
@@ -7942,7 +7621,7 @@ var EdgeAgentServiceImpl = class {
     return (await this._agentManagerProvider()).createAgent();
   }
   queryAgentStatus() {
-    return new Stream11(({ ctx, next }) => {
+    return new Stream10(({ ctx, next }) => {
       next({
         status: QueryAgentStatusResponse.AgentStatus.UNKNOWN
       });
@@ -7958,12 +7637,6 @@ var EdgeAgentServiceImpl = class {
       });
     });
   }
-  constructor(_agentManagerProvider, _edgeConnection) {
-    _define_property27(this, "_agentManagerProvider", void 0);
-    _define_property27(this, "_edgeConnection", void 0);
-    this._agentManagerProvider = _agentManagerProvider;
-    this._edgeConnection = _edgeConnection;
-  }
 };
 var mapStatus = (agentStatus) => {
   switch (agentStatus) {
@@ -7986,11 +7659,11 @@ import { failUndefined as failUndefined2, warnAfterTimeout as warnAfterTimeout2
 import { EchoEdgeReplicator, EchoHost, MeshEchoReplicator, MetadataStore, SpaceManager, valueEncoding } from "@dxos/echo-pipeline";
 import { createChainEdgeIdentity, createEphemeralEdgeIdentity } from "@dxos/edge-client";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
-import { invariant as invariant23 } from "@dxos/invariant";
+import { invariant as invariant22 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey15 } from "@dxos/keys";
-import { log as log24 } from "@dxos/log";
-import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace10 } from "@dxos/protocols";
+import { log as log23 } from "@dxos/log";
+import { InvalidStorageVersionError, STORAGE_VERSION as STORAGE_VERSION2, trace as trace9 } from "@dxos/protocols";
 import { Invitation as Invitation10 } from "@dxos/protocols/proto/dxos/client/services";
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
 import { trace as Trace3 } from "@dxos/tracing";
@@ -7999,31 +7672,28 @@ import { safeInstanceof } from "@dxos/util";
 // src/packlets/identity/identity-recovery-manager.ts
 import { generateSeedPhrase, keyPairFromSeedPhrase } from "@dxos/credentials";
 import { sign as sign3 } from "@dxos/crypto";
-import { invariant as invariant22 } from "@dxos/invariant";
+import { invariant as invariant21 } from "@dxos/invariant";
 import { PublicKey as PublicKey14 } from "@dxos/keys";
-import { log as log23 } from "@dxos/log";
+import { log as log22 } from "@dxos/log";
 import { EdgeAuthChallengeError as EdgeAuthChallengeError2 } from "@dxos/protocols";
 import { schema as schema6 } from "@dxos/protocols/proto";
 import { Timeframe as Timeframe5 } from "@dxos/timeframe";
-function _define_property28(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file27 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-recovery-manager.ts";
+var __dxlog_file26 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-recovery-manager.ts";
 var EdgeIdentityRecoveryManager = class {
+  _keyring;
+  _edgeClient;
+  _identityProvider;
+  _acceptRecoveredIdentity;
+  constructor(_keyring, _edgeClient, _identityProvider, _acceptRecoveredIdentity) {
+    this._keyring = _keyring;
+    this._edgeClient = _edgeClient;
+    this._identityProvider = _identityProvider;
+    this._acceptRecoveredIdentity = _acceptRecoveredIdentity;
+  }
   async createRecoveryCredential({ data }) {
     const identity = this._identityProvider();
-    invariant22(identity, void 0, {
-      F: __dxlog_file27,
+    invariant21(identity, void 0, {
+      F: __dxlog_file26,
       L: 39,
       S: this,
       A: [
@@ -8073,8 +7743,8 @@ var EdgeIdentityRecoveryManager = class {
     };
   }
   async requestRecoveryChallenge() {
-    invariant22(this._edgeClient, "Not connected to EDGE.", {
-      F: __dxlog_file27,
+    invariant21(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
       L: 76,
       S: this,
       A: [
@@ -8103,8 +7773,8 @@ var EdgeIdentityRecoveryManager = class {
     }
   }
   async recoverIdentityWithExternalSignature({ lookupKey, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData }) {
-    invariant22(this._edgeClient, "Not connected to EDGE.", {
-      F: __dxlog_file27,
+    invariant21(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
       L: 108,
       S: this,
       A: [
@@ -8137,8 +7807,8 @@ var EdgeIdentityRecoveryManager = class {
   * Recovery identity using an opaque token sent to the user's email.
   */
   async recoverIdentityWithToken({ token }) {
-    invariant22(this._edgeClient, "Not connected to EDGE.", {
-      F: __dxlog_file27,
+    invariant21(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
       L: 141,
       S: this,
       A: [
@@ -8165,8 +7835,8 @@ var EdgeIdentityRecoveryManager = class {
     });
   }
   async recoverIdentity({ recoveryCode }) {
-    invariant22(this._edgeClient, "Not connected to EDGE.", {
-      F: __dxlog_file27,
+    invariant21(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
       L: 165,
       S: this,
       A: [
@@ -8196,8 +7866,8 @@ var EdgeIdentityRecoveryManager = class {
         signature: Buffer.from(signature).toString("base64")
       });
     }
-    log23.info("recovering identity", response, {
-      F: __dxlog_file27,
+    log22.info("recovering identity", response, {
+      F: __dxlog_file26,
       L: 191,
       S: this,
       C: (f, a) => f(...a)
@@ -8212,16 +7882,6 @@ var EdgeIdentityRecoveryManager = class {
       dataFeedKey: await this._keyring.createKey()
     });
   }
-  constructor(_keyring, _edgeClient, _identityProvider, _acceptRecoveredIdentity) {
-    _define_property28(this, "_keyring", void 0);
-    _define_property28(this, "_edgeClient", void 0);
-    _define_property28(this, "_identityProvider", void 0);
-    _define_property28(this, "_acceptRecoveredIdentity", void 0);
-    this._keyring = _keyring;
-    this._edgeClient = _edgeClient;
-    this._identityProvider = _identityProvider;
-    this._acceptRecoveredIdentity = _acceptRecoveredIdentity;
-  }
 };
 var decodeCredential = (credentialBase64) => {
   const credentialBytes = Buffer.from(credentialBase64, "base64");
@@ -8230,20 +7890,7 @@ var decodeCredential = (credentialBase64) => {
 };
 
 // src/packlets/services/service-context.ts
-function _define_property29(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _ts_decorate10(decorators, target, key, desc) {
+function _ts_decorate8(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;
@@ -8314,21 +7961,119 @@ function _ts_dispose_resources4(env) {
     return next();
   })(env);
 }
-var __dxlog_file28 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var __dxlog_file27 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource8 {
+  storage;
+  level;
+  networkManager;
+  signalManager;
+  _edgeConnection;
+  _edgeHttpClient;
+  _runtime;
+  _runtimeProps;
+  _edgeFeatures;
+  _edgeIdentityUpdateMutex = new Mutex4();
+  initialized = new Trigger7();
+  metadataStore;
+  blobStore;
+  feedStore;
+  keyring;
+  spaceManager;
+  identityManager;
+  recoveryManager;
+  invitations;
+  invitationsManager;
+  echoHost;
+  _meshReplicator = void 0;
+  _echoEdgeReplicator = void 0;
+  // Initialized after identity is initialized.
+  dataSpaceManager;
+  edgeAgentManager;
+  _handlerFactories = /* @__PURE__ */ new Map();
+  _deviceSpaceSync;
+  _instanceId = PublicKey15.random().toHex();
+  constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtime, _runtimeProps, _edgeFeatures) {
+    super(), this.storage = storage, this.level = level, this.networkManager = networkManager, this.signalManager = signalManager, this._edgeConnection = _edgeConnection, this._edgeHttpClient = _edgeHttpClient, this._runtime = _runtime, this._runtimeProps = _runtimeProps, this._edgeFeatures = _edgeFeatures;
+    log23("runtimeProps", this._runtimeProps, {
+      F: __dxlog_file27,
+      L: 120,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log23("edgeFeatures", this._edgeFeatures, {
+      F: __dxlog_file27,
+      L: 121,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
+    this.blobStore = new BlobStore(storage.createDirectory("blobs"));
+    this.keyring = new Keyring(storage.createDirectory("keyring"));
+    this.feedStore = new FeedStore({
+      factory: new FeedFactory({
+        root: storage.createDirectory("feeds"),
+        signer: this.keyring,
+        hypercore: {
+          valueEncoding,
+          stats: true
+        }
+      })
+    });
+    this.spaceManager = new SpaceManager({
+      feedStore: this.feedStore,
+      networkManager: this.networkManager,
+      blobStore: this.blobStore,
+      metadataStore: this.metadataStore,
+      disableP2pReplication: this._runtimeProps?.disableP2pReplication
+    });
+    this.identityManager = new IdentityManager({
+      metadataStore: this.metadataStore,
+      keyring: this.keyring,
+      feedStore: this.feedStore,
+      spaceManager: this.spaceManager,
+      devicePresenceOfflineTimeout: this._runtimeProps?.devicePresenceOfflineTimeout,
+      devicePresenceAnnounceInterval: this._runtimeProps?.devicePresenceAnnounceInterval,
+      edgeConnection: this._edgeConnection,
+      edgeFeatures: this._edgeFeatures
+    });
+    this.recoveryManager = new EdgeIdentityRecoveryManager(this.keyring, this._edgeHttpClient, () => this.identityManager.identity, this._acceptIdentity.bind(this));
+    this.echoHost = new EchoHost({
+      kv: this.level,
+      peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex(),
+      getSpaceKeyByRootDocumentId: (documentId) => this.spaceManager.findSpaceByRootDocumentId(documentId)?.key,
+      indexing: {
+        vector: this._runtimeProps?.enableVectorIndexing,
+        fullText: this._runtimeProps?.enableFullTextIndexing
+      },
+      runtime: this._runtime,
+      localQueues: this._runtimeProps?.enableLocalQueues
+    });
+    this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeProps?.invitationConnectionDefaultProps);
+    this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
+    this._handlerFactories.set(Invitation10.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
+    if (!this._runtimeProps?.disableP2pReplication) {
+      this._meshReplicator = new MeshEchoReplicator();
+    }
+    if (this._edgeConnection && this._edgeFeatures?.echoReplicator && this._edgeHttpClient) {
+      this._echoEdgeReplicator = new EchoEdgeReplicator({
+        edgeConnection: this._edgeConnection,
+        edgeHttpClient: this._edgeHttpClient
+      });
+    }
+  }
   async _open(ctx) {
     await this._checkStorageVersion();
-    log24("opening...", void 0, {
-      F: __dxlog_file28,
-      L: 204,
+    log23("opening...", void 0, {
+      F: __dxlog_file27,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
-    log24.trace("dxos.sdk.service-context.open", trace10.begin({
+    log23.trace("dxos.sdk.service-context.open", trace9.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file28,
-      L: 205,
+      F: __dxlog_file27,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8351,33 +8096,33 @@ var ServiceContext = class extends Resource8 {
       await this._initialize(ctx);
     }
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
-    log24("loaded persistent invitations", {
+    log23("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file28,
-      L: 233,
+      F: __dxlog_file27,
+      L: 244,
       S: this,
       C: (f, a) => f(...a)
     });
-    log24.trace("dxos.sdk.service-context.open", trace10.end({
+    log23.trace("dxos.sdk.service-context.open", trace9.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file28,
-      L: 235,
+      F: __dxlog_file27,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
-    log24("opened", void 0, {
-      F: __dxlog_file28,
-      L: 236,
+    log23("opened", void 0, {
+      F: __dxlog_file27,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    log24("closing...", void 0, {
-      F: __dxlog_file28,
-      L: 240,
+    log23("closing...", void 0, {
+      F: __dxlog_file27,
+      L: 251,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8394,9 +8139,9 @@ var ServiceContext = class extends Resource8 {
     await this._edgeConnection?.close();
     await this.feedStore.close();
     await this.metadataStore.close();
-    log24("closed", void 0, {
-      F: __dxlog_file28,
-      L: 256,
+    log23("closed", void 0, {
+      F: __dxlog_file27,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8406,8 +8151,8 @@ var ServiceContext = class extends Resource8 {
     await this._setNetworkIdentity();
     await identity.joinNetwork();
     await this._initialize(new Context10(void 0, {
-      F: __dxlog_file28,
-      L: 263
+      F: __dxlog_file27,
+      L: 274
     }));
     return identity;
   }
@@ -8416,9 +8161,9 @@ var ServiceContext = class extends Resource8 {
       throw new Error("Identity must be created before joining a space.");
     }
     const factory = this._handlerFactories.get(invitation.kind);
-    invariant23(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file28,
-      L: 272,
+    invariant22(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file27,
+      L: 283,
       S: this,
       A: [
         "factory",
@@ -8443,8 +8188,8 @@ var ServiceContext = class extends Resource8 {
     await identity.joinNetwork();
     await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
     await this._initialize(new Context10(void 0, {
-      F: __dxlog_file28,
-      L: 291
+      F: __dxlog_file27,
+      L: 302
     }));
     return identity;
   }
@@ -8456,9 +8201,9 @@ var ServiceContext = class extends Resource8 {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    log24("initializing spaces...", void 0, {
-      F: __dxlog_file28,
-      L: 306,
+    log23("initializing spaces...", void 0, {
+      F: __dxlog_file27,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8488,16 +8233,16 @@ var ServiceContext = class extends Resource8 {
       edgeHttpClient: this._edgeHttpClient,
       echoEdgeReplicator: this._echoEdgeReplicator,
       meshReplicator: this._meshReplicator,
-      runtimeParams: this._runtimeParams,
+      runtimeProps: this._runtimeProps,
       edgeFeatures: this._edgeFeatures
     });
     await this.dataSpaceManager.open();
     this.edgeAgentManager = new EdgeAgentManager(this._edgeFeatures, this._edgeHttpClient, this.dataSpaceManager, identity);
     await this.edgeAgentManager.open();
     this._handlerFactories.set(Invitation10.Kind.SPACE, (invitation) => {
-      invariant23(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file28,
-        L: 344,
+      invariant22(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file27,
+        L: 355,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -8517,33 +8262,33 @@ var ServiceContext = class extends Resource8 {
           return;
         }
         if (!this.dataSpaceManager) {
-          log24("dataSpaceManager not initialized yet, ignoring space admission", {
+          log23("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file28,
-            L: 360,
+            F: __dxlog_file27,
+            L: 371,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          log24("space already exists, ignoring space admission", {
+          log23("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file28,
-            L: 364,
+            F: __dxlog_file27,
+            L: 375,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         try {
-          log24("accepting space recorded in halo", {
+          log23("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file28,
-            L: 369,
+            F: __dxlog_file27,
+            L: 380,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8552,9 +8297,9 @@ var ServiceContext = class extends Resource8 {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          log24.catch(err, void 0, {
-            F: __dxlog_file28,
-            L: 375,
+          log23.catch(err, void 0, {
+            F: __dxlog_file27,
+            L: 386,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8574,12 +8319,12 @@ var ServiceContext = class extends Resource8 {
       let edgeIdentity;
       const identity = this.identityManager.identity;
       if (identity) {
-        log24("setting identity on edge connection", {
+        log23("setting identity on edge connection", {
           identity: identity.identityKey.toHex(),
           swarms: this.networkManager.topics
         }, {
-          F: __dxlog_file28,
-          L: 389,
+          F: __dxlog_file27,
+          L: 400,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -8591,9 +8336,9 @@ var ServiceContext = class extends Resource8 {
           await warnAfterTimeout2(1e4, "Waiting for identity to be ready for edge connection", async () => {
             await identity.ready();
           });
-          invariant23(identity.deviceCredentialChain, void 0, {
-            F: __dxlog_file28,
-            L: 408,
+          invariant22(identity.deviceCredentialChain, void 0, {
+            F: __dxlog_file27,
+            L: 419,
             S: this,
             A: [
               "identity.deviceCredentialChain",
@@ -8618,70 +8363,14 @@ var ServiceContext = class extends Resource8 {
       _ts_dispose_resources4(env);
     }
   }
-  constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtimeParams, _edgeFeatures) {
-    super(), _define_property29(this, "storage", void 0), _define_property29(this, "level", void 0), _define_property29(this, "networkManager", void 0), _define_property29(this, "signalManager", void 0), _define_property29(this, "_edgeConnection", void 0), _define_property29(this, "_edgeHttpClient", void 0), _define_property29(this, "_runtimeParams", void 0), _define_property29(this, "_edgeFeatures", void 0), _define_property29(this, "_edgeIdentityUpdateMutex", void 0), _define_property29(this, "initialized", void 0), _define_property29(this, "metadataStore", void 0), _define_property29(this, "blobStore", void 0), _define_property29(this, "feedStore", void 0), _define_property29(this, "keyring", void 0), _define_property29(this, "spaceManager", void 0), _define_property29(this, "identityManager", void 0), _define_property29(this, "recoveryManager", void 0), _define_property29(this, "invitations", void 0), _define_property29(this, "invitationsManager", void 0), _define_property29(this, "echoHost", void 0), _define_property29(this, "_meshReplicator", void 0), _define_property29(this, "_echoEdgeReplicator", void 0), // Initialized after identity is initialized.
-    _define_property29(this, "dataSpaceManager", void 0), _define_property29(this, "edgeAgentManager", void 0), _define_property29(this, "_handlerFactories", void 0), _define_property29(this, "_deviceSpaceSync", void 0), _define_property29(this, "_instanceId", void 0), this.storage = storage, this.level = level, this.networkManager = networkManager, this.signalManager = signalManager, this._edgeConnection = _edgeConnection, this._edgeHttpClient = _edgeHttpClient, this._runtimeParams = _runtimeParams, this._edgeFeatures = _edgeFeatures, this._edgeIdentityUpdateMutex = new Mutex4(), this.initialized = new Trigger7(), this._meshReplicator = void 0, this._echoEdgeReplicator = void 0, this._handlerFactories = /* @__PURE__ */ new Map(), this._instanceId = PublicKey15.random().toHex();
-    this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
-    this.blobStore = new BlobStore(storage.createDirectory("blobs"));
-    this.keyring = new Keyring(storage.createDirectory("keyring"));
-    this.feedStore = new FeedStore({
-      factory: new FeedFactory({
-        root: storage.createDirectory("feeds"),
-        signer: this.keyring,
-        hypercore: {
-          valueEncoding,
-          stats: true
-        }
-      })
-    });
-    this.spaceManager = new SpaceManager({
-      feedStore: this.feedStore,
-      networkManager: this.networkManager,
-      blobStore: this.blobStore,
-      metadataStore: this.metadataStore,
-      disableP2pReplication: this._runtimeParams?.disableP2pReplication
-    });
-    this.identityManager = new IdentityManager({
-      metadataStore: this.metadataStore,
-      keyring: this.keyring,
-      feedStore: this.feedStore,
-      spaceManager: this.spaceManager,
-      devicePresenceOfflineTimeout: this._runtimeParams?.devicePresenceOfflineTimeout,
-      devicePresenceAnnounceInterval: this._runtimeParams?.devicePresenceAnnounceInterval,
-      edgeConnection: this._edgeConnection,
-      edgeFeatures: this._edgeFeatures
-    });
-    this.recoveryManager = new EdgeIdentityRecoveryManager(this.keyring, this._edgeHttpClient, () => this.identityManager.identity, this._acceptIdentity.bind(this));
-    this.echoHost = new EchoHost({
-      kv: this.level,
-      peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex(),
-      getSpaceKeyByRootDocumentId: (documentId) => this.spaceManager.findSpaceByRootDocumentId(documentId)?.key,
-      indexing: {
-        vector: this._runtimeParams?.enableVectorIndexing
-      }
-    });
-    this._meshReplicator = new MeshEchoReplicator();
-    this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeParams?.invitationConnectionDefaultParams);
-    this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
-    this._handlerFactories.set(Invitation10.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? failUndefined2(), this._acceptIdentity.bind(this)));
-    if (!this._runtimeParams?.disableP2pReplication) {
-      this._meshReplicator = new MeshEchoReplicator();
-    }
-    if (this._edgeConnection && this._edgeFeatures?.echoReplicator && this._edgeHttpClient) {
-      this._echoEdgeReplicator = new EchoEdgeReplicator({
-        edgeConnection: this._edgeConnection,
-        edgeHttpClient: this._edgeHttpClient
-      });
-    }
-  }
 };
-_ts_decorate10([
+_ts_decorate8([
   Trace3.span()
 ], ServiceContext.prototype, "_open", null);
-_ts_decorate10([
+_ts_decorate8([
   Trace3.span()
 ], ServiceContext.prototype, "_initialize", null);
-ServiceContext = _ts_decorate10([
+ServiceContext = _ts_decorate8([
   safeInstanceof("dxos.client-services.ServiceContext"),
   Trace3.resource()
 ], ServiceContext);
@@ -8709,16 +8398,24 @@ var StorageDriver = Runtime2.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
   const { persistent = false, keyStore, dataStore } = config ?? {};
   if (persistent && dataStore === StorageDriver.RAM) {
-    throw new InvalidConfigError("RAM storage cannot be used in persistent mode.");
+    throw new InvalidConfigError({
+      message: "RAM storage cannot be used in persistent mode."
+    });
   }
   if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+    throw new InvalidConfigError({
+      message: "Cannot use a persistent storage in not persistent mode."
+    });
   }
   if (persistent && keyStore === StorageDriver.RAM) {
-    throw new InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+    throw new InvalidConfigError({
+      message: "RAM key storage cannot be used in persistent mode."
+    });
   }
   if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+    throw new InvalidConfigError({
+      message: "Cannot use a persistent key storage in not persistent mode."
+    });
   }
   return {
     storage: createStorage({
@@ -8760,180 +8457,15 @@ var createLevel = async (config) => {
   return level;
 };
 
-// src/packlets/storage/profile-archive.ts
-import { cbor } from "@automerge/automerge-repo";
-import { invariant as invariant24 } from "@dxos/invariant";
-import { log as log25 } from "@dxos/log";
-import { ProfileArchiveEntryType } from "@dxos/protocols";
-import { arrayToBuffer as arrayToBuffer2 } from "@dxos/util";
-var __dxlog_file29 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
-var encodeProfileArchive = (profile) => cbor.encode(profile);
-var decodeProfileArchive = (data) => cbor.decode(data);
-var exportProfileData = async ({ storage, level }) => {
-  const archive = {
-    storage: [],
-    meta: {
-      timestamp: (/* @__PURE__ */ new Date()).toISOString()
-    }
-  };
-  {
-    const directory = await storage.createDirectory();
-    const files = await directory.list();
-    log25.info("begin exporting files", {
-      count: files.length
-    }, {
-      F: __dxlog_file29,
-      L: 31,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    for (const filename of files) {
-      const file = await directory.getOrCreateFile(filename);
-      const { size } = await file.stat();
-      const data = await file.read(0, size);
-      archive.storage.push({
-        type: ProfileArchiveEntryType.FILE,
-        key: filename,
-        value: data
-      });
-    }
-    log25.info("done exporting files", {
-      count: files.length
-    }, {
-      F: __dxlog_file29,
-      L: 42,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-  }
-  {
-    log25.info("begin exporting kv pairs", void 0, {
-      F: __dxlog_file29,
-      L: 46,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    const iter = await level.iterator({
-      keyEncoding: "binary",
-      valueEncoding: "binary"
-    });
-    let count = 0;
-    for await (const [key, value] of iter) {
-      archive.storage.push({
-        type: ProfileArchiveEntryType.KEY_VALUE,
-        key,
-        value
-      });
-      count++;
-    }
-    log25.info("done exporting kv pairs", {
-      count
-    }, {
-      F: __dxlog_file29,
-      L: 57,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-  }
-  return archive;
-};
-var importProfileData = async ({ storage, level }, archive) => {
-  let batch = level.batch();
-  let count = 0;
-  for (const entry2 of archive.storage) {
-    switch (entry2.type) {
-      case ProfileArchiveEntryType.FILE: {
-        const directory = await storage.createDirectory();
-        invariant24(typeof entry2.key === "string", "Invalid key type", {
-          F: __dxlog_file29,
-          L: 80,
-          S: void 0,
-          A: [
-            "typeof entry.key === 'string'",
-            "'Invalid key type'"
-          ]
-        });
-        const file = await directory.getOrCreateFile(entry2.key);
-        invariant24(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file29,
-          L: 82,
-          S: void 0,
-          A: [
-            "entry.value instanceof Uint8Array",
-            "'Invalid value type'"
-          ]
-        });
-        await file.write(0, arrayToBuffer2(entry2.value));
-        await file.close();
-        break;
-      }
-      case ProfileArchiveEntryType.KEY_VALUE: {
-        invariant24(entry2.key instanceof Uint8Array, "Invalid key type", {
-          F: __dxlog_file29,
-          L: 88,
-          S: void 0,
-          A: [
-            "entry.key instanceof Uint8Array",
-            "'Invalid key type'"
-          ]
-        });
-        invariant24(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file29,
-          L: 89,
-          S: void 0,
-          A: [
-            "entry.value instanceof Uint8Array",
-            "'Invalid value type'"
-          ]
-        });
-        batch.put(entry2.key, entry2.value, {
-          keyEncoding: "binary",
-          valueEncoding: "binary"
-        });
-        break;
-      }
-      default:
-        throw new Error(`Invalid entry type: ${entry2.type}`);
-    }
-    if (++count % 1e3 === 0) {
-      await batch.write();
-      batch = level.batch();
-      log25.info("importing", {
-        count,
-        total: archive.storage.length,
-        progress: `${(count / archive.storage.length * 100).toFixed()}%`
-      }, {
-        F: __dxlog_file29,
-        L: 102,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-    }
-  }
-  log25.info("committing changes..", void 0, {
-    F: __dxlog_file29,
-    L: 110,
-    S: void 0,
-    C: (f, a) => f(...a)
-  });
-  await batch.write();
-};
-
 // src/packlets/services/service-registry.ts
-function _define_property30(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var ServiceRegistry = class {
+  _serviceBundle;
+  _handlers;
+  // prettier-ignore
+  constructor(_serviceBundle, _handlers = {}) {
+    this._serviceBundle = _serviceBundle;
+    this._handlers = _handlers;
+  }
   get descriptors() {
     return this._serviceBundle;
   }
@@ -8949,55 +8481,45 @@ var ServiceRegistry = class {
   removeService(name) {
     delete this._handlers[name];
   }
-  // prettier-ignore
-  constructor(_serviceBundle, _handlers = {}) {
-    _define_property30(this, "_serviceBundle", void 0);
-    _define_property30(this, "_handlers", void 0);
-    this._serviceBundle = _serviceBundle;
-    this._handlers = _handlers;
-  }
 };
 
 // src/packlets/services/service-host.ts
+import * as SqlClient from "@effect/sql/SqlClient";
+import * as Effect from "effect/Effect";
 import { Event as Event11, synchronized as synchronized4 } from "@dxos/async";
 import { clientServiceBundle } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
 import { EdgeClient, EdgeHttpClient, createStubEdgeIdentity } from "@dxos/edge-client";
-import { invariant as invariant26 } from "@dxos/invariant";
+import { RuntimeProvider } from "@dxos/effect";
+import { invariant as invariant24 } from "@dxos/invariant";
 import { PublicKey as PublicKey19 } from "@dxos/keys";
-import { log as log27 } from "@dxos/log";
+import { log as log25 } from "@dxos/log";
 import { EdgeSignalManager, WebsocketSignalManager } from "@dxos/messaging";
 import { SwarmNetworkManager, createIceProvider, createRtcTransportFactory } from "@dxos/network-manager";
-import { trace as trace11 } from "@dxos/protocols";
+import { trace as trace10 } from "@dxos/protocols";
 import { SystemStatus } from "@dxos/protocols/proto/dxos/client/services";
+import * as SqlExport from "@dxos/sql-sqlite/SqlExport";
 import { TRACE_PROCESSOR as TRACE_PROCESSOR3, trace as Trace4 } from "@dxos/tracing";
 import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 
 // src/packlets/devices/devices-service.ts
 import { SubscriptionList as SubscriptionList3 } from "@dxos/async";
-import { Stream as Stream12 } from "@dxos/codec-protobuf/stream";
-import { invariant as invariant25 } from "@dxos/invariant";
+import { Stream as Stream11 } from "@dxos/codec-protobuf/stream";
+import { invariant as invariant23 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2, EdgeStatus as EdgeStatus3 } from "@dxos/protocols/proto/dxos/client/services";
-function _define_property31(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-var __dxlog_file30 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file28 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
+  _identityManager;
+  _edgeConnection;
+  constructor(_identityManager, _edgeConnection) {
+    this._identityManager = _identityManager;
+    this._edgeConnection = _edgeConnection;
+  }
   async updateDevice(profile) {
     return this._identityManager.updateDeviceProfile(profile);
   }
   queryDevices() {
-    return new Stream12(({ next }) => {
+    return new Stream11(({ next }) => {
       const update = () => {
         const deviceKeys = this._identityManager.identity?.authorizedDeviceKeys;
         if (!deviceKeys) {
@@ -9005,8 +8527,8 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
-          invariant25(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file30,
+          invariant23(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file28,
             L: 37,
             S: this,
             A: [
@@ -9022,7 +8544,7 @@ var DevicesServiceImpl = class {
               if (isMe) {
                 presence = Device2.PresenceState.ONLINE;
               } else if (profile.os?.toUpperCase() === "EDGE") {
-                presence = this._edgeConnection?.status === EdgeStatus3.CONNECTED ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
+                presence = this._edgeConnection?.status.state === EdgeStatus3.ConnectionState.CONNECTED ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
               } else {
                 presence = peers.some((peer) => peer.identityKey.equals(key)) ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
               }
@@ -9070,33 +8592,22 @@ var DevicesServiceImpl = class {
       return () => subscriptions.clear();
     });
   }
-  constructor(_identityManager, _edgeConnection) {
-    _define_property31(this, "_identityManager", void 0);
-    _define_property31(this, "_edgeConnection", void 0);
-    this._identityManager = _identityManager;
-    this._edgeConnection = _edgeConnection;
-  }
 };
 
 // src/packlets/identity/contacts-service.ts
 import { SubscriptionList as SubscriptionList4, UpdateScheduler as UpdateScheduler2, scheduleTask as scheduleTask9 } from "@dxos/async";
-import { Stream as Stream13 } from "@dxos/codec-protobuf/stream";
+import { Stream as Stream12 } from "@dxos/codec-protobuf/stream";
 import { PublicKey as PublicKey17 } from "@dxos/keys";
 import { ComplexMap as ComplexMap5, ComplexSet as ComplexSet6 } from "@dxos/util";
-function _define_property32(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var ContactsServiceImpl = class {
+  _identityManager;
+  _spaceManager;
+  _dataSpaceManagerProvider;
+  constructor(_identityManager, _spaceManager, _dataSpaceManagerProvider) {
+    this._identityManager = _identityManager;
+    this._spaceManager = _spaceManager;
+    this._dataSpaceManagerProvider = _dataSpaceManagerProvider;
+  }
   async getContacts() {
     const identity = this._identityManager.identity;
     if (identity == null) {
@@ -9118,8 +8629,7 @@ var ContactsServiceImpl = class {
       }
       const existing = acc.get(memberInfo.key);
       if (existing != null) {
-        var _existing;
-        (_existing = existing).profile ?? (_existing.profile = memberInfo.profile);
+        existing.profile ??= memberInfo.profile;
         existing.commonSpaces?.push(spaceKey);
       } else {
         acc.set(memberInfo.key, {
@@ -9140,7 +8650,7 @@ var ContactsServiceImpl = class {
   }
   queryContacts() {
     const subscribedSpaceKeySet = new ComplexSet6(PublicKey17.hash);
-    return new Stream13(({ next, ctx }) => {
+    return new Stream12(({ next, ctx }) => {
       const pushUpdateTask = new UpdateScheduler2(ctx, async () => {
         const contacts = await this.getContacts();
         next(contacts);
@@ -9168,43 +8678,25 @@ var ContactsServiceImpl = class {
       });
     });
   }
-  constructor(_identityManager, _spaceManager, _dataSpaceManagerProvider) {
-    _define_property32(this, "_identityManager", void 0);
-    _define_property32(this, "_spaceManager", void 0);
-    _define_property32(this, "_dataSpaceManagerProvider", void 0);
-    this._identityManager = _identityManager;
-    this._spaceManager = _spaceManager;
-    this._dataSpaceManagerProvider = _dataSpaceManagerProvider;
-  }
 };
 
 // src/packlets/logging/logging-service.ts
 import { Event as Event10 } from "@dxos/async";
-import { Stream as Stream14 } from "@dxos/codec-protobuf/stream";
+import { Stream as Stream13 } from "@dxos/codec-protobuf/stream";
 import { PublicKey as PublicKey18 } from "@dxos/keys";
-import { getContextFromEntry, log as log26 } from "@dxos/log";
+import { getContextFromEntry, log as log24 } from "@dxos/log";
 import { QueryLogsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { getDebugName, jsonify, numericalValues, tracer } from "@dxos/util";
-function _define_property33(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var LoggingServiceImpl = class {
+  _logs = new Event10();
+  _started = Date.now();
+  _sessionId = PublicKey18.random().toHex();
   async open() {
-    log26.runtimeConfig.processors.push(this._logProcessor);
+    log24.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = log26.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    log26.runtimeConfig.processors.splice(index, 1);
+    const index = log24.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    log24.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
@@ -9230,7 +8722,7 @@ var LoggingServiceImpl = class {
         stats: numericalValues(events, "duration")
       };
     };
-    return new Stream14(({ next }) => {
+    return new Stream13(({ next }) => {
       const update = () => {
         const metrics2 = {
           timestamp: /* @__PURE__ */ new Date(),
@@ -9252,7 +8744,7 @@ var LoggingServiceImpl = class {
     });
   }
   queryLogs(request) {
-    return new Stream14(({ ctx, next }) => {
+    return new Stream13(({ ctx, next }) => {
       const handler = (entry2) => {
         if (LOG_PROCESSING > 0) {
           return;
@@ -9289,14 +8781,9 @@ var LoggingServiceImpl = class {
       this._logs.on(ctx, handler);
     });
   }
-  constructor() {
-    _define_property33(this, "_logs", new Event10());
-    _define_property33(this, "_started", Date.now());
-    _define_property33(this, "_sessionId", PublicKey18.random().toHex());
-    _define_property33(this, "_logProcessor", (_config, entry2) => {
-      this._logs.emit(entry2);
-    });
-  }
+  _logProcessor = (_config, entry2) => {
+    this._logs.emit(entry2);
+  };
 };
 var matchFilter = (filter, level, path2, options) => {
   switch (options) {
@@ -9317,23 +8804,18 @@ var shouldLog = (entry2, request) => {
 var LOG_PROCESSING = 0;
 
 // src/packlets/network/network-service.ts
-import { Stream as Stream15 } from "@dxos/codec-protobuf/stream";
-function _define_property34(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+import { Stream as Stream14 } from "@dxos/codec-protobuf/stream";
 var NetworkServiceImpl = class {
+  networkManager;
+  signalManager;
+  edgeConnection;
+  constructor(networkManager, signalManager, edgeConnection) {
+    this.networkManager = networkManager;
+    this.signalManager = signalManager;
+    this.edgeConnection = edgeConnection;
+  }
   queryStatus() {
-    return new Stream15(({ ctx, next }) => {
+    return new Stream14(({ ctx, next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -9362,7 +8844,7 @@ var NetworkServiceImpl = class {
     return this.signalManager.query(request);
   }
   subscribeSwarmState(request) {
-    return new Stream15(({ ctx, next }) => {
+    return new Stream14(({ ctx, next }) => {
       this.signalManager.swarmState?.on(ctx, (state) => {
         if (request.topic.equals(state.swarmKey)) {
           next(state);
@@ -9374,7 +8856,7 @@ var NetworkServiceImpl = class {
     return this.signalManager.sendMessage(message);
   }
   subscribeMessages(peer) {
-    return new Stream15(({ ctx, next }) => {
+    return new Stream14(({ ctx, next }) => {
       this.signalManager.onMessage.on(ctx, (message) => {
         if (message.recipient.peerKey === peer.peerKey) {
           next(message);
@@ -9382,34 +8864,27 @@ var NetworkServiceImpl = class {
       });
     });
   }
-  constructor(networkManager, signalManager, edgeConnection) {
-    _define_property34(this, "networkManager", void 0);
-    _define_property34(this, "signalManager", void 0);
-    _define_property34(this, "edgeConnection", void 0);
-    this.networkManager = networkManager;
-    this.signalManager = signalManager;
-    this.edgeConnection = edgeConnection;
-  }
 };
 
 // src/packlets/system/system-service.ts
-import { Stream as Stream16 } from "@dxos/codec-protobuf/stream";
+import { Stream as Stream15 } from "@dxos/codec-protobuf/stream";
 import { GetDiagnosticsRequest as GetDiagnosticsRequest2 } from "@dxos/protocols/proto/dxos/client/services";
 import { jsonKeyReplacer as jsonKeyReplacer2 } from "@dxos/util";
-function _define_property35(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 var SystemServiceImpl = class {
+  _config;
+  _statusUpdate;
+  _getCurrentStatus;
+  _onUpdateStatus;
+  _onReset;
+  _getDiagnostics;
+  constructor({ config, statusUpdate, getDiagnostics, onUpdateStatus, getCurrentStatus, onReset }) {
+    this._config = config;
+    this._statusUpdate = statusUpdate;
+    this._getCurrentStatus = getCurrentStatus;
+    this._getDiagnostics = getDiagnostics;
+    this._onUpdateStatus = onUpdateStatus;
+    this._onReset = onReset;
+  }
   async getConfig() {
     return (await this._config?.())?.values ?? {};
   }
@@ -9434,7 +8909,7 @@ var SystemServiceImpl = class {
   }
   // TODO(burdon): Standardize interval option in stream request?
   queryStatus({ interval = 3e3 } = {}) {
-    return new Stream16(({ next }) => {
+    return new Stream15(({ next }) => {
       const update = () => {
         next({
           status: this._getCurrentStatus()
@@ -9452,44 +8927,102 @@ var SystemServiceImpl = class {
   async reset() {
     await this._onReset();
   }
-  constructor({ config, statusUpdate, getDiagnostics, onUpdateStatus, getCurrentStatus, onReset }) {
-    _define_property35(this, "_config", void 0);
-    _define_property35(this, "_statusUpdate", void 0);
-    _define_property35(this, "_getCurrentStatus", void 0);
-    _define_property35(this, "_onUpdateStatus", void 0);
-    _define_property35(this, "_onReset", void 0);
-    _define_property35(this, "_getDiagnostics", void 0);
-    this._config = config;
-    this._statusUpdate = statusUpdate;
-    this._getCurrentStatus = getCurrentStatus;
-    this._getDiagnostics = getDiagnostics;
-    this._onUpdateStatus = onUpdateStatus;
-    this._onReset = onReset;
-  }
 };
 
 // src/packlets/services/service-host.ts
-function _define_property36(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _ts_decorate11(decorators, target, key, desc) {
+function _ts_decorate9(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_file31 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file29 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
+  _resourceLock;
+  _serviceRegistry;
+  _systemService;
+  _loggingService;
+  _tracingService = TRACE_PROCESSOR3.createTraceSender();
+  _statusUpdate = new Event11();
+  _config;
+  _signalManager;
+  _networkManager;
+  _storage;
+  _level;
+  _callbacks;
+  _devtoolsProxy;
+  _edgeConnection = void 0;
+  _edgeHttpClient = void 0;
+  _serviceContext;
+  _runtime;
+  _runtimeProps;
+  diagnosticsBroadcastHandler;
+  _opening = false;
+  _open = false;
+  _resetting = false;
+  constructor({
+    config,
+    transportFactory,
+    signalManager,
+    storage,
+    level,
+    // TODO(wittjosiah): Turn this on by default.
+    lockKey,
+    callbacks,
+    runtime,
+    runtimeProps
+  }) {
+    this._storage = storage;
+    this._level = level;
+    this._callbacks = callbacks;
+    this._runtime = runtime;
+    this._runtimeProps = runtimeProps ?? {};
+    if (config) {
+      this.initialize({
+        config,
+        transportFactory,
+        signalManager
+      });
+    }
+    if (lockKey) {
+      this._resourceLock = new locks_exports.Lock({
+        lockKey,
+        onAcquire: () => {
+          if (!this._opening) {
+            void this.open(new Context11(void 0, {
+              F: __dxlog_file29,
+              L: 147
+            }));
+          }
+        },
+        onRelease: () => this.close()
+      });
+    }
+    this._systemService = new SystemServiceImpl({
+      config: () => this._config,
+      statusUpdate: this._statusUpdate,
+      getCurrentStatus: () => this.isOpen && !this._resetting ? SystemStatus.ACTIVE : SystemStatus.INACTIVE,
+      getDiagnostics: () => {
+        return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
+      },
+      onUpdateStatus: async (status) => {
+        if (!this.isOpen && status === SystemStatus.ACTIVE) {
+          await this._resourceLock?.acquire();
+        } else if (this.isOpen && status === SystemStatus.INACTIVE) {
+          await this._resourceLock?.release();
+        }
+      },
+      onReset: async () => {
+        await this.reset();
+      }
+    });
+    this.diagnosticsBroadcastHandler = (0, diagnostics_exports.createCollectDiagnosticsBroadcastHandler)(this._systemService);
+    this._loggingService = new LoggingServiceImpl();
+    this._serviceRegistry = new ServiceRegistry(clientServiceBundle, {
+      SystemService: this._systemService,
+      TracingService: this._tracingService
+    });
+  }
   get isOpen() {
     return this._open;
   }
@@ -9509,30 +9042,57 @@ var ClientServicesHost = class {
     return this._serviceRegistry.services;
   }
   /**
+  * Debugging util.
+  */
+  async exportSqliteDatabase() {
+    return await RuntimeProvider.runPromise(this._runtime)(Effect.gen(function* () {
+      const sql = yield* SqlExport.SqlExport;
+      return yield* sql.export;
+    }));
+  }
+  /**
+  * Debugging util.
+  */
+  async runSqliteQuery(query, params) {
+    return await RuntimeProvider.runPromise(this._runtime)(Effect.gen(function* () {
+      const sql = yield* SqlClient.SqlClient;
+      return yield* sql`${sql.unsafe(query, params)}`;
+    }));
+  }
+  /**
   * Initialize the service host with the config.
   * Config can also be provided in the constructor.
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    invariant26(!this._open, "service host is open", {
-      F: __dxlog_file31,
-      L: 209,
+    invariant24(!this._open, "service host is open", {
+      F: __dxlog_file29,
+      L: 237,
       S: this,
       A: [
         "!this._open",
         "'service host is open'"
       ]
     });
-    log27("initializing...", void 0, {
-      F: __dxlog_file31,
-      L: 210,
+    log25("initializing...", void 0, {
+      F: __dxlog_file29,
+      L: 238,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      invariant26(!this._config, "config already set", {
-        F: __dxlog_file31,
-        L: 213,
+      if (this._runtimeProps.disableP2pReplication === void 0) {
+        this._runtimeProps.disableP2pReplication = config?.get("runtime.client.disableP2pReplication", false);
+      }
+      if (this._runtimeProps.enableVectorIndexing === void 0) {
+        this._runtimeProps.enableVectorIndexing = config?.get("runtime.client.enableVectorIndexing", false);
+      }
+      if (this._runtimeProps.enableLocalQueues === void 0) {
+        this._runtimeProps.enableLocalQueues = config?.get("runtime.client.enableLocalQueues", false);
+      }
+      invariant24(!this._config, "config already set", {
+        F: __dxlog_file29,
+        L: 251,
         S: this,
         A: [
           "!this._config",
@@ -9559,9 +9119,9 @@ var ClientServicesHost = class {
       edgeConnection: this._edgeConnection
     }) : new WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    invariant26(!this._networkManager, "network manager already set", {
-      F: __dxlog_file31,
-      L: 244,
+    invariant24(!this._networkManager, "network manager already set", {
+      F: __dxlog_file29,
+      L: 282,
       S: this,
       A: [
         "!this._networkManager",
@@ -9577,9 +9137,9 @@ var ClientServicesHost = class {
         peerKey: this._edgeConnection.peerKey
       } : void 0
     });
-    log27("initialized", void 0, {
-      F: __dxlog_file31,
-      L: 257,
+    log25("initialized", void 0, {
+      F: __dxlog_file29,
+      L: 295,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9589,44 +9149,44 @@ var ClientServicesHost = class {
       return;
     }
     const traceId = PublicKey19.random().toHex();
-    log27.trace("dxos.client-services.host.open", trace11.begin({
+    log25.trace("dxos.client-services.host.open", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file31,
-      L: 268,
+      F: __dxlog_file29,
+      L: 306,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant26(this._config, "config not set", {
-      F: __dxlog_file31,
-      L: 270,
+    invariant24(this._config, "config not set", {
+      F: __dxlog_file29,
+      L: 308,
       S: this,
       A: [
         "this._config",
         "'config not set'"
       ]
     });
-    invariant26(this._storage, "storage not set", {
-      F: __dxlog_file31,
-      L: 271,
+    invariant24(this._storage, "storage not set", {
+      F: __dxlog_file29,
+      L: 309,
       S: this,
       A: [
         "this._storage",
         "'storage not set'"
       ]
     });
-    invariant26(this._signalManager, "signal manager not set", {
-      F: __dxlog_file31,
-      L: 272,
+    invariant24(this._signalManager, "signal manager not set", {
+      F: __dxlog_file29,
+      L: 310,
       S: this,
       A: [
         "this._signalManager",
         "'signal manager not set'"
       ]
     });
-    invariant26(this._networkManager, "network manager not set", {
-      F: __dxlog_file31,
-      L: 273,
+    invariant24(this._networkManager, "network manager not set", {
+      F: __dxlog_file29,
+      L: 311,
       S: this,
       A: [
         "this._networkManager",
@@ -9634,11 +9194,11 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    log27("opening...", {
+    log25("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file31,
-      L: 276,
+      F: __dxlog_file29,
+      L: 314,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9648,7 +9208,7 @@ var ClientServicesHost = class {
     }
     await this._level.open();
     await this._loggingService.open();
-    this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._edgeConnection, this._edgeHttpClient, this._runtimeParams, this._config.get("runtime.client.edgeFeatures"));
+    this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._edgeConnection, this._edgeHttpClient, this._runtime, this._runtimeProps, this._config.get("runtime.client.edgeFeatures"));
     const dataSpaceManagerProvider = async () => {
       await this._serviceContext.initialized.wait();
       return this._serviceContext.dataSpaceManager;
@@ -9667,6 +9227,7 @@ var ClientServicesHost = class {
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, dataSpaceManagerProvider),
       DataService: this._serviceContext.echoHost.dataService,
       QueryService: this._serviceContext.echoHost.queryService,
+      QueueService: this._serviceContext.echoHost.queuesService,
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager, this._edgeConnection),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
@@ -9695,19 +9256,19 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log27("opened", {
+    log25("opened", {
       deviceKey
     }, {
-      F: __dxlog_file31,
-      L: 377,
+      F: __dxlog_file29,
+      L: 417,
       S: this,
       C: (f, a) => f(...a)
     });
-    log27.trace("dxos.client-services.host.open", trace11.end({
+    log25.trace("dxos.client-services.host.open", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file31,
-      L: 378,
+      F: __dxlog_file29,
+      L: 418,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9717,11 +9278,11 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    log27("closing...", {
+    log25("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file31,
-      L: 389,
+      F: __dxlog_file29,
+      L: 429,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9735,46 +9296,58 @@ var ClientServicesHost = class {
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    log27("closed", {
+    log25("closed", {
       deviceKey
     }, {
-      F: __dxlog_file31,
-      L: 398,
+      F: __dxlog_file29,
+      L: 438,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
     const traceId = PublicKey19.random().toHex();
-    log27.trace("dxos.sdk.client-services-host.reset", trace11.begin({
+    log25.trace("dxos.sdk.client-services-host.reset", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file31,
-      L: 403,
+      F: __dxlog_file29,
+      L: 443,
       S: this,
       C: (f, a) => f(...a)
     });
-    log27.info("resetting...", void 0, {
-      F: __dxlog_file31,
-      L: 405,
+    log25.info("resetting...", void 0, {
+      F: __dxlog_file29,
+      L: 445,
       S: this,
       C: (f, a) => f(...a)
     });
     this._resetting = true;
     this._statusUpdate.emit();
     await this._serviceContext?.close();
+    try {
+      await this._level.clear();
+    } catch (err) {
+      log25.warn("failed to clear leveldb during reset", {
+        err
+      }, {
+        F: __dxlog_file29,
+        L: 455,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     await this._storage.reset();
-    log27.info("reset", void 0, {
-      F: __dxlog_file31,
-      L: 412,
+    log25.info("reset", void 0, {
+      F: __dxlog_file29,
+      L: 458,
       S: this,
       C: (f, a) => f(...a)
     });
-    log27.trace("dxos.sdk.client-services-host.reset", trace11.end({
+    log25.trace("dxos.sdk.client-services-host.reset", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file31,
-      L: 413,
+      F: __dxlog_file29,
+      L: 459,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9785,113 +9358,25 @@ var ClientServicesHost = class {
     await this._serviceContext.initialized.wait();
     return identity;
   }
-  constructor({
-    config,
-    transportFactory,
-    signalManager,
-    storage,
-    level,
-    // TODO(wittjosiah): Turn this on by default.
-    lockKey,
-    callbacks,
-    runtimeParams
-  } = {}) {
-    _define_property36(this, "_resourceLock", void 0);
-    _define_property36(this, "_serviceRegistry", void 0);
-    _define_property36(this, "_systemService", void 0);
-    _define_property36(this, "_loggingService", void 0);
-    _define_property36(this, "_tracingService", TRACE_PROCESSOR3.createTraceSender());
-    _define_property36(this, "_statusUpdate", new Event11());
-    _define_property36(this, "_config", void 0);
-    _define_property36(this, "_signalManager", void 0);
-    _define_property36(this, "_networkManager", void 0);
-    _define_property36(this, "_storage", void 0);
-    _define_property36(this, "_level", void 0);
-    _define_property36(this, "_callbacks", void 0);
-    _define_property36(this, "_devtoolsProxy", void 0);
-    _define_property36(this, "_edgeConnection", void 0);
-    _define_property36(this, "_edgeHttpClient", void 0);
-    _define_property36(this, "_serviceContext", void 0);
-    _define_property36(this, "_runtimeParams", void 0);
-    _define_property36(this, "diagnosticsBroadcastHandler", void 0);
-    _define_property36(this, "_opening", false);
-    _define_property36(this, "_open", false);
-    _define_property36(this, "_resetting", false);
-    this._storage = storage;
-    this._level = level;
-    this._callbacks = callbacks;
-    this._runtimeParams = runtimeParams ?? {};
-    if (this._runtimeParams.disableP2pReplication === void 0) {
-      this._runtimeParams.disableP2pReplication = config?.get("runtime.client.disableP2pReplication", false);
-    }
-    if (this._runtimeParams.enableVectorIndexing === void 0) {
-      this._runtimeParams.enableVectorIndexing = config?.get("runtime.client.enableVectorIndexing", false);
-    }
-    if (config) {
-      this.initialize({
-        config,
-        transportFactory,
-        signalManager
-      });
-    }
-    if (lockKey) {
-      this._resourceLock = new Lock({
-        lockKey,
-        onAcquire: () => {
-          if (!this._opening) {
-            void this.open(new Context11(void 0, {
-              F: __dxlog_file31,
-              L: 143
-            }));
-          }
-        },
-        onRelease: () => this.close()
-      });
-    }
-    this._systemService = new SystemServiceImpl({
-      config: () => this._config,
-      statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen && !this._resetting ? SystemStatus.ACTIVE : SystemStatus.INACTIVE,
-      getDiagnostics: () => {
-        return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
-      },
-      onUpdateStatus: async (status) => {
-        if (!this.isOpen && status === SystemStatus.ACTIVE) {
-          await this._resourceLock?.acquire();
-        } else if (this.isOpen && status === SystemStatus.INACTIVE) {
-          await this._resourceLock?.release();
-        }
-      },
-      onReset: async () => {
-        await this.reset();
-      }
-    });
-    this.diagnosticsBroadcastHandler = createCollectDiagnosticsBroadcastHandler(this._systemService);
-    this._loggingService = new LoggingServiceImpl();
-    this._serviceRegistry = new ServiceRegistry(clientServiceBundle, {
-      SystemService: this._systemService,
-      TracingService: this._tracingService
-    });
-  }
 };
-_ts_decorate11([
+_ts_decorate9([
   Trace4.info()
 ], ClientServicesHost.prototype, "_opening", void 0);
-_ts_decorate11([
+_ts_decorate9([
   Trace4.info()
 ], ClientServicesHost.prototype, "_open", void 0);
-_ts_decorate11([
+_ts_decorate9([
   Trace4.info()
 ], ClientServicesHost.prototype, "_resetting", void 0);
-_ts_decorate11([
+_ts_decorate9([
   synchronized4,
   Trace4.span()
 ], ClientServicesHost.prototype, "open", null);
-_ts_decorate11([
+_ts_decorate9([
   synchronized4,
   Trace4.span()
 ], ClientServicesHost.prototype, "close", null);
-ClientServicesHost = _ts_decorate11([
+ClientServicesHost = _ts_decorate9([
   Trace4.resource()
 ], ClientServicesHost);
 
@@ -9907,9 +9392,8 @@ export {
   DevtoolsHostEvents,
   DevtoolsServiceImpl,
   createDiagnostics,
-  createCollectDiagnosticsBroadcastSender,
-  createCollectDiagnosticsBroadcastHandler,
   DiagnosticsCollector,
+  diagnostics_exports,
   createAuthProvider,
   TrustedKeySetAuthVerifier,
   EdgeFeedReplicator,
@@ -9925,19 +9409,13 @@ export {
   InvitationsServiceImpl,
   SpaceInvitationProtocol,
   InvitationsManager,
-  Lock,
-  isLocked,
-  ClientRpcServer,
+  locks_exports,
   EdgeAgentManager,
   EdgeAgentServiceImpl,
   ServiceContext,
   createStorageObjects,
   createLevel,
-  encodeProfileArchive,
-  decodeProfileArchive,
-  exportProfileData,
-  importProfileData,
   ServiceRegistry,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-MDSLKO5V.mjs.map
+//# sourceMappingURL=chunk-2ZEVKBWH.mjs.map