@dxos/client-services 0.8.1 → 0.8.2-main.10c050d

package/dist/lib/node/{chunk-A2WCOW6P.cjs → chunk-LYHT7662.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_A2WCOW6P_exports = {};
-__export(chunk_A2WCOW6P_exports, {
+var chunk_LYHT7662_exports = {};
+__export(chunk_LYHT7662_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,7 +72,7 @@ __export(chunk_A2WCOW6P_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_A2WCOW6P_exports);
+module.exports = __toCommonJS(chunk_LYHT7662_exports);
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_feed_store = require("@dxos/feed-store");
@@ -116,9 +116,10 @@ var import_log3 = require("@dxos/log");
 var import_protocols2 = require("@dxos/protocols");
 var import_buf = require("@dxos/protocols/buf");
 var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
+var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util3 = require("@dxos/util");
+var import_automerge = require("@automerge/automerge");
 var import_async7 = require("@dxos/async");
-var import_automerge = require("@dxos/automerge/automerge");
 var import_client_protocol2 = require("@dxos/client-protocol");
 var import_context4 = require("@dxos/context");
 var import_debug = require("@dxos/debug");
@@ -128,7 +129,7 @@ var import_invariant3 = require("@dxos/invariant");
 var import_keys4 = require("@dxos/keys");
 var import_log4 = require("@dxos/log");
 var import_protocols3 = require("@dxos/protocols");
-var import_services4 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials3 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe = require("@dxos/timeframe");
 var import_tracing3 = require("@dxos/tracing");
@@ -137,7 +138,7 @@ var import_async8 = require("@dxos/async");
 var import_context5 = require("@dxos/context");
 var import_credentials4 = require("@dxos/credentials");
 var import_invariant4 = require("@dxos/invariant");
-var import_services5 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async9 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
 var import_credentials5 = require("@dxos/credentials");
@@ -162,8 +163,8 @@ var import_util6 = require("@dxos/util");
 var import_credentials8 = require("@dxos/credentials");
 var import_keys7 = require("@dxos/keys");
 var import_log7 = require("@dxos/log");
+var import_automerge_repo = require("@automerge/automerge-repo");
 var import_async11 = require("@dxos/async");
-var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_client_protocol4 = require("@dxos/client-protocol");
 var import_context7 = require("@dxos/context");
 var import_credentials9 = require("@dxos/credentials");
@@ -175,7 +176,7 @@ var import_invariant7 = require("@dxos/invariant");
 var import_keys8 = require("@dxos/keys");
 var import_log8 = require("@dxos/log");
 var import_protocols5 = require("@dxos/protocols");
-var import_services6 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
 var import_metadata = require("@dxos/protocols/proto/dxos/echo/metadata");
 var import_credentials10 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_teleport_extension_gossip = require("@dxos/teleport-extension-gossip");
@@ -194,7 +195,7 @@ var import_invariant8 = require("@dxos/invariant");
 var import_keys9 = require("@dxos/keys");
 var import_log9 = require("@dxos/log");
 var import_protocols6 = require("@dxos/protocols");
-var import_services7 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing6 = require("@dxos/tracing");
 var import_context8 = require("@dxos/context");
 var import_invariant9 = require("@dxos/invariant");
@@ -210,7 +211,7 @@ var import_invariant11 = require("@dxos/invariant");
 var import_keys10 = require("@dxos/keys");
 var import_log11 = require("@dxos/log");
 var import_protocols9 = require("@dxos/protocols");
-var import_services8 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials15 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_teleport_extension_gossip2 = require("@dxos/teleport-extension-gossip");
 var import_timeframe4 = require("@dxos/timeframe");
@@ -222,12 +223,12 @@ var import_context10 = require("@dxos/context");
 var import_credentials16 = require("@dxos/credentials");
 var import_invariant12 = require("@dxos/invariant");
 var import_log12 = require("@dxos/log");
-var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util9 = require("@dxos/util");
 var import_credentials17 = require("@dxos/credentials");
 var import_invariant13 = require("@dxos/invariant");
 var import_protocols10 = require("@dxos/protocols");
-var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async15 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context11 = require("@dxos/context");
@@ -237,7 +238,7 @@ var import_keys11 = require("@dxos/keys");
 var import_log13 = require("@dxos/log");
 var import_network_manager = require("@dxos/network-manager");
 var import_protocols11 = require("@dxos/protocols");
-var import_services11 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_invitations2 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_tracing8 = require("@dxos/tracing");
@@ -249,9 +250,9 @@ var import_keys12 = require("@dxos/keys");
 var import_log14 = require("@dxos/log");
 var import_protocols12 = require("@dxos/protocols");
 var import_proto3 = require("@dxos/protocols/proto");
-var import_services12 = require("@dxos/protocols/proto/dxos/client/services");
-var import_context12 = require("@dxos/context");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
+var import_context12 = require("@dxos/context");
+var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async17 = require("@dxos/async");
 var import_context13 = require("@dxos/context");
 var import_invariant16 = require("@dxos/invariant");
@@ -268,26 +269,26 @@ var import_keys13 = require("@dxos/keys");
 var import_log16 = require("@dxos/log");
 var import_protocols14 = require("@dxos/protocols");
 var import_proto5 = require("@dxos/protocols/proto");
-var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invitations4 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_teleport3 = require("@dxos/teleport");
 var import_async19 = require("@dxos/async");
 var import_log17 = require("@dxos/log");
-var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
 var import_invariant18 = require("@dxos/invariant");
 var import_keys14 = require("@dxos/keys");
 var import_log18 = require("@dxos/log");
 var import_invitations5 = require("@dxos/protocols/proto/dxos/halo/invitations");
 var import_util11 = require("@dxos/util");
 var import_stream9 = require("@dxos/codec-protobuf/stream");
-var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing9 = require("@dxos/tracing");
 var import_credentials18 = require("@dxos/credentials");
 var import_feed_store5 = require("@dxos/feed-store");
 var import_invariant19 = require("@dxos/invariant");
 var import_log19 = require("@dxos/log");
 var import_protocols15 = require("@dxos/protocols");
-var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials19 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_async20 = require("@dxos/async");
 var import_client_protocol6 = require("@dxos/client-protocol");
@@ -297,7 +298,7 @@ var import_echo_pipeline3 = require("@dxos/echo-pipeline");
 var import_invariant20 = require("@dxos/invariant");
 var import_keys15 = require("@dxos/keys");
 var import_log20 = require("@dxos/log");
-var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials21 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_invariant21 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
@@ -312,11 +313,11 @@ var import_invariant22 = require("@dxos/invariant");
 var import_keys16 = require("@dxos/keys");
 var import_log22 = require("@dxos/log");
 var import_protocols16 = require("@dxos/protocols");
-var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
 var import_metadata2 = require("@dxos/protocols/proto/dxos/echo/metadata");
 var import_stream10 = require("@dxos/codec-protobuf/stream");
 var import_protocols17 = require("@dxos/protocols");
-var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async22 = require("@dxos/async");
 var import_context17 = require("@dxos/context");
 var import_credentials22 = require("@dxos/credentials");
@@ -329,7 +330,7 @@ var import_keyring = require("@dxos/keyring");
 var import_keys17 = require("@dxos/keys");
 var import_log23 = require("@dxos/log");
 var import_protocols18 = require("@dxos/protocols");
-var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services22 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing11 = require("@dxos/tracing");
 var import_util12 = require("@dxos/util");
@@ -350,7 +351,7 @@ var import_util13 = require("@dxos/util");
 var import_node_path = __toESM(require("node:path"));
 var import_keys19 = require("@dxos/keys");
 var import_kv_store = require("@dxos/kv-store");
-var import_automerge_repo2 = require("@dxos/automerge/automerge-repo");
+var import_automerge_repo2 = require("@automerge/automerge-repo");
 var import_invariant25 = require("@dxos/invariant");
 var import_log25 = require("@dxos/log");
 var import_protocols21 = require("@dxos/protocols");
@@ -365,13 +366,13 @@ var import_log26 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
 var import_protocols22 = require("@dxos/protocols");
-var import_services22 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services23 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing12 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
 var import_async24 = require("@dxos/async");
 var import_stream11 = require("@dxos/codec-protobuf/stream");
 var import_invariant27 = require("@dxos/invariant");
-var import_services23 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services24 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async25 = require("@dxos/async");
 var import_stream12 = require("@dxos/codec-protobuf/stream");
 var import_keys21 = require("@dxos/keys");
@@ -380,11 +381,11 @@ var import_async26 = require("@dxos/async");
 var import_stream13 = require("@dxos/codec-protobuf/stream");
 var import_keys22 = require("@dxos/keys");
 var import_log27 = require("@dxos/log");
-var import_services24 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services25 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util16 = require("@dxos/util");
 var import_stream14 = require("@dxos/codec-protobuf/stream");
 var import_stream15 = require("@dxos/codec-protobuf/stream");
-var import_services25 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services26 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util17 = require("@dxos/util");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/feeds.ts";
 var subscribeToFeeds = ({ feedStore, spaceManager }, { feedKeys }) => {
@@ -744,7 +745,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.8.1";
+var DXOS_VERSION = "0.8.2-main.10c050d";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1059,67 +1060,70 @@ function _ts_decorate(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _using_ctx() {
-  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
-    var err = new Error();
-    err.name = "SuppressedError";
-    err.suppressed = suppressed;
-    err.error = error;
-    return err;
-  }, empty = {}, stack = [];
-  function using(isAwait, value) {
-    if (value != null) {
-      if (Object(value) !== value) {
-        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-      }
-      if (isAwait) {
-        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
-      }
-      if (dispose == null) {
-        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
-      }
-      if (typeof dispose !== "function") {
-        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
-      }
-      stack.push({
-        v: value,
-        d: dispose,
-        a: isAwait
-      });
-    } else if (isAwait) {
-      stack.push({
-        d: value,
-        a: isAwait
-      });
-    }
-    return value;
+function _ts_add_disposable_resource(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
   }
-  return {
-    e: empty,
-    u: using.bind(null, false),
-    a: using.bind(null, true),
-    d: function() {
-      var error = this.e;
-      function next() {
-        while (resource = stack.pop()) {
-          try {
-            var resource, disposalResult = resource.d && resource.d.call(resource.v);
-            if (resource.a) {
-              return Promise.resolve(disposalResult).then(next, err);
-            }
-          } catch (e) {
-            return err(e);
-          }
+  return value;
+}
+function _ts_dispose_resources(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources = function _ts_dispose_resources5(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
-        if (error !== empty) throw error;
-      }
-      function err(e) {
-        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
-        return next();
       }
-      return next();
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
-  };
+    return next();
+  })(env);
 }
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/edge-feed-replicator.ts";
 var EdgeFeedReplicator = class extends import_context3.Resource {
@@ -1136,7 +1140,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   async _open() {
     (0, import_log3.log)("open", void 0, {
       F: __dxlog_file5,
-      L: 56,
+      L: 57,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1155,7 +1159,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
           _spaceId: this._spaceId
         }, {
           F: __dxlog_file5,
-          L: 70,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1168,7 +1172,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         type: payload.type
       }, {
         F: __dxlog_file5,
-        L: 75,
+        L: 76,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1180,14 +1184,14 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   }
   async _handleReconnect() {
     await this._resetConnection();
-    if (this._messenger.isConnected) {
+    if (this._messenger.status === import_services4.EdgeStatus.CONNECTED) {
       this._startReplication();
     }
   }
   async _close() {
     (0, import_log3.log)("close", void 0, {
       F: __dxlog_file5,
-      L: 95,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1199,7 +1203,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     this._connectionCtx = connectionCtx;
     (0, import_log3.log)("connection context created", void 0, {
       F: __dxlog_file5,
-      L: 103,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1212,7 +1216,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   async _resetConnection() {
     (0, import_log3.log)("resetConnection", void 0, {
       F: __dxlog_file5,
-      L: 112,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1228,7 +1232,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file5,
-      L: 120,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1245,7 +1249,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       key: feed.key
     }, {
       F: __dxlog_file5,
-      L: 133,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1261,7 +1265,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     if (!this._connectionCtx) {
       (0, import_log3.log)("message dropped because connection was disposed", void 0, {
         F: __dxlog_file5,
-        L: 146,
+        L: 147,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1273,14 +1277,14 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         blocks: message.blocks.map((b) => b.index)
       }, {
         F: __dxlog_file5,
-        L: 151,
+        L: 152,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     (0, import_invariant2.invariant)(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 157,
+      L: 158,
       S: this,
       A: [
         "message.feedKey",
@@ -1292,7 +1296,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       type: message.type
     }, {
       F: __dxlog_file5,
-      L: 160,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1311,7 +1315,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     if (!this._connectionCtx) {
       import_log3.log.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file5,
-        L: 175,
+        L: 176,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1320,8 +1324,12 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     (0, import_async6.scheduleMicroTask)(this._connectionCtx, async () => {
       switch (message.type) {
         case "metadata": {
+          const env = {
+            stack: [],
+            error: void 0,
+            hasError: false
+          };
           try {
-            var _usingCtx = _using_ctx();
             const feedKey = import_keys3.PublicKey.fromHex(message.feedKey);
             const feed = this._feeds.get(feedKey);
             if (!feed) {
@@ -1329,13 +1337,13 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 184,
+                L: 185,
                 S: this,
                 C: (f, a) => f(...a)
               });
               return;
             }
-            const _guard = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
+            const _guard = _ts_add_disposable_resource(env, await this._getPushMutex(feed.key).acquire(), false);
             this._remoteLength.set(feedKey, message.length);
             const logMeta = {
               localLength: feed.length,
@@ -1345,7 +1353,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             if (message.length > feed.length) {
               (0, import_log3.log)("requesting missing blocks", logMeta, {
                 F: __dxlog_file5,
-                L: 194,
+                L: 195,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1360,17 +1368,18 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             } else if (message.length < feed.length) {
               (0, import_log3.log)("pushing blocks to remote", logMeta, {
                 F: __dxlog_file5,
-                L: 202,
+                L: 203,
                 S: this,
                 C: (f, a) => f(...a)
               });
               await this._pushBlocks(feed, message.length, feed.length);
             }
             break;
-          } catch (_) {
-            _usingCtx.e = _;
+          } catch (e) {
+            env.error = e;
+            env.hasError = true;
           } finally {
-            _usingCtx.d();
+            _ts_dispose_resources(env);
           }
         }
         case "data": {
@@ -1379,7 +1388,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 211,
+            L: 212,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1390,7 +1399,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 216,
+              L: 217,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1404,7 +1413,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 225,
+            L: 226,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1419,7 +1428,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 232,
+      L: 233,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1429,7 +1438,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       });
       (0, import_invariant2.invariant)(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 237,
+        L: 238,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1457,7 +1466,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 258,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1473,13 +1482,17 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     }
   }
   async _pushBlocksIfNeeded(feed) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx();
-      const _ = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
+      const _ = _ts_add_disposable_resource(env, await this._getPushMutex(feed.key).acquire(), false);
       if (!this._remoteLength.has(feed.key)) {
         (0, import_log3.log)("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 279,
+          L: 280,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1489,10 +1502,11 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       if (remoteLength < feed.length) {
         await this._pushBlocks(feed, remoteLength, feed.length);
       }
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      _usingCtx.d();
+      _ts_dispose_resources(env);
     }
   }
   _createConnectionContext() {
@@ -1504,7 +1518,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         if (err instanceof import_edge_client.EdgeIdentityChangedError || err instanceof import_edge_client.EdgeConnectionClosedError) {
           (0, import_log3.log)("resetting on reconnect", void 0, {
             F: __dxlog_file5,
-            L: 296,
+            L: 297,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1515,7 +1529,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       }
     }, {
       F: __dxlog_file5,
-      L: 290
+      L: 291
     });
     return connectionCtx;
   }
@@ -1535,12 +1549,7 @@ var bufferizeBlock = (block) => ({
 });
 var AutomergeSpaceState = class extends import_context5.Resource {
   constructor(_onNewRoot) {
-    super();
-    this._onNewRoot = _onNewRoot;
-    this.rootUrl = void 0;
-    this.lastEpoch = void 0;
-    this.onNewEpoch = new import_async8.Event();
-    this._isProcessingRootDocs = false;
+    super(), this._onNewRoot = _onNewRoot, this.rootUrl = void 0, this.lastEpoch = void 0, this.onNewEpoch = new import_async8.Event(), this._isProcessingRootDocs = false;
   }
   async _open(ctx) {
   }
@@ -1577,37 +1586,37 @@ var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/sr
 var LOAD_DOC_TIMEOUT = 1e4;
 var runEpochMigration = async (ctx, context) => {
   switch (context.migration) {
-    case import_services5.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+    case import_services6.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
       const document = context.echoHost.createDoc();
       await context.echoHost.flush();
       return {
         newRoot: document.url
       };
     }
-    case import_services5.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY: {
+    case import_services6.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY: {
       if (!context.currentRoot) {
         throw new Error("Space does not have an automerge root");
       }
       const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
         timeout: LOAD_DOC_TIMEOUT
       });
-      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
+      const newRoot = context.echoHost.createDoc(rootHandle.doc());
       await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
     }
-    case import_services5.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
+    case import_services6.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
       throw new Error("Migration not available");
     }
-    case import_services5.CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
+    case import_services6.CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
       throw new Error("Migration not available");
     }
     // TODO(dmaretskyi): This path doesn't seem to fit here. This is not a migration.
-    case import_services5.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
+    case import_services6.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       (0, import_invariant4.invariant)(context.newAutomergeRoot, void 0, {
         F: __dxlog_file6,
-        L: 62,
+        L: 63,
         S: void 0,
         A: [
           "context.newAutomergeRoot",
@@ -2042,8 +2051,7 @@ var NotarizationTeleportExtension = class extends import_teleport.RpcExtension {
       exposed: {
         NotarizationService: import_proto2.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       }
-    });
-    this._params = _params;
+    }), this._params = _params;
   }
   async getHandlers() {
     return {
@@ -2207,14 +2215,15 @@ var DataSpaceManager = class extends import_context7.Resource {
       id: "spaces",
       name: "Spaces",
       fetch: async () => {
-        return Array.from(this._spaces.values()).map((space) => {
+        return Promise.all(Array.from(this._spaces.values()).map(async (space) => {
           const rootUrl = space.automergeSpaceState.rootUrl;
-          const rootHandle = rootUrl ? this._echoHost.automergeRepo.find(rootUrl) : void 0;
-          const rootDoc = rootHandle?.docSync();
+          const rootHandle = rootUrl ? await this._echoHost.automergeRepo.find(rootUrl, import_echo_pipeline2.FIND_PARAMS) : void 0;
+          await rootHandle?.whenReady();
+          const rootDoc = rootHandle?.doc();
           const properties = rootDoc && (0, import_echo_pipeline2.findInlineObjectOfType)(rootDoc, import_client_protocol4.TYPE_PROPERTIES);
           return {
             key: space.key.toHex(),
-            state: import_services6.SpaceState[space.state],
+            state: import_services7.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,
@@ -2222,7 +2231,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             members: space.inner.spaceState.members.size,
             rootUrl
           };
-        });
+        }));
       }
     });
   }
@@ -2238,7 +2247,7 @@ var DataSpaceManager = class extends import_context7.Resource {
   async _open() {
     (0, import_log8.log)("open", void 0, {
       F: __dxlog_file9,
-      L: 213,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2246,7 +2255,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 214,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2254,7 +2263,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file9,
-      L: 215,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2264,7 +2273,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           spaceMetadata
         }, {
           F: __dxlog_file9,
-          L: 219,
+          L: 221,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2275,7 +2284,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           err
         }, {
           F: __dxlog_file9,
-          L: 222,
+          L: 224,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2286,7 +2295,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 228,
+      L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2294,7 +2303,7 @@ var DataSpaceManager = class extends import_context7.Resource {
   async _close() {
     (0, import_log8.log)("close", void 0, {
       F: __dxlog_file9,
-      L: 233,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2318,14 +2327,14 @@ var DataSpaceManager = class extends import_context7.Resource {
       genesisFeedKey: controlFeedKey,
       controlFeedKey,
       dataFeedKey,
-      state: import_services6.SpaceState.SPACE_ACTIVE
+      state: import_services7.SpaceState.SPACE_ACTIVE
     };
     (0, import_log8.log)("creating space...", {
       spaceId,
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 262,
+      L: 264,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2333,7 +2342,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     if (options.documents) {
       (0, import_invariant7.invariant)(Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId)), "Invalid document IDs", {
         F: __dxlog_file9,
-        L: 267,
+        L: 269,
         S: this,
         A: [
           "Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId))",
@@ -2345,7 +2354,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           documentId
         }, {
           F: __dxlog_file9,
-          L: 274,
+          L: 276,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2359,7 +2368,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 281,
+      L: 283,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2368,7 +2377,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       const newRootDocId = documentIdMapping[(0, import_automerge_repo.interpretAsDocumentId)(options.rootUrl)] ?? (0, import_invariant7.failedInvariant)();
       const rootDocHandle = await this._echoHost.loadDoc(import_context7.Context.default(void 0, {
         F: __dxlog_file9,
-        L: 286
+        L: 288
       }), newRootDocId);
       import_echo_pipeline2.DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
       root = await this._echoHost.openSpaceRoot(spaceId, `automerge:${newRootDocId}`);
@@ -2379,7 +2388,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 294,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2389,7 +2398,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 299,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2398,7 +2407,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const memberCredential = credentials[1];
     (0, import_invariant7.invariant)((0, import_credentials9.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 305,
+      L: 307,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2412,7 +2421,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 310,
+      L: 312,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2425,7 +2434,18 @@ var DataSpaceManager = class extends import_context7.Resource {
     }
     switch (space.databaseRoot.getVersion()) {
       case import_echo_protocol2.SpaceDocVersion.CURRENT: {
-        const [_, properties] = (0, import_echo_pipeline2.findInlineObjectOfType)(space.databaseRoot.docSync(), import_client_protocol4.TYPE_PROPERTIES) ?? [];
+        if (!space.databaseRoot.handle.isReady()) {
+          import_log8.log.warn("waiting for space root to be ready", {
+            spaceId: space.id
+          }, {
+            F: __dxlog_file9,
+            L: 325,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await space.databaseRoot.handle.whenReady();
+        }
+        const [_, properties] = (0, import_echo_pipeline2.findInlineObjectOfType)(space.databaseRoot.doc(), import_client_protocol4.TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       case import_echo_protocol2.SpaceDocVersion.LEGACY: {
@@ -2437,7 +2457,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           spaceId: space.id
         }, {
           F: __dxlog_file9,
-          L: 330,
+          L: 336,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2458,7 +2478,7 @@ var DataSpaceManager = class extends import_context7.Resource {
         keys: []
       }
     };
-    const propertiesId = (0, import_echo_schema.createObjectId)();
+    const propertiesId = import_echo_schema.ObjectId.random();
     document.change((doc) => {
       (0, import_util7.setDeep)(doc, [
         "objects",
@@ -2472,14 +2492,14 @@ var DataSpaceManager = class extends import_context7.Resource {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant7.invariant)(automergeIndex, void 0, {
       F: __dxlog_file9,
-      L: 363,
+      L: 369,
       S: this,
       A: [
         "automergeIndex",
         ""
       ]
     });
-    const document = this._echoHost.automergeRepo.find(automergeIndex);
+    const document = await this._echoHost.automergeRepo.find(automergeIndex, import_echo_pipeline2.FIND_PARAMS);
     await document.whenReady();
     return document;
   }
@@ -2489,13 +2509,13 @@ var DataSpaceManager = class extends import_context7.Resource {
       opts
     }, {
       F: __dxlog_file9,
-      L: 372,
+      L: 378,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant7.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file9,
-      L: 373,
+      L: 379,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2504,7 +2524,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     });
     (0, import_invariant7.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file9,
-      L: 374,
+      L: 380,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -2528,7 +2548,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     (0, import_invariant7.invariant)(space, void 0, {
       F: __dxlog_file9,
-      L: 394,
+      L: 400,
       S: this,
       A: [
         "space",
@@ -2541,7 +2561,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const credentials = await (0, import_credentials9.createAdmissionCredentials)(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
     (0, import_invariant7.invariant)(credentials[0].credential, void 0, {
       F: __dxlog_file9,
-      L: 413,
+      L: 419,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2551,7 +2571,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant7.invariant)((0, import_credentials9.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 415,
+      L: 421,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2569,7 +2589,7 @@ var DataSpaceManager = class extends import_context7.Resource {
   async waitUntilSpaceReady(spaceKey) {
     await (0, import_context7.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
-      return !!space && space.state === import_services6.SpaceState.SPACE_READY;
+      return !!space && space.state === import_services7.SpaceState.SPACE_READY;
     }));
   }
   async requestSpaceAdmissionCredential(spaceKey) {
@@ -2589,7 +2609,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const space = this._spaces.get(spaceKey);
     (0, import_invariant7.invariant)(space, "Space not found.", {
       F: __dxlog_file9,
-      L: 452,
+      L: 458,
       S: this,
       A: [
         "space",
@@ -2614,7 +2634,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       metadata
     }, {
       F: __dxlog_file9,
-      L: 471,
+      L: 477,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2658,7 +2678,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             err
           }, {
             F: __dxlog_file9,
-            L: 513,
+            L: 519,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2668,13 +2688,13 @@ var DataSpaceManager = class extends import_context7.Resource {
       onAuthFailure: () => {
         import_log8.log.warn("auth failure", void 0, {
           F: __dxlog_file9,
-          L: 518,
+          L: 524,
           S: this,
           C: (f, a) => f(...a)
         });
       },
       onMemberRolesChanged: async (members) => {
-        if (dataSpace?.state === import_services6.SpaceState.SPACE_READY) {
+        if (dataSpace?.state === import_services7.SpaceState.SPACE_READY) {
           this._handleMemberRoleChanges(presence, space.protocol, members);
         }
       },
@@ -2687,7 +2707,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     dataFeed && await space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
-      initialState: metadata.state === import_services6.SpaceState.SPACE_INACTIVE ? import_services6.SpaceState.SPACE_INACTIVE : import_services6.SpaceState.SPACE_CLOSED,
+      initialState: metadata.state === import_services7.SpaceState.SPACE_INACTIVE ? import_services7.SpaceState.SPACE_INACTIVE : import_services7.SpaceState.SPACE_CLOSED,
       metadataStore: this._metadataStore,
       gossip,
       presence,
@@ -2701,7 +2721,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 545,
+            L: 551,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2712,7 +2732,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             open: this._lifecycleState === import_context7.LifecycleState.OPEN
           }, {
             F: __dxlog_file9,
-            L: 548,
+            L: 554,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2731,7 +2751,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 556,
+            L: 562,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2752,7 +2772,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           spaceId: dataSpace.id
         }, {
           F: __dxlog_file9,
-          L: 570,
+          L: 576,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2765,7 +2785,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       }
     });
     presence.newPeer.on((peerState) => {
-      if (dataSpace.state === import_services6.SpaceState.SPACE_READY) {
+      if (dataSpace.state === import_services7.SpaceState.SPACE_READY) {
         this._handleNewPeerConnected(space, peerState);
       }
     });
@@ -2782,7 +2802,7 @@ var DataSpaceManager = class extends import_context7.Resource {
         space: space.key
       }, {
         F: __dxlog_file9,
-        L: 597,
+        L: 603,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2815,7 +2835,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       closedSessions
     }, {
       F: __dxlog_file9,
-      L: 623,
+      L: 629,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2830,7 +2850,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file9,
-          L: 637,
+          L: 643,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2839,7 +2859,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     }
   }
   async _handleInvitationStatusChange(dataSpace, delegatedInvitation, isActive) {
-    if (dataSpace?.state !== import_services6.SpaceState.SPACE_READY) {
+    if (dataSpace?.state !== import_services7.SpaceState.SPACE_READY) {
       return;
     }
     if (isActive) {
@@ -2856,8 +2876,8 @@ var DataSpaceManager = class extends import_context7.Resource {
   async _createDelegatedInvitations(space, invitations) {
     const tasks = invitations.map(([credentialId, invitation]) => {
       return this._invitationsManager.createInvitation({
-        type: import_services6.Invitation.Type.DELEGATED,
-        kind: import_services6.Invitation.Kind.SPACE,
+        type: import_services7.Invitation.Type.DELEGATED,
+        kind: import_services7.Invitation.Kind.SPACE,
         spaceKey: space.key,
         authMethod: invitation.authMethod,
         invitationId: invitation.invitationId,
@@ -2952,7 +2972,7 @@ var extractSpaceArchive = async (archive) => {
     const documentId = entry2.fileName.replace(`${import_protocols8.SpaceArchiveFileStructure.documents}/`, "").replace(/\.bin$/, "");
     (0, import_invariant10.invariant)(!documentId.includes("/"), void 0, {
       F: __dxlog_file10,
-      L: 27,
+      L: 28,
       S: void 0,
       A: [
         "!documentId.includes('/')",
@@ -2966,7 +2986,7 @@ var extractSpaceArchive = async (archive) => {
     documents
   }, {
     F: __dxlog_file10,
-    L: 31,
+    L: 32,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -2975,67 +2995,70 @@ var extractSpaceArchive = async (archive) => {
     documents
   };
 };
-function _using_ctx2() {
-  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
-    var err = new Error();
-    err.name = "SuppressedError";
-    err.suppressed = suppressed;
-    err.error = error;
-    return err;
-  }, empty = {}, stack = [];
-  function using(isAwait, value) {
-    if (value != null) {
-      if (Object(value) !== value) {
-        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-      }
-      if (isAwait) {
-        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
-      }
-      if (dispose == null) {
-        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
-      }
-      if (typeof dispose !== "function") {
-        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
-      }
-      stack.push({
-        v: value,
-        d: dispose,
-        a: isAwait
-      });
-    } else if (isAwait) {
-      stack.push({
-        d: value,
-        a: isAwait
-      });
-    }
-    return value;
+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.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
   }
-  return {
-    e: empty,
-    u: using.bind(null, false),
-    a: using.bind(null, true),
-    d: function() {
-      var error = this.e;
-      function next() {
-        while (resource = stack.pop()) {
-          try {
-            var resource, disposalResult = resource.d && resource.d.call(resource.v);
-            if (resource.a) {
-              return Promise.resolve(disposalResult).then(next, err);
-            }
-          } catch (e) {
-            return err(e);
-          }
+  return value;
+}
+function _ts_dispose_resources2(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources2 = function _ts_dispose_resources5(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
-        if (error !== empty) throw error;
       }
-      function err(e) {
-        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
-        return next();
-      }
-      return next();
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
-  };
+    return next();
+  })(env);
 }
 var __dxlog_file11 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
@@ -3056,10 +3079,10 @@ var SpacesServiceImpl = class {
     const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug3.raise)(new import_protocols6.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
-        case import_services7.SpaceState.SPACE_ACTIVE:
+        case import_services8.SpaceState.SPACE_ACTIVE:
           await space.activate();
           break;
-        case import_services7.SpaceState.SPACE_INACTIVE:
+        case import_services8.SpaceState.SPACE_INACTIVE:
           await space.deactivate();
           break;
         default:
@@ -3085,7 +3108,7 @@ var SpacesServiceImpl = class {
     const credentials = await (0, import_credentials13.createAdmissionCredentials)(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     (0, import_invariant8.invariant)(credentials[0].credential, void 0, {
       F: __dxlog_file11,
-      L: 118,
+      L: 119,
       S: this,
       A: [
         "credentials[0].credential",
@@ -3095,7 +3118,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant8.invariant)((0, import_credentials13.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file11,
-      L: 120,
+      L: 121,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3113,7 +3136,7 @@ var SpacesServiceImpl = class {
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file11,
-          L: 133,
+          L: 134,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3205,7 +3228,7 @@ var SpacesServiceImpl = class {
       } else {
         (0, import_invariant8.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file11,
-          L: 231,
+          L: 232,
           S: this,
           A: [
             "!credential.id",
@@ -3214,7 +3237,7 @@ var SpacesServiceImpl = class {
         });
         (0, import_invariant8.invariant)(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file11,
-          L: 232,
+          L: 233,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -3224,7 +3247,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         (0, import_invariant8.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file11,
-          L: 234,
+          L: 235,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -3271,9 +3294,13 @@ var SpacesServiceImpl = class {
     });
   }
   async exportSpace(request) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx2();
-      const writer = _usingCtx.a(await new SpaceArchiveWriter().open());
+      const writer = _ts_add_disposable_resource2(env, await new SpaceArchiveWriter().open(), true);
       (0, import_invariant8.assertArgument)(import_keys9.SpaceId.isValid(request.spaceId), "Invalid space ID");
       const dataSpaceManager = await this._getDataSpaceManager();
       const space = dataSpaceManager.getSpaceById(request.spaceId) ?? (0, import_debug3.raise)(new Error("Space not found"));
@@ -3290,10 +3317,12 @@ var SpacesServiceImpl = class {
       return {
         archive
       };
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      await _usingCtx.d();
+      const result = _ts_dispose_resources2(env);
+      if (result) await result;
     }
   }
   async importSpace(request) {
@@ -3301,7 +3330,7 @@ var SpacesServiceImpl = class {
     const extracted = await extractSpaceArchive(request.archive);
     (0, import_invariant8.invariant)(extracted.metadata.echo?.currentRootUrl, "Space archive does not contain a root URL", {
       F: __dxlog_file11,
-      L: 288,
+      L: 289,
       S: this,
       A: [
         "extracted.metadata.echo?.currentRootUrl",
@@ -3321,7 +3350,7 @@ var SpacesServiceImpl = class {
     const assertion = (0, import_credentials13.getCredentialAssertion)(credential);
     (0, import_invariant8.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file11,
-      L: 299,
+      L: 300,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3331,7 +3360,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     (0, import_invariant8.invariant)(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
       F: __dxlog_file11,
-      L: 301,
+      L: 302,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -3388,7 +3417,7 @@ var SpacesServiceImpl = class {
             profile: member.profile ?? {}
           },
           role: member.role,
-          presence: peers.length > 0 ? import_services7.SpaceMember.PresenceState.ONLINE : import_services7.SpaceMember.PresenceState.OFFLINE,
+          presence: peers.length > 0 ? import_services8.SpaceMember.PresenceState.ONLINE : import_services8.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
       })),
@@ -3713,7 +3742,7 @@ var IdentityManager = class {
       L: 135
     }));
   }
-  async createIdentity({ displayName, deviceProfile } = {}) {
+  async createIdentity({ profile, deviceProfile } = {}) {
     (0, import_invariant11.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file13,
       L: 140,
@@ -3771,10 +3800,8 @@ var IdentityManager = class {
         // Feed admission.
         await generator.createFeedAdmission(identityRecord.haloSpace.key, identityRecord.haloSpace.dataFeedKey, import_credentials15.AdmittedFeed.Designation.DATA)
       ];
-      if (displayName) {
-        credentials.push(await generator.createProfileCredential({
-          displayName
-        }));
+      if (profile) {
+        credentials.push(await generator.createProfileCredential(profile));
       }
       credentials.push(await generator.createDeviceAuthorization(identityRecord.deviceKey));
       credentials.push(await generator.createDeviceProfile({
@@ -3891,7 +3918,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file13,
-      L: 273,
+      L: 277,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3905,7 +3932,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file13,
-      L: 284,
+      L: 288,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3916,7 +3943,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     (0, import_invariant11.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 291,
+      L: 295,
       S: this,
       A: [
         "this._identity",
@@ -3947,7 +3974,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     (0, import_invariant11.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 308,
+      L: 312,
       S: this,
       A: [
         "this._identity",
@@ -3975,15 +4002,15 @@ var IdentityManager = class {
     this.stateUpdate.emit();
     return {
       deviceKey: this._identity.deviceKey,
-      kind: import_services8.DeviceKind.CURRENT,
-      presence: import_services8.Device.PresenceState.ONLINE,
+      kind: import_services9.DeviceKind.CURRENT,
+      presence: import_services9.Device.PresenceState.ONLINE,
       profile
     };
   }
   async _constructIdentity(identityRecord) {
     (0, import_invariant11.invariant)(!this._identity, void 0, {
       F: __dxlog_file13,
-      L: 334,
+      L: 338,
       S: this,
       A: [
         "!this._identity",
@@ -3994,7 +4021,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file13,
-      L: 335,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4009,7 +4036,7 @@ var IdentityManager = class {
     });
     (0, import_invariant11.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file13,
-      L: 348,
+      L: 352,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -4021,7 +4048,7 @@ var IdentityManager = class {
     });
     (0, import_invariant11.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file13,
-      L: 352,
+      L: 356,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -4060,7 +4087,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file13,
-      L: 383,
+      L: 387,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4085,7 +4112,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         import_log11.log.warn("auth failure", void 0, {
           F: __dxlog_file13,
-          L: 408,
+          L: 412,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4110,13 +4137,7 @@ var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var DEFAULT_SPACE_SEARCH_TIMEOUT = 1e4;
 var IdentityServiceImpl = class extends import_context10.Resource {
   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;
+    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;
@@ -4126,7 +4147,7 @@ var IdentityServiceImpl = class extends import_context10.Resource {
   }
   async createIdentity(request) {
     await this._createIdentity({
-      displayName: request.profile?.displayName,
+      profile: request.profile,
       deviceProfile: request.deviceProfile
     });
     const dataSpaceManager = this._dataSpaceManagerProvider();
@@ -4250,9 +4271,9 @@ var IdentityServiceImpl = class extends import_context10.Resource {
     const dataSpaceManager = this._dataSpaceManagerProvider();
     const recordedDefaultSpaceTrigger = new import_async14.Trigger();
     const allProcessed = (0, import_util9.safeAwaitAll)(dataSpaceManager.spaces.values(), async (space) => {
-      if (space.state === import_services9.SpaceState.SPACE_CLOSED) {
+      if (space.state === import_services10.SpaceState.SPACE_CLOSED) {
         await space.open();
-        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === import_services9.SpaceState.SPACE_REQUIRES_MIGRATION);
+        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === import_services10.SpaceState.SPACE_REQUIRES_MIGRATION);
         await Promise.race([
           space.initializeDataPipeline(),
           requiresMigration
@@ -4299,80 +4320,83 @@ function _ts_decorate6(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _using_ctx3() {
-  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
-    var err = new Error();
-    err.name = "SuppressedError";
-    err.suppressed = suppressed;
-    err.error = error;
-    return err;
-  }, empty = {}, stack = [];
-  function using(isAwait, value) {
-    if (value != null) {
-      if (Object(value) !== value) {
-        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-      }
-      if (isAwait) {
-        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
-      }
-      if (dispose == null) {
-        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
-      }
-      if (typeof dispose !== "function") {
-        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
-      }
-      stack.push({
-        v: value,
-        d: dispose,
-        a: isAwait
-      });
-    } else if (isAwait) {
-      stack.push({
-        d: value,
-        a: isAwait
-      });
-    }
-    return value;
+function _ts_add_disposable_resource3(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
   }
-  return {
-    e: empty,
-    u: using.bind(null, false),
-    a: using.bind(null, true),
-    d: function() {
-      var error = this.e;
-      function next() {
-        while (resource = stack.pop()) {
-          try {
-            var resource, disposalResult = resource.d && resource.d.call(resource.v);
-            if (resource.a) {
-              return Promise.resolve(disposalResult).then(next, err);
-            }
-          } catch (e) {
-            return err(e);
-          }
+  return value;
+}
+function _ts_dispose_resources3(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources3 = function _ts_dispose_resources5(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
-        if (error !== empty) throw error;
-      }
-      function err(e) {
-        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
-        return next();
       }
-      return next();
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
-  };
+    return next();
+  })(env);
 }
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
     this._ctx = new import_context4.Context(void 0, {
       F: __dxlog_file15,
-      L: 97
+      L: 100
     });
     this._cache = void 0;
     this._edgeFeedReplicator = void 0;
     this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
     this._epochProcessingMutex = new import_async7.Mutex();
-    this._state = import_services4.SpaceState.SPACE_CLOSED;
+    this._state = import_services5.SpaceState.SPACE_CLOSED;
     this._databaseRoot = null;
     this.error = void 0;
     this.stateUpdate = new import_async7.Event();
@@ -4412,10 +4436,10 @@ var DataSpace = class {
     }
     this._state = params.initialState;
     (0, import_log4.log)("new state", {
-      state: import_services4.SpaceState[this._state]
+      state: import_services5.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 173,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4458,7 +4482,7 @@ var DataSpace = class {
     };
   }
   async open() {
-    if (this._state === import_services4.SpaceState.SPACE_CLOSED) {
+    if (this._state === import_services5.SpaceState.SPACE_CLOSED) {
       await this._open();
     }
   }
@@ -4474,16 +4498,16 @@ var DataSpace = class {
     }
     await this._inner.open(new import_context4.Context(void 0, {
       F: __dxlog_file15,
-      L: 247
+      L: 250
     }));
     await this._inner.startProtocol();
     await this._edgeFeedReplicator?.open();
-    this._state = import_services4.SpaceState.SPACE_CONTROL_ONLY;
+    this._state = import_services5.SpaceState.SPACE_CONTROL_ONLY;
     (0, import_log4.log)("new state", {
-      state: import_services4.SpaceState[this._state]
+      state: import_services5.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 253,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4498,19 +4522,19 @@ var DataSpace = class {
   async _close() {
     await this._callbacks.beforeClose?.();
     await this.preClose.callSerial();
-    this._state = import_services4.SpaceState.SPACE_CLOSED;
+    this._state = import_services5.SpaceState.SPACE_CLOSED;
     (0, import_log4.log)("new state", {
-      state: import_services4.SpaceState[this._state]
+      state: import_services5.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 272,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new import_context4.Context(void 0, {
       F: __dxlog_file15,
-      L: 274
+      L: 277
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4543,7 +4567,7 @@ var DataSpace = class {
         if (err instanceof import_protocols3.CancelledError || err instanceof import_context4.ContextDisposedError) {
           (0, import_log4.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file15,
-            L: 312,
+            L: 315,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4551,16 +4575,16 @@ var DataSpace = class {
         }
         import_log4.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file15,
-          L: 316,
+          L: 319,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._state = import_services4.SpaceState.SPACE_ERROR;
+        this._state = import_services5.SpaceState.SPACE_ERROR;
         (0, import_log4.log)("new state", {
-          state: import_services4.SpaceState[this._state]
+          state: import_services5.SpaceState[this._state]
         }, {
           F: __dxlog_file15,
-          L: 318,
+          L: 321,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4572,44 +4596,44 @@ var DataSpace = class {
     });
   }
   async initializeDataPipeline() {
-    if (this._state !== import_services4.SpaceState.SPACE_CONTROL_ONLY) {
+    if (this._state !== import_services5.SpaceState.SPACE_CONTROL_ONLY) {
       throw new import_protocols3.SystemError("Invalid operation");
     }
-    this._state = import_services4.SpaceState.SPACE_INITIALIZING;
+    this._state = import_services5.SpaceState.SPACE_INITIALIZING;
     (0, import_log4.log)("new state", {
-      state: import_services4.SpaceState[this._state]
+      state: import_services5.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 334,
+      L: 337,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log4.log)("initializing control pipeline", void 0, {
       F: __dxlog_file15,
-      L: 336,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
     await (0, import_async7.sleep)(1);
-    const ready = this.stateUpdate.waitForCondition(() => this._state === import_services4.SpaceState.SPACE_READY);
+    const ready = this.stateUpdate.waitForCondition(() => this._state === import_services5.SpaceState.SPACE_READY);
     (0, import_log4.log)("initializing automerge root", void 0, {
       F: __dxlog_file15,
-      L: 344,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
     this._automergeSpaceState.startProcessingRootDocs();
     (0, import_log4.log)("waiting for space to be ready", void 0, {
       F: __dxlog_file15,
-      L: 348,
+      L: 351,
       S: this,
       C: (f, a) => f(...a)
     });
     await ready;
     (0, import_log4.log)("space is ready", void 0, {
       F: __dxlog_file15,
-      L: 350,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4617,14 +4641,14 @@ var DataSpace = class {
   async *getAllDocuments() {
     (0, import_invariant3.invariant)(this._databaseRoot, "Space is not ready", {
       F: __dxlog_file15,
-      L: 354,
+      L: 357,
       S: this,
       A: [
         "this._databaseRoot",
         "'Space is not ready'"
       ]
     });
-    const doc = this._databaseRoot.docSync() ?? (0, import_invariant3.failedInvariant)();
+    const doc = this._databaseRoot.doc() ?? (0, import_invariant3.failedInvariant)();
     const root = (0, import_automerge.save)(doc);
     yield [
       this._databaseRoot.documentId,
@@ -4633,7 +4657,7 @@ var DataSpace = class {
     for (const documentUrl of this._databaseRoot.getAllLinkedDocuments()) {
       const data = await this._echoHost.exportDoc(import_context4.Context.default(void 0, {
         F: __dxlog_file15,
-        L: 360
+        L: 363
       }), documentUrl);
       yield [
         documentUrl.replace(/^automerge:/, ""),
@@ -4643,12 +4667,12 @@ var DataSpace = class {
   }
   async _enterReadyState() {
     await this._callbacks.beforeReady?.();
-    this._state = import_services4.SpaceState.SPACE_READY;
+    this._state = import_services5.SpaceState.SPACE_READY;
     (0, import_log4.log)("new state", {
-      state: import_services4.SpaceState[this._state]
+      state: import_services5.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 369,
+      L: 372,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4665,7 +4689,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     (0, import_log4.log)("writable feeds created", void 0, {
       F: __dxlog_file15,
-      L: 386,
+      L: 389,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4719,7 +4743,7 @@ var DataSpace = class {
           count: credentials.length
         }, {
           F: __dxlog_file15,
-          L: 444,
+          L: 447,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4730,14 +4754,14 @@ var DataSpace = class {
         });
         (0, import_log4.log)("credentials notarized", void 0, {
           F: __dxlog_file15,
-          L: 448,
+          L: 451,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         import_log4.log.error("error notarizing credentials for feed admission", err, {
           F: __dxlog_file15,
-          L: 450,
+          L: 453,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4752,26 +4776,28 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file15,
-      L: 460,
+      L: 463,
       S: this,
       C: (f, a) => f(...a)
     });
-    const handle = this._echoHost.automergeRepo.find(rootUrl);
+    let handle;
     queueMicrotask(async () => {
       try {
+        const env = {
+          stack: [],
+          error: void 0,
+          hasError: false
+        };
         try {
-          var _usingCtx = _using_ctx3();
           await (0, import_debug.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
+            handle = await (0, import_context4.cancelWithContext)(this._ctx, this._echoHost.automergeRepo.find(rootUrl, import_echo_pipeline.FIND_PARAMS));
             await (0, import_context4.cancelWithContext)(this._ctx, handle.whenReady());
           });
           if (this._ctx.disposed) {
             return;
           }
-          const _guard = (
-            // Ensure only one root is processed at a time.
-            _usingCtx.u(await this._epochProcessingMutex.acquire())
-          );
-          const doc = handle.docSync() ?? (0, import_invariant3.failedInvariant)();
+          const _guard = _ts_add_disposable_resource3(env, await this._epochProcessingMutex.acquire(), false);
+          const doc = handle.doc() ?? (0, import_invariant3.failedInvariant)();
           if (!doc.access?.spaceKey) {
             handle.change((doc2) => {
               doc2.access = {
@@ -4782,17 +4808,18 @@ var DataSpace = class {
           const root = await this._echoHost.openSpaceRoot(this.id, handle.url);
           this._databaseRoot = root;
           if (root.getVersion() !== import_echo_protocol.SpaceDocVersion.CURRENT) {
-            this._state = import_services4.SpaceState.SPACE_REQUIRES_MIGRATION;
+            this._state = import_services5.SpaceState.SPACE_REQUIRES_MIGRATION;
             this.stateUpdate.emit();
-          } else if (this._state !== import_services4.SpaceState.SPACE_READY) {
+          } else if (this._state !== import_services5.SpaceState.SPACE_READY) {
             await this._enterReadyState();
           } else {
             this.stateUpdate.emit();
           }
-        } catch (_) {
-          _usingCtx.e = _;
+        } catch (e) {
+          env.error = e;
+          env.hasError = true;
         } finally {
-          _usingCtx.d();
+          _ts_dispose_resources3(env);
         }
       } catch (err) {
         if (err instanceof import_context4.ContextDisposedError) {
@@ -4804,7 +4831,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file15,
-          L: 503,
+          L: 510,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4872,29 +4899,29 @@ var DataSpace = class {
   }
   async activate() {
     if (![
-      import_services4.SpaceState.SPACE_CLOSED,
-      import_services4.SpaceState.SPACE_INACTIVE
+      import_services5.SpaceState.SPACE_CLOSED,
+      import_services5.SpaceState.SPACE_INACTIVE
     ].includes(this._state)) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services4.SpaceState.SPACE_ACTIVE);
+    await this._metadataStore.setSpaceState(this.key, import_services5.SpaceState.SPACE_ACTIVE);
     await this._open();
     this.initializeDataPipelineAsync();
   }
   async deactivate() {
-    if (this._state === import_services4.SpaceState.SPACE_INACTIVE) {
+    if (this._state === import_services5.SpaceState.SPACE_INACTIVE) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services4.SpaceState.SPACE_INACTIVE);
-    if (this._state !== import_services4.SpaceState.SPACE_CLOSED) {
+    await this._metadataStore.setSpaceState(this.key, import_services5.SpaceState.SPACE_INACTIVE);
+    if (this._state !== import_services5.SpaceState.SPACE_CLOSED) {
       await this._close();
     }
-    this._state = import_services4.SpaceState.SPACE_INACTIVE;
+    this._state = import_services5.SpaceState.SPACE_INACTIVE;
     (0, import_log4.log)("new state", {
-      state: import_services4.SpaceState[this._state]
+      state: import_services5.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 585,
+      L: 592,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4915,7 +4942,7 @@ _ts_decorate6([
 ], DataSpace.prototype, "key", null);
 _ts_decorate6([
   import_tracing3.trace.info({
-    enum: import_services4.SpaceState
+    enum: import_services5.SpaceState
   })
 ], DataSpace.prototype, "state", null);
 _ts_decorate6([
@@ -4969,7 +4996,7 @@ var DeviceInvitationProtocol = class {
   }
   getInvitationContext() {
     return {
-      kind: import_services10.Invitation.Kind.DEVICE
+      kind: import_services11.Invitation.Kind.DEVICE
     };
   }
   async delegate() {
@@ -5072,7 +5099,7 @@ var DeviceInvitationProtocol = class {
   }
 };
 var stateToString = (state) => {
-  return Object.entries(import_services13.Invitation.State).find(([key, val]) => val === state)?.[0] ?? "unknown";
+  return Object.entries(import_services14.Invitation.State).find(([key, val]) => val === state)?.[0] ?? "unknown";
 };
 var computeExpirationTime = (invitation) => {
   if (!invitation.lifetime) {
@@ -5115,7 +5142,7 @@ var EdgeInvitationHandler = class {
     }
     const invitation = guardedState.current;
     const spaceId = invitation.spaceId;
-    const canBeHandledByEdge = invitation.authMethod !== import_services12.Invitation.AuthMethod.SHARED_SECRET && invitation.type === import_services12.Invitation.Type.DELEGATED && invitation.kind === import_services12.Invitation.Kind.SPACE && spaceId != null && import_keys12.SpaceId.isValid(spaceId);
+    const canBeHandledByEdge = invitation.authMethod !== import_services13.Invitation.AuthMethod.SHARED_SECRET && invitation.type === import_services13.Invitation.Type.DELEGATED && invitation.kind === import_services13.Invitation.Kind.SPACE && spaceId != null && import_keys12.SpaceId.isValid(spaceId);
     if (!canBeHandledByEdge) {
       (0, import_log14.log)("invitation could not be handled by edge", {
         invitation
@@ -5184,7 +5211,7 @@ var EdgeInvitationHandler = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      guardedState.set(this, import_services12.Invitation.State.CONNECTING);
+      guardedState.set(this, import_services13.Invitation.State.CONNECTING);
       const response = await this._joinSpaceByInvitation(guardedState, spaceId, {
         identityKey: admissionRequest.identityKey.toHex(),
         invitationId: guardedState.current.invitationId
@@ -5194,7 +5221,7 @@ var EdgeInvitationHandler = class {
         space: admissionRequest
       });
     } catch (error) {
-      guardedState.set(this, import_services12.Invitation.State.ERROR);
+      guardedState.set(this, import_services13.Invitation.State.ERROR);
       throw error;
     } finally {
       this._flowLock?.release();
@@ -5257,15 +5284,10 @@ var InvitationGuestExtension = class extends import_teleport2.RpcExtension {
       exposed: {
         InvitationHostService: import_proto4.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
-    });
-    this._invitationFlowMutex = _invitationFlowMutex;
-    this._callbacks = _callbacks;
-    this._ctx = new import_context13.Context(void 0, {
+    }), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks, this._ctx = new import_context13.Context(void 0, {
       F: __dxlog_file18,
       L: 38
-    });
-    this._remoteOptionsTrigger = new import_async17.Trigger();
-    this._invitationFlowLock = null;
+    }), this._remoteOptionsTrigger = new import_async17.Trigger(), this._invitationFlowLock = null;
   }
   hasFlowLock() {
     return this._invitationFlowLock != null;
@@ -5381,20 +5403,10 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
       exposed: {
         InvitationHostService: import_proto5.schema.getService("dxos.halo.invitations.InvitationHostService")
       }
-    });
-    this._invitationFlowMutex = _invitationFlowMutex;
-    this._callbacks = _callbacks;
-    this._ctx = new import_context14.Context(void 0, {
+    }), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks, this._ctx = new import_context14.Context(void 0, {
       F: __dxlog_file19,
       L: 57
-    });
-    this._remoteOptionsTrigger = new import_async18.Trigger();
-    this._challenge = void 0;
-    this.guestProfile = void 0;
-    this.authenticationPassed = false;
-    this.authenticationRetry = 0;
-    this.completedTrigger = new import_async18.Trigger();
-    this._invitationFlowLock = null;
+    }), this._remoteOptionsTrigger = new import_async18.Trigger(), this._challenge = void 0, this.guestProfile = void 0, this.authenticationPassed = false, this.authenticationRetry = 0, this.completedTrigger = new import_async18.Trigger(), this._invitationFlowLock = null;
   }
   hasFlowLock() {
     return this._invitationFlowLock != null;
@@ -5429,7 +5441,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          this._assertInvitationState(import_services14.Invitation.State.CONNECTED);
+          this._assertInvitationState(import_services15.Invitation.State.CONNECTED);
           if (invitationId !== invitation?.invitationId) {
             import_log16.log.warn("incorrect invitationId", {
               expected: invitation.invitationId,
@@ -5443,7 +5455,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
             this._callbacks.onError(new Error("Incorrect invitationId."));
             (0, import_async18.scheduleTask)(this._ctx, () => this.close());
             return {
-              authMethod: import_services14.Invitation.AuthMethod.NONE
+              authMethod: import_services15.Invitation.AuthMethod.NONE
             };
           }
           import_log16.log.verbose("guest introduced themselves", {
@@ -5455,8 +5467,8 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
             C: (f, a) => f(...a)
           });
           this.guestProfile = profile;
-          this._callbacks.onStateUpdate(import_services14.Invitation.State.READY_FOR_AUTHENTICATION);
-          this._challenge = invitation.authMethod === import_services14.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? (0, import_crypto3.randomBytes)(32) : void 0;
+          this._callbacks.onStateUpdate(import_services15.Invitation.State.READY_FOR_AUTHENTICATION);
+          this._challenge = invitation.authMethod === import_services15.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? (0, import_crypto3.randomBytes)(32) : void 0;
           import_log16.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols14.trace.end({
             id: traceId
           }), {
@@ -5491,12 +5503,12 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
           });
           let status = import_invitations4.AuthenticationResponse.Status.OK;
           this._assertInvitationState([
-            import_services14.Invitation.State.AUTHENTICATING,
-            import_services14.Invitation.State.READY_FOR_AUTHENTICATION
+            import_services15.Invitation.State.AUTHENTICATING,
+            import_services15.Invitation.State.READY_FOR_AUTHENTICATION
           ]);
-          this._callbacks.onStateUpdate(import_services14.Invitation.State.AUTHENTICATING);
+          this._callbacks.onStateUpdate(import_services15.Invitation.State.AUTHENTICATING);
           switch (invitation.authMethod) {
-            case import_services14.Invitation.AuthMethod.NONE: {
+            case import_services15.Invitation.AuthMethod.NONE: {
               (0, import_log16.log)("authentication not required", void 0, {
                 F: __dxlog_file19,
                 L: 154,
@@ -5507,7 +5519,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
                 status: import_invitations4.AuthenticationResponse.Status.OK
               };
             }
-            case import_services14.Invitation.AuthMethod.SHARED_SECRET: {
+            case import_services15.Invitation.AuthMethod.SHARED_SECRET: {
               if (invitation.authCode) {
                 if (this.authenticationRetry++ > MAX_OTP_ATTEMPTS) {
                   status = import_invitations4.AuthenticationResponse.Status.INVALID_OPT_ATTEMPTS;
@@ -5519,7 +5531,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
               }
               break;
             }
-            case import_services14.Invitation.AuthMethod.KNOWN_PUBLIC_KEY: {
+            case import_services15.Invitation.AuthMethod.KNOWN_PUBLIC_KEY: {
               if (!invitation.guestKeypair) {
                 status = import_invitations4.AuthenticationResponse.Status.INTERNAL_ERROR;
                 break;
@@ -5583,7 +5595,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
           const invitation = this._requireActiveInvitation();
           try {
             if (isAuthenticationRequired(invitation)) {
-              this._assertInvitationState(import_services14.Invitation.State.AUTHENTICATING);
+              this._assertInvitationState(import_services15.Invitation.State.AUTHENTICATING);
               if (!this.authenticationPassed) {
                 throw new Error("Not authenticated");
               }
@@ -5622,7 +5634,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
         S: this,
         C: (f, a) => f(...a)
       });
-      this._callbacks.onStateUpdate(import_services14.Invitation.State.CONNECTING);
+      this._callbacks.onStateUpdate(import_services15.Invitation.State.CONNECTING);
       await this.rpc.InvitationHostService.options({
         role: import_invitations4.InvitationOptions.Role.HOST
       });
@@ -5648,7 +5660,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
           remotePeerId: context.remotePeerId
         });
       }
-      this._callbacks.onStateUpdate(import_services14.Invitation.State.CONNECTED);
+      this._callbacks.onStateUpdate(import_services15.Invitation.State.CONNECTED);
       this._callbacks.onOpen(this._ctx, context);
     } catch (err) {
       if (this._invitationFlowLock != null) {
@@ -5697,7 +5709,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
     }
   }
 };
-var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services14.Invitation.AuthMethod.NONE;
+var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services15.Invitation.AuthMethod.NONE;
 var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-state.ts";
 var createGuardedInvitationState = (ctx, invitation, stream) => {
   const mutex = new import_async19.Mutex();
@@ -5741,10 +5753,10 @@ var createGuardedInvitationState = (ctx, invitation, stream) => {
     },
     error: (lockHolder, error) => {
       if (isStateChangeAllowed(lockHolder)) {
-        logStateUpdate(currentInvitation, lockHolder, import_services15.Invitation.State.ERROR, error);
+        logStateUpdate(currentInvitation, lockHolder, import_services16.Invitation.State.ERROR, error);
         currentInvitation = {
           ...currentInvitation,
-          state: import_services15.Invitation.State.ERROR
+          state: import_services16.Invitation.State.ERROR
         };
         stream.next(currentInvitation);
         stream.error(error);
@@ -5782,11 +5794,11 @@ var logStateUpdate = (invitation, actor, newState, error) => {
 };
 var isNonTerminalState = (currentState) => {
   return ![
-    import_services15.Invitation.State.SUCCESS,
-    import_services15.Invitation.State.ERROR,
-    import_services15.Invitation.State.CANCELLED,
-    import_services15.Invitation.State.TIMEOUT,
-    import_services15.Invitation.State.EXPIRED
+    import_services16.Invitation.State.SUCCESS,
+    import_services16.Invitation.State.ERROR,
+    import_services16.Invitation.State.CANCELLED,
+    import_services16.Invitation.State.TIMEOUT,
+    import_services16.Invitation.State.EXPIRED
   ].includes(currentState);
 };
 var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
@@ -5892,7 +5904,7 @@ var InvitationsHandler = class {
           return ctx.disposed ? null : guardedState.current;
         },
         onStateUpdate: (newState) => {
-          if (newState !== import_services11.Invitation.State.ERROR && newState !== import_services11.Invitation.State.TIMEOUT) {
+          if (newState !== import_services12.Invitation.State.ERROR && newState !== import_services12.Invitation.State.TIMEOUT) {
             guardedState.set(extension, newState);
           }
           return guardedState.current;
@@ -5930,7 +5942,7 @@ var InvitationsHandler = class {
           let admitted = false;
           connectionCtx.onDispose(() => {
             if (!admitted) {
-              guardedState.set(extension, import_services11.Invitation.State.CONNECTING);
+              guardedState.set(extension, import_services12.Invitation.State.CONNECTING);
             }
           });
           (0, import_async15.scheduleTask)(connectionCtx, async () => {
@@ -5964,7 +5976,7 @@ var InvitationsHandler = class {
                 S: this,
                 C: (f, a) => f(...a)
               });
-              guardedState.set(extension, import_services11.Invitation.State.SUCCESS);
+              guardedState.set(extension, import_services12.Invitation.State.SUCCESS);
               metrics.increment("dxos.invitation.success");
               import_log13.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols11.trace.end({
                 id: traceId
@@ -5979,7 +5991,7 @@ var InvitationsHandler = class {
                 await ctx.dispose();
               }
             } catch (err) {
-              const stateChanged = guardedState.set(extension, import_services11.Invitation.State.CONNECTING);
+              const stateChanged = guardedState.set(extension, import_services12.Invitation.State.CONNECTING);
               if (err instanceof import_async15.TimeoutError) {
                 if (stateChanged) {
                   metrics.increment("dxos.invitation.timeout");
@@ -6017,7 +6029,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          const stateChanged = guardedState.set(extension, import_services11.Invitation.State.CONNECTING);
+          const stateChanged = guardedState.set(extension, import_services12.Invitation.State.CONNECTING);
           if (err instanceof import_protocols11.InvalidInvitationExtensionRoleError) {
             (0, import_log13.log)("invalid role", {
               ...err.context
@@ -6065,7 +6077,7 @@ var InvitationsHandler = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        guardedState.set(null, import_services11.Invitation.State.EXPIRED);
+        guardedState.set(null, import_services12.Invitation.State.EXPIRED);
         void ctx.dispose().catch((err) => import_log13.log.catch(err, void 0, {
           F: __dxlog_file22,
           L: 196,
@@ -6076,7 +6088,7 @@ var InvitationsHandler = class {
       }
       (0, import_async15.scheduleTask)(ctx, async () => {
         await swarmConnection.close();
-        guardedState.set(null, import_services11.Invitation.State.EXPIRED);
+        guardedState.set(null, import_services12.Invitation.State.EXPIRED);
         metrics.increment("dxos.invitation.expired");
         await ctx.dispose();
       }, expiresOn.getTime() - Date.now());
@@ -6084,7 +6096,7 @@ var InvitationsHandler = class {
     let swarmConnection;
     (0, import_async15.scheduleTask)(ctx, async () => {
       swarmConnection = await this._joinSwarm(ctx, invitation, import_invitations2.InvitationOptions.Role.HOST, createExtension);
-      guardedState.set(null, import_services11.Invitation.State.CONNECTING);
+      guardedState.set(null, import_services12.Invitation.State.CONNECTING);
     });
   }
   acceptInvitation(ctx, stream, protocol, invitation, otpEnteredTrigger, deviceProfile) {
@@ -6101,7 +6113,7 @@ var InvitationsHandler = class {
     });
     const { timeout = import_client_protocol5.INVITATION_TIMEOUT } = invitation;
     if (deviceProfile) {
-      (0, import_invariant14.invariant)(invitation.kind === import_services11.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
+      (0, import_invariant14.invariant)(invitation.kind === import_services12.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file22,
         L: 236,
         S: this,
@@ -6117,7 +6129,7 @@ var InvitationsHandler = class {
       const isLockedByAnotherConnection = guardedState.mutex.isLocked() && !extension.hasFlowLock();
       (0, import_log13.log)("should cancel invitation flow", {
         isLockedByAnotherConnection,
-        invitationType: import_services11.Invitation.Type.DELEGATED,
+        invitationType: import_services12.Invitation.Type.DELEGATED,
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file22,
@@ -6128,7 +6140,7 @@ var InvitationsHandler = class {
       if (isLockedByAnotherConnection) {
         return false;
       }
-      return invitation.type !== import_services11.Invitation.Type.DELEGATED || triedPeersIds.size >= MAX_DELEGATED_INVITATION_HOST_TRIES;
+      return invitation.type !== import_services12.Invitation.Type.DELEGATED || triedPeersIds.size >= MAX_DELEGATED_INVITATION_HOST_TRIES;
     };
     let admitted = false;
     const createExtension = () => {
@@ -6171,7 +6183,7 @@ var InvitationsHandler = class {
                 C: (f, a) => f(...a)
               });
               (0, import_async15.scheduleTask)(connectionCtx, () => {
-                guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
+                guardedState.set(extension, import_services12.Invitation.State.TIMEOUT);
                 extensionCtx.close();
               }, timeout);
               import_log13.log.verbose("dxos.sdk.invitations-handler.guest.connected", {
@@ -6182,7 +6194,7 @@ var InvitationsHandler = class {
                 S: this,
                 C: (f, a) => f(...a)
               });
-              guardedState.set(extension, import_services11.Invitation.State.CONNECTED);
+              guardedState.set(extension, import_services12.Invitation.State.CONNECTED);
               import_log13.log.verbose("dxos.sdk.invitations-handler.guest.introduce", {
                 invitationId: invitation.invitationId,
                 ...protocol.toJSON()
@@ -6209,12 +6221,12 @@ var InvitationsHandler = class {
               invitation.authMethod = introductionResponse.authMethod;
               if (isAuthenticationRequired(invitation)) {
                 switch (invitation.authMethod) {
-                  case import_services11.Invitation.AuthMethod.SHARED_SECRET:
+                  case import_services12.Invitation.AuthMethod.SHARED_SECRET:
                     await this._handleGuestOtpAuth(extension, (state) => guardedState.set(extension, state), otpEnteredTrigger, {
                       timeout
                     });
                     break;
-                  case import_services11.Invitation.AuthMethod.KNOWN_PUBLIC_KEY:
+                  case import_services12.Invitation.AuthMethod.KNOWN_PUBLIC_KEY:
                     await this._handleGuestKpkAuth(extension, (state) => guardedState.set(extension, state), invitation, introductionResponse);
                     break;
                 }
@@ -6244,7 +6256,7 @@ var InvitationsHandler = class {
               guardedState.complete({
                 ...guardedState.current,
                 ...result,
-                state: import_services11.Invitation.State.SUCCESS
+                state: import_services12.Invitation.State.SUCCESS
               });
               import_log13.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols11.trace.end({
                 id: traceId
@@ -6264,7 +6276,7 @@ var InvitationsHandler = class {
                   S: this,
                   C: (f, a) => f(...a)
                 });
-                guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
+                guardedState.set(extension, import_services12.Invitation.State.TIMEOUT);
               } else {
                 import_log13.log.verbose("auth failed", err, {
                   F: __dxlog_file22,
@@ -6300,7 +6312,7 @@ var InvitationsHandler = class {
               S: this,
               C: (f, a) => f(...a)
             });
-            guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
+            guardedState.set(extension, import_services12.Invitation.State.TIMEOUT);
           } else {
             import_log13.log.verbose("auth failed", err, {
               F: __dxlog_file22,
@@ -6328,7 +6340,7 @@ var InvitationsHandler = class {
         guardedState.complete({
           ...guardedState.current,
           ...result,
-          state: import_services11.Invitation.State.SUCCESS
+          state: import_services12.Invitation.State.SUCCESS
         });
       }
     });
@@ -6352,12 +6364,12 @@ var InvitationsHandler = class {
           if (guardedState.mutex.isLocked()) {
             (0, import_async15.scheduleTask)(ctx, timeoutInactive, timeout);
           } else {
-            guardedState.set(null, import_services11.Invitation.State.TIMEOUT);
+            guardedState.set(null, import_services12.Invitation.State.TIMEOUT);
           }
         };
         (0, import_async15.scheduleTask)(ctx, timeoutInactive, timeout);
         await this._joinSwarm(ctx, invitation, import_invitations2.InvitationOptions.Role.GUEST, createExtension);
-        guardedState.set(null, import_services11.Invitation.State.CONNECTING);
+        guardedState.set(null, import_services12.Invitation.State.CONNECTING);
       }
     });
   }
@@ -6365,7 +6377,7 @@ var InvitationsHandler = class {
     let label;
     if (role === import_invitations2.InvitationOptions.Role.GUEST) {
       label = "invitation guest";
-    } else if (invitation.kind === import_services11.Invitation.Kind.DEVICE) {
+    } else if (invitation.kind === import_services12.Invitation.Kind.DEVICE) {
       label = "invitation host for device";
     } else {
       label = `invitation host for space ${invitation.spaceKey?.truncate()}`;
@@ -6389,7 +6401,7 @@ var InvitationsHandler = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      setState(import_services11.Invitation.State.READY_FOR_AUTHENTICATION);
+      setState(import_services12.Invitation.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
       (0, import_log13.log)("sending authentication request", void 0, {
         F: __dxlog_file22,
@@ -6397,7 +6409,7 @@ var InvitationsHandler = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      setState(import_services11.Invitation.State.AUTHENTICATING);
+      setState(import_services12.Invitation.State.AUTHENTICATING);
       const response = await extension.rpc.InvitationHostService.authenticate({
         authCode
       });
@@ -6489,8 +6501,8 @@ var InvitationsServiceImpl = class {
     return new import_stream9.Stream(({ next, ctx }) => {
       this._invitationsManager.invitationCreated.on(ctx, (invitation) => {
         next({
-          action: import_services16.QueryInvitationsResponse.Action.ADDED,
-          type: import_services16.QueryInvitationsResponse.Type.CREATED,
+          action: import_services17.QueryInvitationsResponse.Action.ADDED,
+          type: import_services17.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
@@ -6498,8 +6510,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.invitationAccepted.on(ctx, (invitation) => {
         next({
-          action: import_services16.QueryInvitationsResponse.Action.ADDED,
-          type: import_services16.QueryInvitationsResponse.Type.ACCEPTED,
+          action: import_services17.QueryInvitationsResponse.Action.ADDED,
+          type: import_services17.QueryInvitationsResponse.Type.ACCEPTED,
           invitations: [
             invitation
           ]
@@ -6507,8 +6519,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.removedCreated.on(ctx, (invitation) => {
         next({
-          action: import_services16.QueryInvitationsResponse.Action.REMOVED,
-          type: import_services16.QueryInvitationsResponse.Type.CREATED,
+          action: import_services17.QueryInvitationsResponse.Action.REMOVED,
+          type: import_services17.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
@@ -6516,8 +6528,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.removedAccepted.on(ctx, (invitation) => {
         next({
-          action: import_services16.QueryInvitationsResponse.Action.REMOVED,
-          type: import_services16.QueryInvitationsResponse.Type.ACCEPTED,
+          action: import_services17.QueryInvitationsResponse.Action.REMOVED,
+          type: import_services17.QueryInvitationsResponse.Type.ACCEPTED,
           invitations: [
             invitation
           ]
@@ -6525,29 +6537,29 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.saved.on(ctx, (invitation) => {
         next({
-          action: import_services16.QueryInvitationsResponse.Action.SAVED,
-          type: import_services16.QueryInvitationsResponse.Type.CREATED,
+          action: import_services17.QueryInvitationsResponse.Action.SAVED,
+          type: import_services17.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
         });
       });
       next({
-        action: import_services16.QueryInvitationsResponse.Action.ADDED,
-        type: import_services16.QueryInvitationsResponse.Type.CREATED,
+        action: import_services17.QueryInvitationsResponse.Action.ADDED,
+        type: import_services17.QueryInvitationsResponse.Type.CREATED,
         invitations: this._invitationsManager.getCreatedInvitations(),
         existing: true
       });
       next({
-        action: import_services16.QueryInvitationsResponse.Action.ADDED,
-        type: import_services16.QueryInvitationsResponse.Type.ACCEPTED,
+        action: import_services17.QueryInvitationsResponse.Action.ADDED,
+        type: import_services17.QueryInvitationsResponse.Type.ACCEPTED,
         invitations: this._invitationsManager.getAcceptedInvitations(),
         existing: true
       });
       this._invitationsManager.onPersistentInvitationsLoaded(ctx, () => {
         next({
-          action: import_services16.QueryInvitationsResponse.Action.LOAD_COMPLETE,
-          type: import_services16.QueryInvitationsResponse.Type.CREATED
+          action: import_services17.QueryInvitationsResponse.Action.LOAD_COMPLETE,
+          type: import_services17.QueryInvitationsResponse.Type.CREATED
         });
       });
     });
@@ -6602,7 +6614,7 @@ var SpaceInvitationProtocol = class {
       ]
     });
     return {
-      kind: import_services17.Invitation.Kind.SPACE,
+      kind: import_services18.Invitation.Kind.SPACE,
       spaceKey: this._spaceKey,
       spaceId: space.id
     };
@@ -6661,7 +6673,7 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    if (invitation.authMethod === import_services17.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
+    if (invitation.authMethod === import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
       (0, import_invariant19.invariant)(invitation.guestKeypair?.publicKey, void 0, {
         F: __dxlog_file23,
         L: 105,
@@ -6688,7 +6700,7 @@ var SpaceInvitationProtocol = class {
       role: invitation.role ?? import_credentials19.SpaceMember.Role.ADMIN,
       expiresOn: computeExpirationTime(invitation),
       multiUse: invitation.multiUse ?? false,
-      guestKey: invitation.authMethod === import_services17.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
+      guestKey: invitation.authMethod === import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     (0, import_invariant19.invariant)(credential.credential, void 0, {
       F: __dxlog_file23,
@@ -6714,7 +6726,7 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    (0, import_invariant19.invariant)(invitation.type === import_services17.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
+    (0, import_invariant19.invariant)(invitation.type === import_services18.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
       F: __dxlog_file23,
       L: 133,
       S: this,
@@ -6994,7 +7006,7 @@ var InvitationsManager = class {
       if (created.get().persistent) {
         await this._metadataStore.removeInvitation(invitationId);
       }
-      if (created.get().type === import_services18.Invitation.Type.DELEGATED) {
+      if (created.get().type === import_services19.Invitation.Type.DELEGATED) {
         const handler = this._getHandler(created.get());
         await handler.cancelDelegation(created.get());
       }
@@ -7028,8 +7040,8 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, _options) {
-    const { invitationId = import_keys15.PublicKey.random().toHex(), type = import_services18.Invitation.Type.INTERACTIVE, authMethod = import_services18.Invitation.AuthMethod.SHARED_SECRET, state = import_services18.Invitation.State.INIT, timeout = import_client_protocol6.INVITATION_TIMEOUT, swarmKey = import_keys15.PublicKey.random(), persistent = _options?.authMethod !== import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = import_credentials21.SpaceMember.Role.ADMIN, lifetime = 86400 * 7, multiUse = false, ...options } = _options ?? {};
-    const authCode = options?.authCode ?? (authMethod === import_services18.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials20.generatePasscode)(import_client_protocol6.AUTHENTICATION_CODE_LENGTH) : void 0);
+    const { invitationId = import_keys15.PublicKey.random().toHex(), type = import_services19.Invitation.Type.INTERACTIVE, authMethod = import_services19.Invitation.AuthMethod.SHARED_SECRET, state = import_services19.Invitation.State.INIT, timeout = import_client_protocol6.INVITATION_TIMEOUT, swarmKey = import_keys15.PublicKey.random(), persistent = _options?.authMethod !== import_services19.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = import_credentials21.SpaceMember.Role.ADMIN, lifetime = 86400 * 7, multiUse = false, ...options } = _options ?? {};
+    const authCode = options?.authCode ?? (authMethod === import_services19.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials20.generatePasscode)(import_client_protocol6.AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
       type,
@@ -7038,8 +7050,8 @@ var InvitationsManager = class {
       swarmKey,
       authCode,
       timeout,
-      persistent: persistent && type !== import_services18.Invitation.Type.DELEGATED,
-      guestKeypair: guestKeypair ?? (authMethod === import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
+      persistent: persistent && type !== import_services19.Invitation.Type.DELEGATED,
+      guestKeypair: guestKeypair ?? (authMethod === import_services19.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
       created,
       lifetime,
       role,
@@ -7058,14 +7070,14 @@ var InvitationsManager = class {
       }
     }, {
       F: __dxlog_file24,
-      L: 236
+      L: 239
     });
     ctx.onDispose(() => {
       (0, import_log20.log)("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file24,
-        L: 243,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7077,7 +7089,7 @@ var InvitationsManager = class {
       onCancel: async () => {
         stream.next({
           ...invitation,
-          state: import_services18.Invitation.State.CANCELLED
+          state: import_services19.Invitation.State.CANCELLED
         });
         await ctx.dispose();
       }
@@ -7098,38 +7110,38 @@ var InvitationsManager = class {
             ...handler.toJSON()
           }, {
             F: __dxlog_file24,
-            L: 263,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
           stream.next({
             ...initialState,
-            state: import_services18.Invitation.State.TIMEOUT
+            state: import_services19.Invitation.State.TIMEOUT
           });
         } else {
           import_log20.log.warn("auth failed", err, {
             F: __dxlog_file24,
-            L: 266,
+            L: 277,
             S: this,
             C: (f, a) => f(...a)
           });
           stream.next({
             ...initialState,
-            state: import_services18.Invitation.State.ERROR
+            state: import_services19.Invitation.State.ERROR
           });
         }
         void ctx.dispose();
       }
     }, {
       F: __dxlog_file24,
-      L: 260
+      L: 271
     });
     ctx.onDispose(() => {
       (0, import_log20.log)("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file24,
-        L: 273,
+        L: 284,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7141,7 +7153,7 @@ var InvitationsManager = class {
       onCancel: async () => {
         stream.next({
           ...initialState,
-          state: import_services18.Invitation.State.CANCELLED
+          state: import_services19.Invitation.State.CANCELLED
         });
         await ctx.dispose();
       },
@@ -7157,7 +7169,7 @@ var InvitationsManager = class {
     };
   }
   async _persistIfRequired(handler, changeStream, invitation) {
-    if (invitation.type === import_services18.Invitation.Type.DELEGATED && invitation.delegationCredentialId == null) {
+    if (invitation.type === import_services19.Invitation.Type.DELEGATED && invitation.delegationCredentialId == null) {
       const delegationCredentialId = await handler.delegate(invitation);
       changeStream.next({
         ...invitation,
@@ -7174,7 +7186,7 @@ var InvitationsManager = class {
     } catch (err) {
       import_log20.log.catch(err, void 0, {
         F: __dxlog_file24,
-        L: 309,
+        L: 320,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7319,13 +7331,7 @@ var AGENT_STATUS_QUERY_RETRY_JITTER = 1e3;
 var AGENT_FEED_ADDED_CHECK_INTERVAL_MS = 3e3;
 var EdgeAgentManager = class extends import_context16.Resource {
   constructor(_edgeFeatures, _edgeHttpClient, _dataSpaceManager, _identity) {
-    super();
-    this._edgeFeatures = _edgeFeatures;
-    this._edgeHttpClient = _edgeHttpClient;
-    this._dataSpaceManager = _dataSpaceManager;
-    this._identity = _identity;
-    this.agentStatusChanged = new import_async21.Event();
-    this._lastKnownDeviceCount = 0;
+    super(), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity, this.agentStatusChanged = new import_async21.Event(), this._lastKnownDeviceCount = 0;
   }
   get agentStatus() {
     return this._agentStatus;
@@ -7494,8 +7500,8 @@ var EdgeAgentManager = class extends import_context16.Resource {
         continue;
       }
       if ([
-        import_services19.SpaceState.SPACE_INACTIVE,
-        import_services19.SpaceState.SPACE_CLOSED
+        import_services20.SpaceState.SPACE_INACTIVE,
+        import_services20.SpaceState.SPACE_CLOSED
       ].includes(space.state)) {
         space.notarizationPlugin.setActiveEdgePollingEnabled(false);
         continue;
@@ -7544,22 +7550,16 @@ var EdgeAgentServiceImpl = class {
     this._agentManagerProvider = _agentManagerProvider;
     this._edgeConnection = _edgeConnection;
   }
+  // TODO(mykola): Reconcile with NetworkService.queryStatus.
   queryEdgeStatus() {
     return new import_stream10.Stream(({ ctx, next }) => {
-      next({
-        status: import_services20.QueryEdgeStatusResponse.EdgeStatus.NOT_CONNECTED
-      });
-      if (!this._edgeConnection) {
-        return;
-      }
-      ctx.onDispose(
-        // TODO(wittjosiah): EdgeConnection should include a disconnected event as well.
-        this._edgeConnection.onReconnected(() => {
-          next({
-            status: import_services20.QueryEdgeStatusResponse.EdgeStatus.CONNECTED
-          });
-        })
-      );
+      const update = () => {
+        next({
+          status: this._edgeConnection?.status ?? import_services21.EdgeStatus.NOT_CONNECTED
+        });
+      };
+      this._edgeConnection?.statusChanged.on(ctx, update);
+      update();
     });
   }
   async createAgent() {
@@ -7568,7 +7568,7 @@ var EdgeAgentServiceImpl = class {
   queryAgentStatus() {
     return new import_stream10.Stream(({ ctx, next }) => {
       next({
-        status: import_services20.QueryAgentStatusResponse.AgentStatus.UNKNOWN
+        status: import_services21.QueryAgentStatusResponse.AgentStatus.UNKNOWN
       });
       void this._agentManagerProvider().then((agentManager) => {
         next({
@@ -7586,13 +7586,13 @@ var EdgeAgentServiceImpl = class {
 var mapStatus = (agentStatus) => {
   switch (agentStatus) {
     case import_protocols17.EdgeAgentStatus.ACTIVE:
-      return import_services20.QueryAgentStatusResponse.AgentStatus.ACTIVE;
+      return import_services21.QueryAgentStatusResponse.AgentStatus.ACTIVE;
     case import_protocols17.EdgeAgentStatus.INACTIVE:
-      return import_services20.QueryAgentStatusResponse.AgentStatus.INACTIVE;
+      return import_services21.QueryAgentStatusResponse.AgentStatus.INACTIVE;
     case import_protocols17.EdgeAgentStatus.NOT_FOUND:
-      return import_services20.QueryAgentStatusResponse.AgentStatus.NOT_FOUND;
+      return import_services21.QueryAgentStatusResponse.AgentStatus.NOT_FOUND;
     case void 0:
-      return import_services20.QueryAgentStatusResponse.AgentStatus.UNKNOWN;
+      return import_services21.QueryAgentStatusResponse.AgentStatus.UNKNOWN;
   }
 };
 var __dxlog_file27 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-recovery-manager.ts";
@@ -7607,7 +7607,7 @@ var EdgeIdentityRecoveryManager = class {
     const identity = this._identityProvider();
     (0, import_invariant24.invariant)(identity, void 0, {
       F: __dxlog_file27,
-      L: 37,
+      L: 39,
       S: this,
       A: [
         "identity",
@@ -7658,7 +7658,7 @@ var EdgeIdentityRecoveryManager = class {
   async requestRecoveryChallenge() {
     (0, import_invariant24.invariant)(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file27,
-      L: 74,
+      L: 76,
       S: this,
       A: [
         "this._edgeClient",
@@ -7688,7 +7688,7 @@ var EdgeIdentityRecoveryManager = class {
   async recoverIdentityWithExternalSignature({ lookupKey, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData }) {
     (0, import_invariant24.invariant)(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file27,
-      L: 106,
+      L: 108,
       S: this,
       A: [
         "this._edgeClient",
@@ -7722,7 +7722,7 @@ var EdgeIdentityRecoveryManager = class {
   async recoverIdentityWithToken({ token }) {
     (0, import_invariant24.invariant)(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file27,
-      L: 139,
+      L: 141,
       S: this,
       A: [
         "this._edgeClient",
@@ -7750,7 +7750,7 @@ var EdgeIdentityRecoveryManager = class {
   async recoverIdentity({ recoveryCode }) {
     (0, import_invariant24.invariant)(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file27,
-      L: 163,
+      L: 165,
       S: this,
       A: [
         "this._edgeClient",
@@ -7781,7 +7781,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     import_log24.log.info("recovering identity", response, {
       F: __dxlog_file27,
-      L: 189,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7807,86 +7807,75 @@ function _ts_decorate10(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _using_ctx4() {
-  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
-    var err = new Error();
-    err.name = "SuppressedError";
-    err.suppressed = suppressed;
-    err.error = error;
-    return err;
-  }, empty = {}, stack = [];
-  function using(isAwait, value) {
-    if (value != null) {
-      if (Object(value) !== value) {
-        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-      }
-      if (isAwait) {
-        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
-      }
-      if (dispose == null) {
-        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
-      }
-      if (typeof dispose !== "function") {
-        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
-      }
-      stack.push({
-        v: value,
-        d: dispose,
-        a: isAwait
-      });
-    } else if (isAwait) {
-      stack.push({
-        d: value,
-        a: isAwait
-      });
-    }
-    return value;
+function _ts_add_disposable_resource4(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
   }
-  return {
-    e: empty,
-    u: using.bind(null, false),
-    a: using.bind(null, true),
-    d: function() {
-      var error = this.e;
-      function next() {
-        while (resource = stack.pop()) {
-          try {
-            var resource, disposalResult = resource.d && resource.d.call(resource.v);
-            if (resource.a) {
-              return Promise.resolve(disposalResult).then(next, err);
-            }
-          } catch (e) {
-            return err(e);
-          }
+  return value;
+}
+function _ts_dispose_resources4(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources4 = function _ts_dispose_resources5(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
-        if (error !== empty) throw error;
       }
-      function err(e) {
-        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
-        return next();
-      }
-      return next();
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
-  };
+    return next();
+  })(env);
 }
 var __dxlog_file28 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends import_context17.Resource {
   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._edgeIdentityUpdateMutex = new import_async22.Mutex();
-    this.initialized = new import_async22.Trigger();
-    this._meshReplicator = void 0;
-    this._echoEdgeReplicator = void 0;
-    this._handlerFactories = /* @__PURE__ */ new Map();
-    this._instanceId = import_keys17.PublicKey.random().toHex();
+    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._edgeIdentityUpdateMutex = new import_async22.Mutex(), this.initialized = new import_async22.Trigger(), this._meshReplicator = void 0, this._echoEdgeReplicator = void 0, this._handlerFactories = /* @__PURE__ */ new Map(), this._instanceId = import_keys17.PublicKey.random().toHex();
     this.metadataStore = new import_echo_pipeline4.MetadataStore(storage.createDirectory("metadata"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
@@ -7921,12 +7910,15 @@ var ServiceContext = class extends import_context17.Resource {
     this.echoHost = new import_echo_pipeline4.EchoHost({
       kv: this.level,
       peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex(),
-      getSpaceKeyByRootDocumentId: (documentId) => this.spaceManager.findSpaceByRootDocumentId(documentId)?.key
+      getSpaceKeyByRootDocumentId: (documentId) => this.spaceManager.findSpaceByRootDocumentId(documentId)?.key,
+      indexing: {
+        vector: this._runtimeParams?.enableVectorIndexing
+      }
     });
     this._meshReplicator = new import_echo_pipeline4.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(import_services21.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug5.failUndefined)(), this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(import_services22.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug5.failUndefined)(), this._acceptIdentity.bind(this)));
     if (!this._runtimeParams?.disableP2pReplication) {
       this._meshReplicator = new import_echo_pipeline4.MeshEchoReplicator();
     }
@@ -7940,7 +7932,7 @@ var ServiceContext = class extends import_context17.Resource {
     await this._checkStorageVersion();
     (0, import_log23.log)("opening...", void 0, {
       F: __dxlog_file28,
-      L: 199,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7948,7 +7940,7 @@ var ServiceContext = class extends import_context17.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file28,
-      L: 200,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7975,7 +7967,7 @@ var ServiceContext = class extends import_context17.Resource {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file28,
-      L: 228,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7983,13 +7975,13 @@ var ServiceContext = class extends import_context17.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file28,
-      L: 230,
+      L: 234,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log23.log)("opened", void 0, {
       F: __dxlog_file28,
-      L: 231,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7997,7 +7989,7 @@ var ServiceContext = class extends import_context17.Resource {
   async _close(ctx) {
     (0, import_log23.log)("closing...", void 0, {
       F: __dxlog_file28,
-      L: 235,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8016,7 +8008,7 @@ var ServiceContext = class extends import_context17.Resource {
     await this._edgeConnection?.close();
     (0, import_log23.log)("closed", void 0, {
       F: __dxlog_file28,
-      L: 251,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8027,18 +8019,18 @@ var ServiceContext = class extends import_context17.Resource {
     await identity.joinNetwork();
     await this._initialize(new import_context17.Context(void 0, {
       F: __dxlog_file28,
-      L: 258
+      L: 262
     }));
     return identity;
   }
   getInvitationHandler(invitation) {
-    if (this.identityManager.identity == null && invitation.kind === import_services21.Invitation.Kind.SPACE) {
+    if (this.identityManager.identity == null && invitation.kind === import_services22.Invitation.Kind.SPACE) {
       throw new Error("Identity must be created before joining a space.");
     }
     const factory = this._handlerFactories.get(invitation.kind);
     (0, import_invariant23.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file28,
-      L: 267,
+      L: 271,
       S: this,
       A: [
         "factory",
@@ -8064,7 +8056,7 @@ var ServiceContext = class extends import_context17.Resource {
     await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
     await this._initialize(new import_context17.Context(void 0, {
       F: __dxlog_file28,
-      L: 286
+      L: 290
     }));
     return identity;
   }
@@ -8078,7 +8070,7 @@ var ServiceContext = class extends import_context17.Resource {
   async _initialize(ctx) {
     (0, import_log23.log)("initializing spaces...", void 0, {
       F: __dxlog_file28,
-      L: 301,
+      L: 305,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8114,10 +8106,10 @@ var ServiceContext = class extends import_context17.Resource {
     await this.dataSpaceManager.open();
     this.edgeAgentManager = new EdgeAgentManager(this._edgeFeatures, this._edgeHttpClient, this.dataSpaceManager, identity);
     await this.edgeAgentManager.open();
-    this._handlerFactories.set(import_services21.Invitation.Kind.SPACE, (invitation) => {
+    this._handlerFactories.set(import_services22.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant23.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file28,
-        L: 339,
+        L: 343,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -8141,7 +8133,7 @@ var ServiceContext = class extends import_context17.Resource {
             details: assertion
           }, {
             F: __dxlog_file28,
-            L: 355,
+            L: 359,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8152,7 +8144,7 @@ var ServiceContext = class extends import_context17.Resource {
             details: assertion
           }, {
             F: __dxlog_file28,
-            L: 359,
+            L: 363,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8163,7 +8155,7 @@ var ServiceContext = class extends import_context17.Resource {
             details: assertion
           }, {
             F: __dxlog_file28,
-            L: 364,
+            L: 368,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8174,7 +8166,7 @@ var ServiceContext = class extends import_context17.Resource {
         } catch (err) {
           import_log23.log.catch(err, void 0, {
             F: __dxlog_file28,
-            L: 370,
+            L: 374,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8184,9 +8176,13 @@ var ServiceContext = class extends import_context17.Resource {
     await identity.space.spaceState.addCredentialProcessor(this._deviceSpaceSync);
   }
   async _setNetworkIdentity(params) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx4();
-      const _ = _usingCtx.u(await this._edgeIdentityUpdateMutex.acquire());
+      const _ = _ts_add_disposable_resource4(env, await this._edgeIdentityUpdateMutex.acquire(), false);
       let edgeIdentity;
       const identity = this.identityManager.identity;
       if (identity) {
@@ -8195,7 +8191,7 @@ var ServiceContext = class extends import_context17.Resource {
           swarms: this.networkManager.topics
         }, {
           F: __dxlog_file28,
-          L: 384,
+          L: 388,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -8209,7 +8205,7 @@ var ServiceContext = class extends import_context17.Resource {
           });
           (0, import_invariant23.invariant)(identity.deviceCredentialChain, void 0, {
             F: __dxlog_file28,
-            L: 403,
+            L: 407,
             S: this,
             A: [
               "identity.deviceCredentialChain",
@@ -8227,10 +8223,11 @@ var ServiceContext = class extends import_context17.Resource {
         identityKey: edgeIdentity.identityKey,
         peerKey: edgeIdentity.peerKey
       });
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      _usingCtx.d();
+      _ts_dispose_resources4(env);
     }
   }
 };
@@ -8340,7 +8337,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file29,
-      L: 30,
+      L: 31,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8358,7 +8355,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file29,
-      L: 41,
+      L: 42,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8366,7 +8363,7 @@ var exportProfileData = async ({ storage, level }) => {
   {
     import_log25.log.info("begin exporting kv pairs", void 0, {
       F: __dxlog_file29,
-      L: 45,
+      L: 46,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8387,7 +8384,7 @@ var exportProfileData = async ({ storage, level }) => {
       count
     }, {
       F: __dxlog_file29,
-      L: 56,
+      L: 57,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8403,7 +8400,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         const directory = await storage.createDirectory();
         (0, import_invariant25.invariant)(typeof entry2.key === "string", "Invalid key type", {
           F: __dxlog_file29,
-          L: 79,
+          L: 80,
           S: void 0,
           A: [
             "typeof entry.key === 'string'",
@@ -8413,7 +8410,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         const file = await directory.getOrCreateFile(entry2.key);
         (0, import_invariant25.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file29,
-          L: 81,
+          L: 82,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8427,7 +8424,7 @@ var importProfileData = async ({ storage, level }, archive) => {
       case import_protocols21.ProfileArchiveEntryType.KEY_VALUE: {
         (0, import_invariant25.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
           F: __dxlog_file29,
-          L: 87,
+          L: 88,
           S: void 0,
           A: [
             "entry.key instanceof Uint8Array",
@@ -8436,7 +8433,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         (0, import_invariant25.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file29,
-          L: 88,
+          L: 89,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8461,7 +8458,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
         F: __dxlog_file29,
-        L: 101,
+        L: 102,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -8469,7 +8466,7 @@ var importProfileData = async ({ storage, level }, archive) => {
   }
   import_log25.log.info("committing changes..", void 0, {
     F: __dxlog_file29,
-    L: 109,
+    L: 110,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -8495,7 +8492,7 @@ var DevicesServiceImpl = class {
         } else {
           (0, import_invariant27.invariant)(this._identityManager.identity?.presence, "presence not present", {
             F: __dxlog_file30,
-            L: 36,
+            L: 37,
             S: this,
             A: [
               "this._identityManager.identity?.presence",
@@ -8508,15 +8505,15 @@ var DevicesServiceImpl = class {
               const isMe = this._identityManager.identity?.deviceKey.equals(key);
               let presence;
               if (isMe) {
-                presence = import_services23.Device.PresenceState.ONLINE;
+                presence = import_services24.Device.PresenceState.ONLINE;
               } else if (profile.os?.toUpperCase() === "EDGE") {
-                presence = this._edgeConnection?.isConnected ? import_services23.Device.PresenceState.ONLINE : import_services23.Device.PresenceState.OFFLINE;
+                presence = this._edgeConnection?.status === import_services24.EdgeStatus.CONNECTED ? import_services24.Device.PresenceState.ONLINE : import_services24.Device.PresenceState.OFFLINE;
               } else {
-                presence = peers.some((peer) => peer.identityKey.equals(key)) ? import_services23.Device.PresenceState.ONLINE : import_services23.Device.PresenceState.OFFLINE;
+                presence = peers.some((peer) => peer.identityKey.equals(key)) ? import_services24.Device.PresenceState.ONLINE : import_services24.Device.PresenceState.OFFLINE;
               }
               return {
                 deviceKey: key,
-                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services23.DeviceKind.CURRENT : import_services23.DeviceKind.TRUSTED,
+                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services24.DeviceKind.CURRENT : import_services24.DeviceKind.TRUSTED,
                 profile,
                 presence
               };
@@ -8737,28 +8734,29 @@ var LoggingServiceImpl = class {
 };
 var matchFilter = (filter, level, path2, options) => {
   switch (options) {
-    case import_services24.QueryLogsRequest.MatchingOptions.INCLUSIVE:
+    case import_services25.QueryLogsRequest.MatchingOptions.INCLUSIVE:
       return level >= filter.level && (!filter.pattern || path2.includes(filter.pattern));
-    case import_services24.QueryLogsRequest.MatchingOptions.EXPLICIT:
+    case import_services25.QueryLogsRequest.MatchingOptions.EXPLICIT:
       return level === filter.level && (!filter.pattern || path2.includes(filter.pattern));
   }
 };
 var shouldLog = (entry2, request) => {
-  const options = request.options ?? import_services24.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  const options = request.options ?? import_services25.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   if (request.filters === void 0) {
-    return options === import_services24.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+    return options === import_services25.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   } else {
     return request.filters.some((filter) => matchFilter(filter, entry2.level, entry2.meta?.F ?? "", options));
   }
 };
 var LOG_PROCESSING = 0;
 var NetworkServiceImpl = class {
-  constructor(networkManager, signalManager) {
+  constructor(networkManager, signalManager, edgeConnection) {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
+    this.edgeConnection = edgeConnection;
   }
   queryStatus() {
-    return new import_stream14.Stream(({ next }) => {
+    return new import_stream14.Stream(({ ctx, next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -8769,13 +8767,9 @@ var NetworkServiceImpl = class {
           }))
         });
       };
-      const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
-      const unsubscribeSignal = this.signalManager.statusChanged?.on(() => update());
+      this.networkManager.connectionStateChanged.on(ctx, () => update());
+      this.signalManager.statusChanged?.on(ctx, () => update());
       update();
-      return () => {
-        unsubscribeSwarm();
-        unsubscribeSignal?.();
-      };
     });
   }
   async updateConfig(request) {
@@ -8791,26 +8785,24 @@ var NetworkServiceImpl = class {
     return this.signalManager.query(request);
   }
   subscribeSwarmState(request) {
-    return new import_stream14.Stream(({ next }) => {
-      const unsubscribe = this.signalManager.swarmState?.on((state) => {
+    return new import_stream14.Stream(({ ctx, next }) => {
+      this.signalManager.swarmState?.on(ctx, (state) => {
         if (request.topic.equals(state.swarmKey)) {
           next(state);
         }
       });
-      return unsubscribe;
     });
   }
   async sendMessage(message) {
     return this.signalManager.sendMessage(message);
   }
   subscribeMessages(peer) {
-    return new import_stream14.Stream(({ next }) => {
-      const unsubscribe = this.signalManager.onMessage.on((message) => {
+    return new import_stream14.Stream(({ ctx, next }) => {
+      this.signalManager.onMessage.on(ctx, (message) => {
         if (message.recipient.peerKey === peer.peerKey) {
           next(message);
         }
       });
-      return unsubscribe;
     });
   }
 };
@@ -8834,8 +8826,8 @@ var SystemServiceImpl = class {
     return {
       timestamp: /* @__PURE__ */ new Date(),
       diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util17.jsonKeyReplacer)({
-        truncate: keys === import_services25.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
-        humanize: keys === import_services25.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
+        truncate: keys === import_services26.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
+        humanize: keys === import_services26.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
     };
   }
@@ -8899,6 +8891,9 @@ var ClientServicesHost = class {
     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,
@@ -8913,7 +8908,7 @@ var ClientServicesHost = class {
           if (!this._opening) {
             void this.open(new import_context18.Context(void 0, {
               F: __dxlog_file31,
-              L: 137
+              L: 141
             }));
           }
         },
@@ -8923,14 +8918,14 @@ var ClientServicesHost = class {
     this._systemService = new SystemServiceImpl({
       config: () => this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen && !this._resetting ? import_services22.SystemStatus.ACTIVE : import_services22.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen && !this._resetting ? import_services23.SystemStatus.ACTIVE : import_services23.SystemStatus.INACTIVE,
       getDiagnostics: () => {
         return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
       },
       onUpdateStatus: async (status) => {
-        if (!this.isOpen && status === import_services22.SystemStatus.ACTIVE) {
+        if (!this.isOpen && status === import_services23.SystemStatus.ACTIVE) {
           await this._resourceLock?.acquire();
-        } else if (this.isOpen && status === import_services22.SystemStatus.INACTIVE) {
+        } else if (this.isOpen && status === import_services23.SystemStatus.INACTIVE) {
           await this._resourceLock?.release();
         }
       },
@@ -8971,7 +8966,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     (0, import_invariant26.invariant)(!this._open, "service host is open", {
       F: __dxlog_file31,
-      L: 203,
+      L: 207,
       S: this,
       A: [
         "!this._open",
@@ -8980,14 +8975,14 @@ var ClientServicesHost = class {
     });
     (0, import_log26.log)("initializing...", void 0, {
       F: __dxlog_file31,
-      L: 204,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       (0, import_invariant26.invariant)(!this._config, "config already set", {
         F: __dxlog_file31,
-        L: 207,
+        L: 211,
         S: this,
         A: [
           "!this._config",
@@ -9002,7 +8997,7 @@ var ClientServicesHost = class {
     if (!options.signalManager) {
       import_log26.log.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file31,
-        L: 215,
+        L: 219,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -9022,7 +9017,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     (0, import_invariant26.invariant)(!this._networkManager, "network manager already set", {
       F: __dxlog_file31,
-      L: 237,
+      L: 241,
       S: this,
       A: [
         "!this._networkManager",
@@ -9040,7 +9035,7 @@ var ClientServicesHost = class {
     });
     (0, import_log26.log)("initialized", void 0, {
       F: __dxlog_file31,
-      L: 250,
+      L: 254,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9054,13 +9049,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 261,
+      L: 265,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant26.invariant)(this._config, "config not set", {
       F: __dxlog_file31,
-      L: 263,
+      L: 267,
       S: this,
       A: [
         "this._config",
@@ -9069,7 +9064,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant26.invariant)(this._storage, "storage not set", {
       F: __dxlog_file31,
-      L: 264,
+      L: 268,
       S: this,
       A: [
         "this._storage",
@@ -9078,7 +9073,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant26.invariant)(this._signalManager, "signal manager not set", {
       F: __dxlog_file31,
-      L: 265,
+      L: 269,
       S: this,
       A: [
         "this._signalManager",
@@ -9087,7 +9082,7 @@ var ClientServicesHost = class {
     });
     (0, import_invariant26.invariant)(this._networkManager, "network manager not set", {
       F: __dxlog_file31,
-      L: 266,
+      L: 270,
       S: this,
       A: [
         "this._networkManager",
@@ -9099,7 +9094,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file31,
-      L: 269,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9128,7 +9123,7 @@ var ClientServicesHost = class {
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, dataSpaceManagerProvider),
       DataService: this._serviceContext.echoHost.dataService,
       QueryService: this._serviceContext.echoHost.queryService,
-      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
+      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager, this._edgeConnection),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
       // TODO(burdon): Move to new protobuf definitions.
@@ -9160,7 +9155,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file31,
-      L: 366,
+      L: 374,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9168,7 +9163,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 367,
+      L: 375,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9182,7 +9177,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file31,
-      L: 378,
+      L: 386,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9200,7 +9195,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file31,
-      L: 387,
+      L: 395,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9211,13 +9206,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 392,
+      L: 400,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log26.log.info("resetting...", void 0, {
       F: __dxlog_file31,
-      L: 394,
+      L: 402,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9227,7 +9222,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     import_log26.log.info("reset", void 0, {
       F: __dxlog_file31,
-      L: 401,
+      L: 409,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9235,7 +9230,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 402,
+      L: 410,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9313,4 +9308,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-A2WCOW6P.cjs.map
+//# sourceMappingURL=chunk-LYHT7662.cjs.map