@dxos/client-services 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

package/dist/lib/node-esm/{chunk-AADRC6MD.mjs → chunk-7NQQ5F2Q.mjs}

@@ -274,25 +274,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 +384,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 +396,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.5ea62a8";
+var DXOS_VERSION = "0.8.4-main.66e292d";
 
 // src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -586,21 +571,9 @@ 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 +594,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);
@@ -638,19 +610,6 @@ 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 +623,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 +724,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 +739,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 +812,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 +877,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 +1226,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
@@ -1323,15 +1275,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 { Type } from "@dxos/echo";
+import { getTypeReference } from "@dxos/echo/internal";
 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 { 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 +1365,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 +1376,61 @@ 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;
+  _runtimeParams = 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._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.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 +1443,7 @@ var DataSpaceManager = class extends Resource2 {
   async _open() {
     log4("open", void 0, {
       F: __dxlog_file6,
-      L: 216,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1456,7 +1451,7 @@ var DataSpaceManager = class extends Resource2 {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 217,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1464,7 +1459,7 @@ var DataSpaceManager = class extends Resource2 {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file6,
-      L: 218,
+      L: 219,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1474,7 +1469,7 @@ var DataSpaceManager = class extends Resource2 {
           spaceMetadata
         }, {
           F: __dxlog_file6,
-          L: 222,
+          L: 223,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1485,7 +1480,7 @@ var DataSpaceManager = class extends Resource2 {
           err
         }, {
           F: __dxlog_file6,
-          L: 225,
+          L: 226,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1496,7 +1491,7 @@ var DataSpaceManager = class extends Resource2 {
       id: this._instanceId
     }), {
       F: __dxlog_file6,
-      L: 231,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1504,7 +1499,7 @@ var DataSpaceManager = class extends Resource2 {
   async _close() {
     log4("close", void 0, {
       F: __dxlog_file6,
-      L: 236,
+      L: 237,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1517,7 +1512,7 @@ var DataSpaceManager = class extends Resource2 {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace(options = {}) {
-    assertArgument(!!options.rootUrl === !!options.documents, "root url must be required when providing documents");
+    assertArgument(!!options.rootUrl === !!options.documents, "options", "root url must be required when providing documents");
     assertState(this._lifecycleState === LifecycleState.OPEN, "Not open.");
     const spaceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
@@ -1535,7 +1530,7 @@ var DataSpaceManager = class extends Resource2 {
       spaceKey
     }, {
       F: __dxlog_file6,
-      L: 265,
+      L: 270,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1543,7 +1538,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: 270,
+        L: 275,
         S: this,
         A: [
           "Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId))",
@@ -1555,13 +1550,18 @@ var DataSpaceManager = class extends Resource2 {
           documentId
         }, {
           F: __dxlog_file6,
-          L: 277,
+          L: 282,
           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 +1569,7 @@ var DataSpaceManager = class extends Resource2 {
       spaceKey
     }, {
       F: __dxlog_file6,
-      L: 284,
+      L: 300,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1578,18 +1578,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: 289
+        L: 305
       }), 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: 297,
+      L: 314,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1599,7 +1600,7 @@ var DataSpaceManager = class extends Resource2 {
       spaceKey
     }, {
       F: __dxlog_file6,
-      L: 302,
+      L: 319,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1608,7 +1609,7 @@ var DataSpaceManager = class extends Resource2 {
     const memberCredential = credentials[1];
     invariant3(getCredentialAssertion(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file6,
-      L: 308,
+      L: 325,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -1622,7 +1623,7 @@ var DataSpaceManager = class extends Resource2 {
       spaceKey
     }, {
       F: __dxlog_file6,
-      L: 313,
+      L: 330,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1640,13 +1641,13 @@ var DataSpaceManager = class extends Resource2 {
             spaceId: space.id
           }, {
             F: __dxlog_file6,
-            L: 326,
+            L: 343,
             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 +1659,7 @@ var DataSpaceManager = class extends Resource2 {
           spaceId: space.id
         }, {
           F: __dxlog_file6,
-          L: 337,
+          L: 357,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1670,7 +1671,7 @@ var DataSpaceManager = class extends Resource2 {
     const document = await this._getSpaceRootDocument(space);
     const properties = {
       system: {
-        type: encodeReference(getTypeReference(PropertiesType))
+        type: encodeReference(getTypeReference(SpaceProperties))
       },
       data: {
         [DEFAULT_SPACE_KEY]: this._signingContext.identityKey.toHex()
@@ -1693,7 +1694,7 @@ var DataSpaceManager = class extends Resource2 {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant3(automergeIndex, void 0, {
       F: __dxlog_file6,
-      L: 370,
+      L: 390,
       S: this,
       A: [
         "automergeIndex",
@@ -1710,13 +1711,13 @@ var DataSpaceManager = class extends Resource2 {
       opts
     }, {
       F: __dxlog_file6,
-      L: 379,
+      L: 399,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant3(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file6,
-      L: 380,
+      L: 400,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1725,7 +1726,7 @@ var DataSpaceManager = class extends Resource2 {
     });
     invariant3(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file6,
-      L: 381,
+      L: 401,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -1749,7 +1750,7 @@ var DataSpaceManager = class extends Resource2 {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     invariant3(space, void 0, {
       F: __dxlog_file6,
-      L: 401,
+      L: 421,
       S: this,
       A: [
         "space",
@@ -1762,7 +1763,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: 420,
+      L: 440,
       S: this,
       A: [
         "credentials[0].credential",
@@ -1772,7 +1773,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: 422,
+      L: 442,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -1810,7 +1811,7 @@ var DataSpaceManager = class extends Resource2 {
     const space = this._spaces.get(spaceKey);
     invariant3(space, "Space not found.", {
       F: __dxlog_file6,
-      L: 459,
+      L: 479,
       S: this,
       A: [
         "space",
@@ -1835,7 +1836,7 @@ var DataSpaceManager = class extends Resource2 {
       metadata
     }, {
       F: __dxlog_file6,
-      L: 478,
+      L: 498,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1879,7 +1880,7 @@ var DataSpaceManager = class extends Resource2 {
             err
           }, {
             F: __dxlog_file6,
-            L: 520,
+            L: 540,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1889,7 +1890,7 @@ var DataSpaceManager = class extends Resource2 {
       onAuthFailure: () => {
         log4.warn("auth failure", void 0, {
           F: __dxlog_file6,
-          L: 525,
+          L: 545,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1922,7 +1923,7 @@ var DataSpaceManager = class extends Resource2 {
             space: space.key
           }, {
             F: __dxlog_file6,
-            L: 552,
+            L: 572,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1933,7 +1934,7 @@ var DataSpaceManager = class extends Resource2 {
             open: this._lifecycleState === LifecycleState.OPEN
           }, {
             F: __dxlog_file6,
-            L: 555,
+            L: 575,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1952,7 +1953,7 @@ var DataSpaceManager = class extends Resource2 {
             space: space.key
           }, {
             F: __dxlog_file6,
-            L: 563,
+            L: 583,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1973,7 +1974,7 @@ var DataSpaceManager = class extends Resource2 {
           spaceId: dataSpace.id
         }, {
           F: __dxlog_file6,
-          L: 577,
+          L: 597,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2003,7 +2004,7 @@ var DataSpaceManager = class extends Resource2 {
         space: space.key
       }, {
         F: __dxlog_file6,
-        L: 604,
+        L: 624,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2036,7 +2037,7 @@ var DataSpaceManager = class extends Resource2 {
       closedSessions
     }, {
       F: __dxlog_file6,
-      L: 630,
+      L: 650,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2051,7 +2052,7 @@ var DataSpaceManager = class extends Resource2 {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file6,
-          L: 644,
+          L: 664,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2094,45 +2095,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 +2129,12 @@ 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;
-}
 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");
   }
@@ -2195,13 +2148,13 @@ var SpaceArchiveWriter = class extends Resource3 {
     this._archive = new this._tar.Archive();
   }
   async setCurrentRootUrl(url) {
-    assertArgument2(url.startsWith("automerge:"), "Invalid root URL");
+    assertArgument2(url.startsWith("automerge:"), "url", "Invalid root URL");
     assertState2(this._tar, "Not open");
     assertState2(this._meta, "Not started");
     this._currentRootUrl = url;
   }
   async writeDocument(documentId, data) {
-    assertArgument2(!documentId.startsWith("automerge:"), "Invalid document ID");
+    assertArgument2(!documentId.startsWith("automerge:"), "documentId", "Invalid document ID");
     assertState2(this._archive, "Not open");
     this._archive.addBinaryFile(`${SpaceArchiveFileStructure.documents}/${documentId}.bin`, data);
   }
@@ -2221,13 +2174,11 @@ var SpaceArchiveWriter = class extends Resource3 {
     this._archive.addTextFile(SpaceArchiveFileStructure.metadata, JSON.stringify(metadata));
     const binary = this._archive.toUint8Array();
     return {
-      filename: `${this._meta.spaceId}.tar`,
+      // TODO(wittjosiah): Factor out file name construction.
+      filename: `${(/* @__PURE__ */ new Date()).toISOString()}-${this._meta.spaceId}.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
@@ -2239,7 +2190,7 @@ var extractSpaceArchive = async (archive) => {
   const { Archive } = await import("@obsidize/tar-browserify");
   const { entries } = await Archive.extract(archive.contents);
   const metadataEntry = entries.find((entry2) => entry2.fileName === SpaceArchiveFileStructure2.metadata);
-  assertArgument3(metadataEntry, "Metadata entry not found");
+  assertArgument3(metadataEntry, "metadataEntry", "Metadata entry not found");
   const metadata = JSON.parse(metadataEntry.getContentAsText());
   const documents = {};
   for (const entry2 of entries.filter((entry3) => entry3.fileName.startsWith(`${SpaceArchiveFileStructure2.documents}/`))) {
@@ -2255,7 +2206,7 @@ var extractSpaceArchive = async (archive) => {
     });
     documents[documentId] = entry2.content ?? failedInvariant2();
   }
-  log5.info("extracted space archive", {
+  log5("extracted space archive", {
     metadata,
     documents
   }, {
@@ -2271,19 +2222,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 +2289,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 +2316,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 +2332,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 +2353,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 +2371,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 +2463,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 +2472,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 +2482,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())",
@@ -2585,7 +2536,7 @@ var SpacesServiceImpl = class {
     };
     try {
       const writer = _ts_add_disposable_resource2(env, await new SpaceArchiveWriter().open(), true);
-      assertArgument4(SpaceId.isValid(request.spaceId), "Invalid space ID");
+      assertArgument4(SpaceId.isValid(request.spaceId), "spaceId", "Invalid space ID");
       const dataSpaceManager = await this._getDataSpaceManager();
       const space = dataSpaceManager.getSpaceById(request.spaceId) ?? raise(new Error("Space not found"));
       await writer.begin({
@@ -2614,7 +2565,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 +2585,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 +2595,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 +2664,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 +2681,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 +2688,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 +2730,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,6 +2741,58 @@ 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 {
+  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;
@@ -2981,61 +2952,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 +2981,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 +2991,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 +3446,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 +3465,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 +3651,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 +3696,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
@@ -3871,19 +3762,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 +3777,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 +4154,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 +4168,7 @@ var handleEdgeError = (error) => {
     });
   } else {
     log11.info("Edge notarization failure", {
-      reason: error.reason
+      message: error.message
     }, {
       F: __dxlog_file14,
       L: 398,
@@ -4290,6 +4178,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 +4206,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 +4282,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: 101
+  });
+  _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: 177,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
   get id() {
     return this._inner.id;
   }
@@ -4559,7 +4504,9 @@ 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", {
@@ -4892,74 +4839,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 +4897,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 +4961,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 +5020,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 +5074,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 +5232,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 +5243,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 +5334,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 +5365,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 +5385,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 +5671,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 +5721,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 +5832,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 +5912,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;
+  _connectionParams;
+  /**
+  * @internal
+  */
+  constructor(_networkManager, _edgeClient, _connectionParams) {
+    this._networkManager = _networkManager;
+    this._edgeClient = _edgeClient;
+    this._connectionParams = _connectionParams;
+  }
   handleInvitationFlow(ctx, stream, protocol, invitation) {
     log18.verbose("dxos.sdk.invitations-handler.handleInvitationFlow", {
       state: invitation.state,
@@ -6655,22 +6500,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 +6522,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 +6618,6 @@ var InvitationsServiceImpl = class {
       });
     });
   }
-  constructor(_invitationsManager) {
-    _define_property21(this, "_invitationsManager", void 0);
-    this._invitationsManager = _invitationsManager;
-  }
 };
 
 // src/packlets/invitations/space-invitation-protocol.ts
@@ -6805,21 +6628,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 +6649,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 +6677,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 +6693,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 +6705,7 @@ var SpaceInvitationProtocol = class {
       guest: request.space.deviceKey
     }, {
       F: __dxlog_file23,
-      L: 82,
+      L: 76,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6903,7 +6727,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 +6737,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 +6747,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 +6760,7 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file23,
-      L: 109,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6951,7 +6775,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant18(credential.credential, void 0, {
       F: __dxlog_file23,
-      L: 127,
+      L: 121,
       S: this,
       A: [
         "credential.credential",
@@ -6966,7 +6790,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 +6799,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 +6809,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 +6821,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 +6841,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 +6871,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 +6882,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 +6891,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 +6899,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 +6914,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 +6927,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,51 +7289,12 @@ 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
 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;
-}
 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);
@@ -7518,6 +7303,15 @@ function _ts_decorate7(decorators, target, key, desc) {
 }
 var __dxlog_file25 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/locks/node.ts";
 var Lock = class {
+  _lockPath;
+  _onAcquire;
+  _onRelease;
+  _fileHandle;
+  constructor({ lockKey: lockPath, onAcquire, onRelease }) {
+    this._lockPath = lockPath;
+    this._onAcquire = onAcquire;
+    this._onRelease = onRelease;
+  }
   get lockKey() {
     return this._lockPath;
   }
@@ -7550,15 +7344,6 @@ var Lock = class {
     });
     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
@@ -7570,19 +7355,6 @@ 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);
@@ -7590,33 +7362,16 @@ function _ts_decorate8(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var ClientRpcServer = class {
+  _serviceRegistry;
+  _rpcPeer;
+  _handlerCache = /* @__PURE__ */ new Map();
+  _handleCall;
+  _handleStream;
+  _callMetrics = new MapCounter();
   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;
@@ -7648,6 +7403,23 @@ var ClientRpcServer = class {
       }
     });
   }
+  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);
+  }
 };
 _ts_decorate8([
   trace9.metricsCounter()
@@ -7668,19 +7440,6 @@ 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);
@@ -7692,6 +7451,18 @@ 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;
   }
@@ -7900,9 +7671,6 @@ var EdgeAgentManager = class extends Resource7 {
       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([
   synchronized3
@@ -7912,26 +7680,27 @@ _ts_decorate9([
 import { Stream as Stream11 } 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 }) => {
       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);
@@ -7958,12 +7727,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) {
@@ -8005,21 +7768,18 @@ import { log as log23 } 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 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, {
@@ -8212,16 +7972,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,19 +7980,6 @@ 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) {
   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);
@@ -8316,21 +8053,104 @@ function _ts_dispose_resources4(env) {
 }
 var __dxlog_file28 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource8 {
-  async _open(ctx) {
-    await this._checkStorageVersion();
-    log24("opening...", void 0, {
-      F: __dxlog_file28,
-      L: 204,
-      S: this,
-      C: (f, a) => f(...a)
-    });
-    log24.trace("dxos.sdk.service-context.open", trace10.begin({
-      id: this._instanceId
-    }), {
-      F: __dxlog_file28,
-      L: 205,
-      S: this,
-      C: (f, a) => f(...a)
+  storage;
+  level;
+  networkManager;
+  signalManager;
+  _edgeConnection;
+  _edgeHttpClient;
+  _runtimeParams;
+  _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, _runtimeParams, _edgeFeatures) {
+    super(), 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.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
+      });
+    }
+  }
+  async _open(ctx) {
+    await this._checkStorageVersion();
+    log24("opening...", void 0, {
+      F: __dxlog_file28,
+      L: 204,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log24.trace("dxos.sdk.service-context.open", trace10.begin({
+      id: this._instanceId
+    }), {
+      F: __dxlog_file28,
+      L: 205,
+      S: this,
+      C: (f, a) => f(...a)
     });
     await this.identityManager.open(ctx);
     await this._setNetworkIdentity();
@@ -8618,62 +8438,6 @@ 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([
   Trace3.span()
@@ -8709,16 +8473,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({
@@ -8920,20 +8692,14 @@ var importProfileData = async ({ storage, level }, archive) => {
 };
 
 // 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,13 +8715,6 @@ 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
@@ -8978,21 +8737,14 @@ import { SubscriptionList as SubscriptionList3 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf/stream";
 import { invariant as invariant25 } 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 DevicesServiceImpl = class {
+  _identityManager;
+  _edgeConnection;
+  constructor(_identityManager, _edgeConnection) {
+    this._identityManager = _identityManager;
+    this._edgeConnection = _edgeConnection;
+  }
   async updateDevice(profile) {
     return this._identityManager.updateDeviceProfile(profile);
   }
@@ -9022,7 +8774,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,12 +8822,6 @@ 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
@@ -9083,20 +8829,15 @@ import { SubscriptionList as SubscriptionList4, UpdateScheduler as UpdateSchedul
 import { Stream as Stream13 } 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 +8859,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, {
@@ -9168,14 +8908,6 @@ 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
@@ -9185,20 +8917,10 @@ import { PublicKey as PublicKey18 } from "@dxos/keys";
 import { getContextFromEntry, log as log26 } 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);
   }
@@ -9289,14 +9011,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) {
@@ -9318,20 +9035,15 @@ 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;
-}
 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 }) => {
       const update = () => {
@@ -9382,34 +9094,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 { 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 ?? {};
   }
@@ -9452,36 +9157,9 @@ 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) {
   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);
@@ -9490,6 +9168,94 @@ function _ts_decorate11(decorators, target, key, desc) {
 }
 var __dxlog_file31 = "/__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;
+  _runtimeParams;
+  diagnosticsBroadcastHandler;
+  _opening = false;
+  _open = false;
+  _resetting = false;
+  constructor({
+    config,
+    transportFactory,
+    signalManager,
+    storage,
+    level,
+    // TODO(wittjosiah): Turn this on by default.
+    lockKey,
+    callbacks,
+    runtimeParams
+  } = {}) {
+    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
+    });
+  }
   get isOpen() {
     return this._open;
   }
@@ -9763,10 +9529,22 @@ var ClientServicesHost = class {
     this._resetting = true;
     this._statusUpdate.emit();
     await this._serviceContext?.close();
+    try {
+      await this._level.clear();
+    } catch (err) {
+      log27.warn("failed to clear leveldb during reset", {
+        err
+      }, {
+        F: __dxlog_file31,
+        L: 415,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
     await this._storage.reset();
     log27.info("reset", void 0, {
       F: __dxlog_file31,
-      L: 412,
+      L: 418,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9774,7 +9552,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 413,
+      L: 419,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9785,94 +9563,6 @@ 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([
   Trace4.info()
@@ -9940,4 +9630,4 @@ export {
   ServiceRegistry,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-AADRC6MD.mjs.map
+//# sourceMappingURL=chunk-7NQQ5F2Q.mjs.map