@dxos/client-services 0.8.2-main.fbd8ed0 → 0.8.2-staging.7ac8446

package/dist/lib/node/{chunk-Y747YVDI.cjs → chunk-HUMVSL5Y.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_Y747YVDI_exports = {};
-__export(chunk_Y747YVDI_exports, {
+var chunk_HUMVSL5Y_exports = {};
+__export(chunk_HUMVSL5Y_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,7 +72,7 @@ __export(chunk_Y747YVDI_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_Y747YVDI_exports);
+module.exports = __toCommonJS(chunk_HUMVSL5Y_exports);
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_feed_store = require("@dxos/feed-store");
@@ -116,10 +116,9 @@ 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");
@@ -129,7 +128,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_services5 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services4 = 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");
@@ -138,7 +137,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_services6 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services5 = 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");
@@ -163,8 +162,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");
@@ -176,7 +175,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_services7 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services6 = 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");
@@ -195,7 +194,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_services8 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services7 = 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");
@@ -211,7 +210,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_services9 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services8 = 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");
@@ -223,12 +222,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_services10 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services9 = 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_services11 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services10 = 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");
@@ -238,7 +237,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_services12 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services11 = 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");
@@ -250,9 +249,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_services13 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services12 = 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_services13 = 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");
@@ -269,26 +268,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_services15 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services14 = 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_services16 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services15 = 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_services17 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services16 = 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_services18 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services17 = 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");
@@ -298,7 +297,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_services19 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services18 = 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");
@@ -313,11 +312,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_services20 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services19 = 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_services21 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services20 = 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");
@@ -330,7 +329,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_services22 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services21 = 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");
@@ -351,7 +350,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("@automerge/automerge-repo");
+var import_automerge_repo2 = require("@dxos/automerge/automerge-repo");
 var import_invariant25 = require("@dxos/invariant");
 var import_log25 = require("@dxos/log");
 var import_protocols21 = require("@dxos/protocols");
@@ -366,13 +365,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_services23 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services22 = 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_services24 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services23 = 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");
@@ -381,11 +380,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_services25 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services24 = 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_services26 = require("@dxos/protocols/proto/dxos/client/services");
+var import_services25 = 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 }) => {
@@ -745,7 +744,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.8.2-main.fbd8ed0";
+var DXOS_VERSION = "0.8.2-staging.7ac8446";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1137,7 +1136,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   async _open() {
     (0, import_log3.log)("open", void 0, {
       F: __dxlog_file5,
-      L: 57,
+      L: 56,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1156,7 +1155,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
           _spaceId: this._spaceId
         }, {
           F: __dxlog_file5,
-          L: 71,
+          L: 70,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1169,7 +1168,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         type: payload.type
       }, {
         F: __dxlog_file5,
-        L: 76,
+        L: 75,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1181,14 +1180,14 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   }
   async _handleReconnect() {
     await this._resetConnection();
-    if (this._messenger.status === import_services4.EdgeStatus.CONNECTED) {
+    if (this._messenger.isConnected) {
       this._startReplication();
     }
   }
   async _close() {
     (0, import_log3.log)("close", void 0, {
       F: __dxlog_file5,
-      L: 96,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1200,7 +1199,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     this._connectionCtx = connectionCtx;
     (0, import_log3.log)("connection context created", void 0, {
       F: __dxlog_file5,
-      L: 104,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1213,7 +1212,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   async _resetConnection() {
     (0, import_log3.log)("resetConnection", void 0, {
       F: __dxlog_file5,
-      L: 113,
+      L: 112,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1229,7 +1228,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file5,
-      L: 121,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1246,7 +1245,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       key: feed.key
     }, {
       F: __dxlog_file5,
-      L: 134,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1262,7 +1261,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: 147,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1274,14 +1273,14 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
         blocks: message.blocks.map((b) => b.index)
       }, {
         F: __dxlog_file5,
-        L: 152,
+        L: 151,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     (0, import_invariant2.invariant)(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 158,
+      L: 157,
       S: this,
       A: [
         "message.feedKey",
@@ -1293,7 +1292,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       type: message.type
     }, {
       F: __dxlog_file5,
-      L: 161,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1312,7 +1311,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: 176,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1330,7 +1329,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 185,
+                L: 184,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1346,7 +1345,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: 195,
+                L: 194,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1361,7 +1360,7 @@ 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: 203,
+                L: 202,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1380,7 +1379,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 212,
+            L: 211,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1391,7 +1390,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 217,
+              L: 216,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1405,7 +1404,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 226,
+            L: 225,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1420,7 +1419,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 233,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1430,7 +1429,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       });
       (0, import_invariant2.invariant)(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 238,
+        L: 237,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1458,7 +1457,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 259,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1480,7 +1479,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       if (!this._remoteLength.has(feed.key)) {
         (0, import_log3.log)("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 280,
+          L: 279,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1505,7 +1504,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: 297,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1516,7 +1515,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       }
     }, {
       F: __dxlog_file5,
-      L: 291
+      L: 290
     });
     return connectionCtx;
   }
@@ -1578,37 +1577,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_services6.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+    case import_services5.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
       const document = context.echoHost.createDoc();
       await context.echoHost.flush();
       return {
         newRoot: document.url
       };
     }
-    case import_services6.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY: {
+    case import_services5.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.doc());
+      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
       await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
     }
-    case import_services6.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
+    case import_services5.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
       throw new Error("Migration not available");
     }
-    case import_services6.CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
+    case import_services5.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_services6.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
+    case import_services5.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       (0, import_invariant4.invariant)(context.newAutomergeRoot, void 0, {
         F: __dxlog_file6,
-        L: 63,
+        L: 62,
         S: void 0,
         A: [
           "context.newAutomergeRoot",
@@ -2208,15 +2207,14 @@ var DataSpaceManager = class extends import_context7.Resource {
       id: "spaces",
       name: "Spaces",
       fetch: async () => {
-        return Promise.all(Array.from(this._spaces.values()).map(async (space) => {
+        return Array.from(this._spaces.values()).map((space) => {
           const rootUrl = space.automergeSpaceState.rootUrl;
-          const rootHandle = rootUrl ? await this._echoHost.automergeRepo.find(rootUrl, import_echo_pipeline2.FIND_PARAMS) : void 0;
-          await rootHandle?.whenReady();
-          const rootDoc = rootHandle?.doc();
+          const rootHandle = rootUrl ? this._echoHost.automergeRepo.find(rootUrl) : void 0;
+          const rootDoc = rootHandle?.docSync();
           const properties = rootDoc && (0, import_echo_pipeline2.findInlineObjectOfType)(rootDoc, import_client_protocol4.TYPE_PROPERTIES);
           return {
             key: space.key.toHex(),
-            state: import_services7.SpaceState[space.state],
+            state: import_services6.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,
@@ -2224,7 +2222,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             members: space.inner.spaceState.members.size,
             rootUrl
           };
-        }));
+        });
       }
     });
   }
@@ -2240,7 +2238,7 @@ var DataSpaceManager = class extends import_context7.Resource {
   async _open() {
     (0, import_log8.log)("open", void 0, {
       F: __dxlog_file9,
-      L: 215,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2248,7 +2246,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 216,
+      L: 214,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2256,7 +2254,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file9,
-      L: 217,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2266,7 +2264,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           spaceMetadata
         }, {
           F: __dxlog_file9,
-          L: 221,
+          L: 219,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2277,7 +2275,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           err
         }, {
           F: __dxlog_file9,
-          L: 224,
+          L: 222,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2288,7 +2286,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 230,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2296,7 +2294,7 @@ var DataSpaceManager = class extends import_context7.Resource {
   async _close() {
     (0, import_log8.log)("close", void 0, {
       F: __dxlog_file9,
-      L: 235,
+      L: 233,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2320,14 +2318,14 @@ var DataSpaceManager = class extends import_context7.Resource {
       genesisFeedKey: controlFeedKey,
       controlFeedKey,
       dataFeedKey,
-      state: import_services7.SpaceState.SPACE_ACTIVE
+      state: import_services6.SpaceState.SPACE_ACTIVE
     };
     (0, import_log8.log)("creating space...", {
       spaceId,
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 264,
+      L: 262,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2335,7 +2333,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: 269,
+        L: 267,
         S: this,
         A: [
           "Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId))",
@@ -2347,7 +2345,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           documentId
         }, {
           F: __dxlog_file9,
-          L: 276,
+          L: 274,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2361,7 +2359,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 283,
+      L: 281,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2370,7 +2368,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: 288
+        L: 286
       }), newRootDocId);
       import_echo_pipeline2.DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
       root = await this._echoHost.openSpaceRoot(spaceId, `automerge:${newRootDocId}`);
@@ -2381,7 +2379,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 296,
+      L: 294,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2391,7 +2389,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 301,
+      L: 299,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2400,7 +2398,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: 307,
+      L: 305,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2414,7 +2412,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 312,
+      L: 310,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2427,18 +2425,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     }
     switch (space.databaseRoot.getVersion()) {
       case import_echo_protocol2.SpaceDocVersion.CURRENT: {
-        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) ?? [];
+        const [_, properties] = (0, import_echo_pipeline2.findInlineObjectOfType)(space.databaseRoot.docSync(), import_client_protocol4.TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       case import_echo_protocol2.SpaceDocVersion.LEGACY: {
@@ -2450,7 +2437,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           spaceId: space.id
         }, {
           F: __dxlog_file9,
-          L: 336,
+          L: 330,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2471,7 +2458,7 @@ var DataSpaceManager = class extends import_context7.Resource {
         keys: []
       }
     };
-    const propertiesId = import_echo_schema.ObjectId.random();
+    const propertiesId = (0, import_echo_schema.createObjectId)();
     document.change((doc) => {
       (0, import_util7.setDeep)(doc, [
         "objects",
@@ -2485,14 +2472,14 @@ var DataSpaceManager = class extends import_context7.Resource {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant7.invariant)(automergeIndex, void 0, {
       F: __dxlog_file9,
-      L: 369,
+      L: 363,
       S: this,
       A: [
         "automergeIndex",
         ""
       ]
     });
-    const document = await this._echoHost.automergeRepo.find(automergeIndex, import_echo_pipeline2.FIND_PARAMS);
+    const document = this._echoHost.automergeRepo.find(automergeIndex);
     await document.whenReady();
     return document;
   }
@@ -2502,13 +2489,13 @@ var DataSpaceManager = class extends import_context7.Resource {
       opts
     }, {
       F: __dxlog_file9,
-      L: 378,
+      L: 372,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant7.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file9,
-      L: 379,
+      L: 373,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2517,7 +2504,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     });
     (0, import_invariant7.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file9,
-      L: 380,
+      L: 374,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -2541,7 +2528,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: 400,
+      L: 394,
       S: this,
       A: [
         "space",
@@ -2554,7 +2541,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: 419,
+      L: 413,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2564,7 +2551,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: 421,
+      L: 415,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2582,7 +2569,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_services7.SpaceState.SPACE_READY;
+      return !!space && space.state === import_services6.SpaceState.SPACE_READY;
     }));
   }
   async requestSpaceAdmissionCredential(spaceKey) {
@@ -2602,7 +2589,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: 458,
+      L: 452,
       S: this,
       A: [
         "space",
@@ -2627,7 +2614,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       metadata
     }, {
       F: __dxlog_file9,
-      L: 477,
+      L: 471,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2671,7 +2658,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             err
           }, {
             F: __dxlog_file9,
-            L: 519,
+            L: 513,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2681,13 +2668,13 @@ var DataSpaceManager = class extends import_context7.Resource {
       onAuthFailure: () => {
         import_log8.log.warn("auth failure", void 0, {
           F: __dxlog_file9,
-          L: 524,
+          L: 518,
           S: this,
           C: (f, a) => f(...a)
         });
       },
       onMemberRolesChanged: async (members) => {
-        if (dataSpace?.state === import_services7.SpaceState.SPACE_READY) {
+        if (dataSpace?.state === import_services6.SpaceState.SPACE_READY) {
           this._handleMemberRoleChanges(presence, space.protocol, members);
         }
       },
@@ -2700,7 +2687,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     dataFeed && await space.setDataFeed(dataFeed);
     const dataSpace = new DataSpace({
       inner: space,
-      initialState: metadata.state === import_services7.SpaceState.SPACE_INACTIVE ? import_services7.SpaceState.SPACE_INACTIVE : import_services7.SpaceState.SPACE_CLOSED,
+      initialState: metadata.state === import_services6.SpaceState.SPACE_INACTIVE ? import_services6.SpaceState.SPACE_INACTIVE : import_services6.SpaceState.SPACE_CLOSED,
       metadataStore: this._metadataStore,
       gossip,
       presence,
@@ -2714,7 +2701,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 551,
+            L: 545,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2725,7 +2712,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             open: this._lifecycleState === import_context7.LifecycleState.OPEN
           }, {
             F: __dxlog_file9,
-            L: 554,
+            L: 548,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2744,7 +2731,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 562,
+            L: 556,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2765,7 +2752,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           spaceId: dataSpace.id
         }, {
           F: __dxlog_file9,
-          L: 576,
+          L: 570,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2778,7 +2765,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       }
     });
     presence.newPeer.on((peerState) => {
-      if (dataSpace.state === import_services7.SpaceState.SPACE_READY) {
+      if (dataSpace.state === import_services6.SpaceState.SPACE_READY) {
         this._handleNewPeerConnected(space, peerState);
       }
     });
@@ -2795,7 +2782,7 @@ var DataSpaceManager = class extends import_context7.Resource {
         space: space.key
       }, {
         F: __dxlog_file9,
-        L: 603,
+        L: 597,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2828,7 +2815,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       closedSessions
     }, {
       F: __dxlog_file9,
-      L: 629,
+      L: 623,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2843,7 +2830,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file9,
-          L: 643,
+          L: 637,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2852,7 +2839,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     }
   }
   async _handleInvitationStatusChange(dataSpace, delegatedInvitation, isActive) {
-    if (dataSpace?.state !== import_services7.SpaceState.SPACE_READY) {
+    if (dataSpace?.state !== import_services6.SpaceState.SPACE_READY) {
       return;
     }
     if (isActive) {
@@ -2869,8 +2856,8 @@ var DataSpaceManager = class extends import_context7.Resource {
   async _createDelegatedInvitations(space, invitations) {
     const tasks = invitations.map(([credentialId, invitation]) => {
       return this._invitationsManager.createInvitation({
-        type: import_services7.Invitation.Type.DELEGATED,
-        kind: import_services7.Invitation.Kind.SPACE,
+        type: import_services6.Invitation.Type.DELEGATED,
+        kind: import_services6.Invitation.Kind.SPACE,
         spaceKey: space.key,
         authMethod: invitation.authMethod,
         invitationId: invitation.invitationId,
@@ -2965,7 +2952,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: 28,
+      L: 27,
       S: void 0,
       A: [
         "!documentId.includes('/')",
@@ -2979,7 +2966,7 @@ var extractSpaceArchive = async (archive) => {
     documents
   }, {
     F: __dxlog_file10,
-    L: 32,
+    L: 31,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -3069,10 +3056,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_services8.SpaceState.SPACE_ACTIVE:
+        case import_services7.SpaceState.SPACE_ACTIVE:
           await space.activate();
           break;
-        case import_services8.SpaceState.SPACE_INACTIVE:
+        case import_services7.SpaceState.SPACE_INACTIVE:
           await space.deactivate();
           break;
         default:
@@ -3098,7 +3085,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: 119,
+      L: 118,
       S: this,
       A: [
         "credentials[0].credential",
@@ -3108,7 +3095,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: 121,
+      L: 120,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3126,7 +3113,7 @@ var SpacesServiceImpl = class {
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file11,
-          L: 134,
+          L: 133,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3218,7 +3205,7 @@ var SpacesServiceImpl = class {
       } else {
         (0, import_invariant8.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file11,
-          L: 232,
+          L: 231,
           S: this,
           A: [
             "!credential.id",
@@ -3227,7 +3214,7 @@ var SpacesServiceImpl = class {
         });
         (0, import_invariant8.invariant)(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file11,
-          L: 233,
+          L: 232,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -3237,7 +3224,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: 235,
+          L: 234,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -3314,7 +3301,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: 289,
+      L: 288,
       S: this,
       A: [
         "extracted.metadata.echo?.currentRootUrl",
@@ -3334,7 +3321,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: 300,
+      L: 299,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3344,7 +3331,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: 302,
+      L: 301,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -3401,7 +3388,7 @@ var SpacesServiceImpl = class {
             profile: member.profile ?? {}
           },
           role: member.role,
-          presence: peers.length > 0 ? import_services8.SpaceMember.PresenceState.ONLINE : import_services8.SpaceMember.PresenceState.OFFLINE,
+          presence: peers.length > 0 ? import_services7.SpaceMember.PresenceState.ONLINE : import_services7.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
       })),
@@ -3988,8 +3975,8 @@ var IdentityManager = class {
     this.stateUpdate.emit();
     return {
       deviceKey: this._identity.deviceKey,
-      kind: import_services9.DeviceKind.CURRENT,
-      presence: import_services9.Device.PresenceState.ONLINE,
+      kind: import_services8.DeviceKind.CURRENT,
+      presence: import_services8.Device.PresenceState.ONLINE,
       profile
     };
   }
@@ -4263,9 +4250,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_services10.SpaceState.SPACE_CLOSED) {
+      if (space.state === import_services9.SpaceState.SPACE_CLOSED) {
         await space.open();
-        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === import_services10.SpaceState.SPACE_REQUIRES_MIGRATION);
+        const requiresMigration = space.stateUpdate.waitForCondition(() => space.state === import_services9.SpaceState.SPACE_REQUIRES_MIGRATION);
         await Promise.race([
           space.initializeDataPipeline(),
           requiresMigration
@@ -4379,13 +4366,13 @@ var DataSpace = class {
   constructor(params) {
     this._ctx = new import_context4.Context(void 0, {
       F: __dxlog_file15,
-      L: 100
+      L: 97
     });
     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_services5.SpaceState.SPACE_CLOSED;
+    this._state = import_services4.SpaceState.SPACE_CLOSED;
     this._databaseRoot = null;
     this.error = void 0;
     this.stateUpdate = new import_async7.Event();
@@ -4425,10 +4412,10 @@ var DataSpace = class {
     }
     this._state = params.initialState;
     (0, import_log4.log)("new state", {
-      state: import_services5.SpaceState[this._state]
+      state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 176,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4471,7 +4458,7 @@ var DataSpace = class {
     };
   }
   async open() {
-    if (this._state === import_services5.SpaceState.SPACE_CLOSED) {
+    if (this._state === import_services4.SpaceState.SPACE_CLOSED) {
       await this._open();
     }
   }
@@ -4487,16 +4474,16 @@ var DataSpace = class {
     }
     await this._inner.open(new import_context4.Context(void 0, {
       F: __dxlog_file15,
-      L: 250
+      L: 247
     }));
     await this._inner.startProtocol();
     await this._edgeFeedReplicator?.open();
-    this._state = import_services5.SpaceState.SPACE_CONTROL_ONLY;
+    this._state = import_services4.SpaceState.SPACE_CONTROL_ONLY;
     (0, import_log4.log)("new state", {
-      state: import_services5.SpaceState[this._state]
+      state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 256,
+      L: 253,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4511,19 +4498,19 @@ var DataSpace = class {
   async _close() {
     await this._callbacks.beforeClose?.();
     await this.preClose.callSerial();
-    this._state = import_services5.SpaceState.SPACE_CLOSED;
+    this._state = import_services4.SpaceState.SPACE_CLOSED;
     (0, import_log4.log)("new state", {
-      state: import_services5.SpaceState[this._state]
+      state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 275,
+      L: 272,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new import_context4.Context(void 0, {
       F: __dxlog_file15,
-      L: 277
+      L: 274
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4556,7 +4543,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: 315,
+            L: 312,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4564,16 +4551,16 @@ var DataSpace = class {
         }
         import_log4.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file15,
-          L: 319,
+          L: 316,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._state = import_services5.SpaceState.SPACE_ERROR;
+        this._state = import_services4.SpaceState.SPACE_ERROR;
         (0, import_log4.log)("new state", {
-          state: import_services5.SpaceState[this._state]
+          state: import_services4.SpaceState[this._state]
         }, {
           F: __dxlog_file15,
-          L: 321,
+          L: 318,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4585,44 +4572,44 @@ var DataSpace = class {
     });
   }
   async initializeDataPipeline() {
-    if (this._state !== import_services5.SpaceState.SPACE_CONTROL_ONLY) {
+    if (this._state !== import_services4.SpaceState.SPACE_CONTROL_ONLY) {
       throw new import_protocols3.SystemError("Invalid operation");
     }
-    this._state = import_services5.SpaceState.SPACE_INITIALIZING;
+    this._state = import_services4.SpaceState.SPACE_INITIALIZING;
     (0, import_log4.log)("new state", {
-      state: import_services5.SpaceState[this._state]
+      state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 337,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log4.log)("initializing control pipeline", void 0, {
       F: __dxlog_file15,
-      L: 339,
+      L: 336,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
     await (0, import_async7.sleep)(1);
-    const ready = this.stateUpdate.waitForCondition(() => this._state === import_services5.SpaceState.SPACE_READY);
+    const ready = this.stateUpdate.waitForCondition(() => this._state === import_services4.SpaceState.SPACE_READY);
     (0, import_log4.log)("initializing automerge root", void 0, {
       F: __dxlog_file15,
-      L: 347,
+      L: 344,
       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: 351,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
     await ready;
     (0, import_log4.log)("space is ready", void 0, {
       F: __dxlog_file15,
-      L: 353,
+      L: 350,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4630,14 +4617,14 @@ var DataSpace = class {
   async *getAllDocuments() {
     (0, import_invariant3.invariant)(this._databaseRoot, "Space is not ready", {
       F: __dxlog_file15,
-      L: 357,
+      L: 354,
       S: this,
       A: [
         "this._databaseRoot",
         "'Space is not ready'"
       ]
     });
-    const doc = this._databaseRoot.doc() ?? (0, import_invariant3.failedInvariant)();
+    const doc = this._databaseRoot.docSync() ?? (0, import_invariant3.failedInvariant)();
     const root = (0, import_automerge.save)(doc);
     yield [
       this._databaseRoot.documentId,
@@ -4646,7 +4633,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: 363
+        L: 360
       }), documentUrl);
       yield [
         documentUrl.replace(/^automerge:/, ""),
@@ -4656,12 +4643,12 @@ var DataSpace = class {
   }
   async _enterReadyState() {
     await this._callbacks.beforeReady?.();
-    this._state = import_services5.SpaceState.SPACE_READY;
+    this._state = import_services4.SpaceState.SPACE_READY;
     (0, import_log4.log)("new state", {
-      state: import_services5.SpaceState[this._state]
+      state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 372,
+      L: 369,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4678,7 +4665,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     (0, import_log4.log)("writable feeds created", void 0, {
       F: __dxlog_file15,
-      L: 389,
+      L: 386,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4732,7 +4719,7 @@ var DataSpace = class {
           count: credentials.length
         }, {
           F: __dxlog_file15,
-          L: 447,
+          L: 444,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4743,14 +4730,14 @@ var DataSpace = class {
         });
         (0, import_log4.log)("credentials notarized", void 0, {
           F: __dxlog_file15,
-          L: 451,
+          L: 448,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         import_log4.log.error("error notarizing credentials for feed admission", err, {
           F: __dxlog_file15,
-          L: 453,
+          L: 450,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4765,17 +4752,16 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file15,
-      L: 463,
+      L: 460,
       S: this,
       C: (f, a) => f(...a)
     });
-    let handle;
+    const handle = this._echoHost.automergeRepo.find(rootUrl);
     queueMicrotask(async () => {
       try {
         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) {
@@ -4785,7 +4771,7 @@ var DataSpace = class {
             // Ensure only one root is processed at a time.
             _usingCtx.u(await this._epochProcessingMutex.acquire())
           );
-          const doc = handle.doc() ?? (0, import_invariant3.failedInvariant)();
+          const doc = handle.docSync() ?? (0, import_invariant3.failedInvariant)();
           if (!doc.access?.spaceKey) {
             handle.change((doc2) => {
               doc2.access = {
@@ -4796,9 +4782,9 @@ 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_services5.SpaceState.SPACE_REQUIRES_MIGRATION;
+            this._state = import_services4.SpaceState.SPACE_REQUIRES_MIGRATION;
             this.stateUpdate.emit();
-          } else if (this._state !== import_services5.SpaceState.SPACE_READY) {
+          } else if (this._state !== import_services4.SpaceState.SPACE_READY) {
             await this._enterReadyState();
           } else {
             this.stateUpdate.emit();
@@ -4818,7 +4804,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file15,
-          L: 510,
+          L: 503,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4886,29 +4872,29 @@ var DataSpace = class {
   }
   async activate() {
     if (![
-      import_services5.SpaceState.SPACE_CLOSED,
-      import_services5.SpaceState.SPACE_INACTIVE
+      import_services4.SpaceState.SPACE_CLOSED,
+      import_services4.SpaceState.SPACE_INACTIVE
     ].includes(this._state)) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services5.SpaceState.SPACE_ACTIVE);
+    await this._metadataStore.setSpaceState(this.key, import_services4.SpaceState.SPACE_ACTIVE);
     await this._open();
     this.initializeDataPipelineAsync();
   }
   async deactivate() {
-    if (this._state === import_services5.SpaceState.SPACE_INACTIVE) {
+    if (this._state === import_services4.SpaceState.SPACE_INACTIVE) {
       return;
     }
-    await this._metadataStore.setSpaceState(this.key, import_services5.SpaceState.SPACE_INACTIVE);
-    if (this._state !== import_services5.SpaceState.SPACE_CLOSED) {
+    await this._metadataStore.setSpaceState(this.key, import_services4.SpaceState.SPACE_INACTIVE);
+    if (this._state !== import_services4.SpaceState.SPACE_CLOSED) {
       await this._close();
     }
-    this._state = import_services5.SpaceState.SPACE_INACTIVE;
+    this._state = import_services4.SpaceState.SPACE_INACTIVE;
     (0, import_log4.log)("new state", {
-      state: import_services5.SpaceState[this._state]
+      state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file15,
-      L: 592,
+      L: 585,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4929,7 +4915,7 @@ _ts_decorate6([
 ], DataSpace.prototype, "key", null);
 _ts_decorate6([
   import_tracing3.trace.info({
-    enum: import_services5.SpaceState
+    enum: import_services4.SpaceState
   })
 ], DataSpace.prototype, "state", null);
 _ts_decorate6([
@@ -4983,7 +4969,7 @@ var DeviceInvitationProtocol = class {
   }
   getInvitationContext() {
     return {
-      kind: import_services11.Invitation.Kind.DEVICE
+      kind: import_services10.Invitation.Kind.DEVICE
     };
   }
   async delegate() {
@@ -5086,7 +5072,7 @@ var DeviceInvitationProtocol = class {
   }
 };
 var stateToString = (state) => {
-  return Object.entries(import_services14.Invitation.State).find(([key, val]) => val === state)?.[0] ?? "unknown";
+  return Object.entries(import_services13.Invitation.State).find(([key, val]) => val === state)?.[0] ?? "unknown";
 };
 var computeExpirationTime = (invitation) => {
   if (!invitation.lifetime) {
@@ -5129,7 +5115,7 @@ var EdgeInvitationHandler = class {
     }
     const invitation = guardedState.current;
     const spaceId = invitation.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);
+    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);
     if (!canBeHandledByEdge) {
       (0, import_log14.log)("invitation could not be handled by edge", {
         invitation
@@ -5198,7 +5184,7 @@ var EdgeInvitationHandler = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      guardedState.set(this, import_services13.Invitation.State.CONNECTING);
+      guardedState.set(this, import_services12.Invitation.State.CONNECTING);
       const response = await this._joinSpaceByInvitation(guardedState, spaceId, {
         identityKey: admissionRequest.identityKey.toHex(),
         invitationId: guardedState.current.invitationId
@@ -5208,7 +5194,7 @@ var EdgeInvitationHandler = class {
         space: admissionRequest
       });
     } catch (error) {
-      guardedState.set(this, import_services13.Invitation.State.ERROR);
+      guardedState.set(this, import_services12.Invitation.State.ERROR);
       throw error;
     } finally {
       this._flowLock?.release();
@@ -5443,7 +5429,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
             C: (f, a) => f(...a)
           });
           const invitation = this._requireActiveInvitation();
-          this._assertInvitationState(import_services15.Invitation.State.CONNECTED);
+          this._assertInvitationState(import_services14.Invitation.State.CONNECTED);
           if (invitationId !== invitation?.invitationId) {
             import_log16.log.warn("incorrect invitationId", {
               expected: invitation.invitationId,
@@ -5457,7 +5443,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_services15.Invitation.AuthMethod.NONE
+              authMethod: import_services14.Invitation.AuthMethod.NONE
             };
           }
           import_log16.log.verbose("guest introduced themselves", {
@@ -5469,8 +5455,8 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
             C: (f, a) => f(...a)
           });
           this.guestProfile = profile;
-          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;
+          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;
           import_log16.log.trace("dxos.sdk.invitation-handler.host.introduce", import_protocols14.trace.end({
             id: traceId
           }), {
@@ -5505,12 +5491,12 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
           });
           let status = import_invitations4.AuthenticationResponse.Status.OK;
           this._assertInvitationState([
-            import_services15.Invitation.State.AUTHENTICATING,
-            import_services15.Invitation.State.READY_FOR_AUTHENTICATION
+            import_services14.Invitation.State.AUTHENTICATING,
+            import_services14.Invitation.State.READY_FOR_AUTHENTICATION
           ]);
-          this._callbacks.onStateUpdate(import_services15.Invitation.State.AUTHENTICATING);
+          this._callbacks.onStateUpdate(import_services14.Invitation.State.AUTHENTICATING);
           switch (invitation.authMethod) {
-            case import_services15.Invitation.AuthMethod.NONE: {
+            case import_services14.Invitation.AuthMethod.NONE: {
               (0, import_log16.log)("authentication not required", void 0, {
                 F: __dxlog_file19,
                 L: 154,
@@ -5521,7 +5507,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
                 status: import_invitations4.AuthenticationResponse.Status.OK
               };
             }
-            case import_services15.Invitation.AuthMethod.SHARED_SECRET: {
+            case import_services14.Invitation.AuthMethod.SHARED_SECRET: {
               if (invitation.authCode) {
                 if (this.authenticationRetry++ > MAX_OTP_ATTEMPTS) {
                   status = import_invitations4.AuthenticationResponse.Status.INVALID_OPT_ATTEMPTS;
@@ -5533,7 +5519,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
               }
               break;
             }
-            case import_services15.Invitation.AuthMethod.KNOWN_PUBLIC_KEY: {
+            case import_services14.Invitation.AuthMethod.KNOWN_PUBLIC_KEY: {
               if (!invitation.guestKeypair) {
                 status = import_invitations4.AuthenticationResponse.Status.INTERNAL_ERROR;
                 break;
@@ -5597,7 +5583,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
           const invitation = this._requireActiveInvitation();
           try {
             if (isAuthenticationRequired(invitation)) {
-              this._assertInvitationState(import_services15.Invitation.State.AUTHENTICATING);
+              this._assertInvitationState(import_services14.Invitation.State.AUTHENTICATING);
               if (!this.authenticationPassed) {
                 throw new Error("Not authenticated");
               }
@@ -5636,7 +5622,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
         S: this,
         C: (f, a) => f(...a)
       });
-      this._callbacks.onStateUpdate(import_services15.Invitation.State.CONNECTING);
+      this._callbacks.onStateUpdate(import_services14.Invitation.State.CONNECTING);
       await this.rpc.InvitationHostService.options({
         role: import_invitations4.InvitationOptions.Role.HOST
       });
@@ -5662,7 +5648,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
           remotePeerId: context.remotePeerId
         });
       }
-      this._callbacks.onStateUpdate(import_services15.Invitation.State.CONNECTED);
+      this._callbacks.onStateUpdate(import_services14.Invitation.State.CONNECTED);
       this._callbacks.onOpen(this._ctx, context);
     } catch (err) {
       if (this._invitationFlowLock != null) {
@@ -5711,7 +5697,7 @@ var InvitationHostExtension = class extends import_teleport3.RpcExtension {
     }
   }
 };
-var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services15.Invitation.AuthMethod.NONE;
+var isAuthenticationRequired = (invitation) => invitation.authMethod !== import_services14.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();
@@ -5755,10 +5741,10 @@ var createGuardedInvitationState = (ctx, invitation, stream) => {
     },
     error: (lockHolder, error) => {
       if (isStateChangeAllowed(lockHolder)) {
-        logStateUpdate(currentInvitation, lockHolder, import_services16.Invitation.State.ERROR, error);
+        logStateUpdate(currentInvitation, lockHolder, import_services15.Invitation.State.ERROR, error);
         currentInvitation = {
           ...currentInvitation,
-          state: import_services16.Invitation.State.ERROR
+          state: import_services15.Invitation.State.ERROR
         };
         stream.next(currentInvitation);
         stream.error(error);
@@ -5796,11 +5782,11 @@ var logStateUpdate = (invitation, actor, newState, error) => {
 };
 var isNonTerminalState = (currentState) => {
   return ![
-    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
+    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
   ].includes(currentState);
 };
 var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/invitation-topology.ts";
@@ -5906,7 +5892,7 @@ var InvitationsHandler = class {
           return ctx.disposed ? null : guardedState.current;
         },
         onStateUpdate: (newState) => {
-          if (newState !== import_services12.Invitation.State.ERROR && newState !== import_services12.Invitation.State.TIMEOUT) {
+          if (newState !== import_services11.Invitation.State.ERROR && newState !== import_services11.Invitation.State.TIMEOUT) {
             guardedState.set(extension, newState);
           }
           return guardedState.current;
@@ -5944,7 +5930,7 @@ var InvitationsHandler = class {
           let admitted = false;
           connectionCtx.onDispose(() => {
             if (!admitted) {
-              guardedState.set(extension, import_services12.Invitation.State.CONNECTING);
+              guardedState.set(extension, import_services11.Invitation.State.CONNECTING);
             }
           });
           (0, import_async15.scheduleTask)(connectionCtx, async () => {
@@ -5978,7 +5964,7 @@ var InvitationsHandler = class {
                 S: this,
                 C: (f, a) => f(...a)
               });
-              guardedState.set(extension, import_services12.Invitation.State.SUCCESS);
+              guardedState.set(extension, import_services11.Invitation.State.SUCCESS);
               metrics.increment("dxos.invitation.success");
               import_log13.log.trace("dxos.sdk.invitations-handler.host.onOpen", import_protocols11.trace.end({
                 id: traceId
@@ -5993,7 +5979,7 @@ var InvitationsHandler = class {
                 await ctx.dispose();
               }
             } catch (err) {
-              const stateChanged = guardedState.set(extension, import_services12.Invitation.State.CONNECTING);
+              const stateChanged = guardedState.set(extension, import_services11.Invitation.State.CONNECTING);
               if (err instanceof import_async15.TimeoutError) {
                 if (stateChanged) {
                   metrics.increment("dxos.invitation.timeout");
@@ -6031,7 +6017,7 @@ var InvitationsHandler = class {
           });
         },
         onError: (err) => {
-          const stateChanged = guardedState.set(extension, import_services12.Invitation.State.CONNECTING);
+          const stateChanged = guardedState.set(extension, import_services11.Invitation.State.CONNECTING);
           if (err instanceof import_protocols11.InvalidInvitationExtensionRoleError) {
             (0, import_log13.log)("invalid role", {
               ...err.context
@@ -6079,7 +6065,7 @@ var InvitationsHandler = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        guardedState.set(null, import_services12.Invitation.State.EXPIRED);
+        guardedState.set(null, import_services11.Invitation.State.EXPIRED);
         void ctx.dispose().catch((err) => import_log13.log.catch(err, void 0, {
           F: __dxlog_file22,
           L: 196,
@@ -6090,7 +6076,7 @@ var InvitationsHandler = class {
       }
       (0, import_async15.scheduleTask)(ctx, async () => {
         await swarmConnection.close();
-        guardedState.set(null, import_services12.Invitation.State.EXPIRED);
+        guardedState.set(null, import_services11.Invitation.State.EXPIRED);
         metrics.increment("dxos.invitation.expired");
         await ctx.dispose();
       }, expiresOn.getTime() - Date.now());
@@ -6098,7 +6084,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_services12.Invitation.State.CONNECTING);
+      guardedState.set(null, import_services11.Invitation.State.CONNECTING);
     });
   }
   acceptInvitation(ctx, stream, protocol, invitation, otpEnteredTrigger, deviceProfile) {
@@ -6115,7 +6101,7 @@ var InvitationsHandler = class {
     });
     const { timeout = import_client_protocol5.INVITATION_TIMEOUT } = invitation;
     if (deviceProfile) {
-      (0, import_invariant14.invariant)(invitation.kind === import_services12.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
+      (0, import_invariant14.invariant)(invitation.kind === import_services11.Invitation.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file22,
         L: 236,
         S: this,
@@ -6131,7 +6117,7 @@ var InvitationsHandler = class {
       const isLockedByAnotherConnection = guardedState.mutex.isLocked() && !extension.hasFlowLock();
       (0, import_log13.log)("should cancel invitation flow", {
         isLockedByAnotherConnection,
-        invitationType: import_services12.Invitation.Type.DELEGATED,
+        invitationType: import_services11.Invitation.Type.DELEGATED,
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file22,
@@ -6142,7 +6128,7 @@ var InvitationsHandler = class {
       if (isLockedByAnotherConnection) {
         return false;
       }
-      return invitation.type !== import_services12.Invitation.Type.DELEGATED || triedPeersIds.size >= MAX_DELEGATED_INVITATION_HOST_TRIES;
+      return invitation.type !== import_services11.Invitation.Type.DELEGATED || triedPeersIds.size >= MAX_DELEGATED_INVITATION_HOST_TRIES;
     };
     let admitted = false;
     const createExtension = () => {
@@ -6185,7 +6171,7 @@ var InvitationsHandler = class {
                 C: (f, a) => f(...a)
               });
               (0, import_async15.scheduleTask)(connectionCtx, () => {
-                guardedState.set(extension, import_services12.Invitation.State.TIMEOUT);
+                guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
                 extensionCtx.close();
               }, timeout);
               import_log13.log.verbose("dxos.sdk.invitations-handler.guest.connected", {
@@ -6196,7 +6182,7 @@ var InvitationsHandler = class {
                 S: this,
                 C: (f, a) => f(...a)
               });
-              guardedState.set(extension, import_services12.Invitation.State.CONNECTED);
+              guardedState.set(extension, import_services11.Invitation.State.CONNECTED);
               import_log13.log.verbose("dxos.sdk.invitations-handler.guest.introduce", {
                 invitationId: invitation.invitationId,
                 ...protocol.toJSON()
@@ -6223,12 +6209,12 @@ var InvitationsHandler = class {
               invitation.authMethod = introductionResponse.authMethod;
               if (isAuthenticationRequired(invitation)) {
                 switch (invitation.authMethod) {
-                  case import_services12.Invitation.AuthMethod.SHARED_SECRET:
+                  case import_services11.Invitation.AuthMethod.SHARED_SECRET:
                     await this._handleGuestOtpAuth(extension, (state) => guardedState.set(extension, state), otpEnteredTrigger, {
                       timeout
                     });
                     break;
-                  case import_services12.Invitation.AuthMethod.KNOWN_PUBLIC_KEY:
+                  case import_services11.Invitation.AuthMethod.KNOWN_PUBLIC_KEY:
                     await this._handleGuestKpkAuth(extension, (state) => guardedState.set(extension, state), invitation, introductionResponse);
                     break;
                 }
@@ -6258,7 +6244,7 @@ var InvitationsHandler = class {
               guardedState.complete({
                 ...guardedState.current,
                 ...result,
-                state: import_services12.Invitation.State.SUCCESS
+                state: import_services11.Invitation.State.SUCCESS
               });
               import_log13.log.trace("dxos.sdk.invitations-handler.guest.onOpen", import_protocols11.trace.end({
                 id: traceId
@@ -6278,7 +6264,7 @@ var InvitationsHandler = class {
                   S: this,
                   C: (f, a) => f(...a)
                 });
-                guardedState.set(extension, import_services12.Invitation.State.TIMEOUT);
+                guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
               } else {
                 import_log13.log.verbose("auth failed", err, {
                   F: __dxlog_file22,
@@ -6314,7 +6300,7 @@ var InvitationsHandler = class {
               S: this,
               C: (f, a) => f(...a)
             });
-            guardedState.set(extension, import_services12.Invitation.State.TIMEOUT);
+            guardedState.set(extension, import_services11.Invitation.State.TIMEOUT);
           } else {
             import_log13.log.verbose("auth failed", err, {
               F: __dxlog_file22,
@@ -6342,7 +6328,7 @@ var InvitationsHandler = class {
         guardedState.complete({
           ...guardedState.current,
           ...result,
-          state: import_services12.Invitation.State.SUCCESS
+          state: import_services11.Invitation.State.SUCCESS
         });
       }
     });
@@ -6366,12 +6352,12 @@ var InvitationsHandler = class {
           if (guardedState.mutex.isLocked()) {
             (0, import_async15.scheduleTask)(ctx, timeoutInactive, timeout);
           } else {
-            guardedState.set(null, import_services12.Invitation.State.TIMEOUT);
+            guardedState.set(null, import_services11.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_services12.Invitation.State.CONNECTING);
+        guardedState.set(null, import_services11.Invitation.State.CONNECTING);
       }
     });
   }
@@ -6379,7 +6365,7 @@ var InvitationsHandler = class {
     let label;
     if (role === import_invitations2.InvitationOptions.Role.GUEST) {
       label = "invitation guest";
-    } else if (invitation.kind === import_services12.Invitation.Kind.DEVICE) {
+    } else if (invitation.kind === import_services11.Invitation.Kind.DEVICE) {
       label = "invitation host for device";
     } else {
       label = `invitation host for space ${invitation.spaceKey?.truncate()}`;
@@ -6403,7 +6389,7 @@ var InvitationsHandler = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      setState(import_services12.Invitation.State.READY_FOR_AUTHENTICATION);
+      setState(import_services11.Invitation.State.READY_FOR_AUTHENTICATION);
       const authCode = await authenticated.wait(options);
       (0, import_log13.log)("sending authentication request", void 0, {
         F: __dxlog_file22,
@@ -6411,7 +6397,7 @@ var InvitationsHandler = class {
         S: this,
         C: (f, a) => f(...a)
       });
-      setState(import_services12.Invitation.State.AUTHENTICATING);
+      setState(import_services11.Invitation.State.AUTHENTICATING);
       const response = await extension.rpc.InvitationHostService.authenticate({
         authCode
       });
@@ -6503,8 +6489,8 @@ var InvitationsServiceImpl = class {
     return new import_stream9.Stream(({ next, ctx }) => {
       this._invitationsManager.invitationCreated.on(ctx, (invitation) => {
         next({
-          action: import_services17.QueryInvitationsResponse.Action.ADDED,
-          type: import_services17.QueryInvitationsResponse.Type.CREATED,
+          action: import_services16.QueryInvitationsResponse.Action.ADDED,
+          type: import_services16.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
@@ -6512,8 +6498,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.invitationAccepted.on(ctx, (invitation) => {
         next({
-          action: import_services17.QueryInvitationsResponse.Action.ADDED,
-          type: import_services17.QueryInvitationsResponse.Type.ACCEPTED,
+          action: import_services16.QueryInvitationsResponse.Action.ADDED,
+          type: import_services16.QueryInvitationsResponse.Type.ACCEPTED,
           invitations: [
             invitation
           ]
@@ -6521,8 +6507,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.removedCreated.on(ctx, (invitation) => {
         next({
-          action: import_services17.QueryInvitationsResponse.Action.REMOVED,
-          type: import_services17.QueryInvitationsResponse.Type.CREATED,
+          action: import_services16.QueryInvitationsResponse.Action.REMOVED,
+          type: import_services16.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
@@ -6530,8 +6516,8 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.removedAccepted.on(ctx, (invitation) => {
         next({
-          action: import_services17.QueryInvitationsResponse.Action.REMOVED,
-          type: import_services17.QueryInvitationsResponse.Type.ACCEPTED,
+          action: import_services16.QueryInvitationsResponse.Action.REMOVED,
+          type: import_services16.QueryInvitationsResponse.Type.ACCEPTED,
           invitations: [
             invitation
           ]
@@ -6539,29 +6525,29 @@ var InvitationsServiceImpl = class {
       });
       this._invitationsManager.saved.on(ctx, (invitation) => {
         next({
-          action: import_services17.QueryInvitationsResponse.Action.SAVED,
-          type: import_services17.QueryInvitationsResponse.Type.CREATED,
+          action: import_services16.QueryInvitationsResponse.Action.SAVED,
+          type: import_services16.QueryInvitationsResponse.Type.CREATED,
           invitations: [
             invitation
           ]
         });
       });
       next({
-        action: import_services17.QueryInvitationsResponse.Action.ADDED,
-        type: import_services17.QueryInvitationsResponse.Type.CREATED,
+        action: import_services16.QueryInvitationsResponse.Action.ADDED,
+        type: import_services16.QueryInvitationsResponse.Type.CREATED,
         invitations: this._invitationsManager.getCreatedInvitations(),
         existing: true
       });
       next({
-        action: import_services17.QueryInvitationsResponse.Action.ADDED,
-        type: import_services17.QueryInvitationsResponse.Type.ACCEPTED,
+        action: import_services16.QueryInvitationsResponse.Action.ADDED,
+        type: import_services16.QueryInvitationsResponse.Type.ACCEPTED,
         invitations: this._invitationsManager.getAcceptedInvitations(),
         existing: true
       });
       this._invitationsManager.onPersistentInvitationsLoaded(ctx, () => {
         next({
-          action: import_services17.QueryInvitationsResponse.Action.LOAD_COMPLETE,
-          type: import_services17.QueryInvitationsResponse.Type.CREATED
+          action: import_services16.QueryInvitationsResponse.Action.LOAD_COMPLETE,
+          type: import_services16.QueryInvitationsResponse.Type.CREATED
         });
       });
     });
@@ -6616,7 +6602,7 @@ var SpaceInvitationProtocol = class {
       ]
     });
     return {
-      kind: import_services18.Invitation.Kind.SPACE,
+      kind: import_services17.Invitation.Kind.SPACE,
       spaceKey: this._spaceKey,
       spaceId: space.id
     };
@@ -6675,7 +6661,7 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    if (invitation.authMethod === import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
+    if (invitation.authMethod === import_services17.Invitation.AuthMethod.KNOWN_PUBLIC_KEY) {
       (0, import_invariant19.invariant)(invitation.guestKeypair?.publicKey, void 0, {
         F: __dxlog_file23,
         L: 105,
@@ -6702,7 +6688,7 @@ var SpaceInvitationProtocol = class {
       role: invitation.role ?? import_credentials19.SpaceMember.Role.ADMIN,
       expiresOn: computeExpirationTime(invitation),
       multiUse: invitation.multiUse ?? false,
-      guestKey: invitation.authMethod === import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
+      guestKey: invitation.authMethod === import_services17.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     (0, import_invariant19.invariant)(credential.credential, void 0, {
       F: __dxlog_file23,
@@ -6728,7 +6714,7 @@ var SpaceInvitationProtocol = class {
         ""
       ]
     });
-    (0, import_invariant19.invariant)(invitation.type === import_services18.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
+    (0, import_invariant19.invariant)(invitation.type === import_services17.Invitation.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
       F: __dxlog_file23,
       L: 133,
       S: this,
@@ -7008,7 +6994,7 @@ var InvitationsManager = class {
       if (created.get().persistent) {
         await this._metadataStore.removeInvitation(invitationId);
       }
-      if (created.get().type === import_services19.Invitation.Type.DELEGATED) {
+      if (created.get().type === import_services18.Invitation.Type.DELEGATED) {
         const handler = this._getHandler(created.get());
         await handler.cancelDelegation(created.get());
       }
@@ -7042,8 +7028,8 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, _options) {
-    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);
+    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);
     return {
       invitationId,
       type,
@@ -7052,8 +7038,8 @@ var InvitationsManager = class {
       swarmKey,
       authCode,
       timeout,
-      persistent: persistent && type !== import_services19.Invitation.Type.DELEGATED,
-      guestKeypair: guestKeypair ?? (authMethod === import_services19.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
+      persistent: persistent && type !== import_services18.Invitation.Type.DELEGATED,
+      guestKeypair: guestKeypair ?? (authMethod === import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? createAdmissionKeypair() : void 0),
       created,
       lifetime,
       role,
@@ -7091,7 +7077,7 @@ var InvitationsManager = class {
       onCancel: async () => {
         stream.next({
           ...invitation,
-          state: import_services19.Invitation.State.CANCELLED
+          state: import_services18.Invitation.State.CANCELLED
         });
         await ctx.dispose();
       }
@@ -7118,7 +7104,7 @@ var InvitationsManager = class {
           });
           stream.next({
             ...initialState,
-            state: import_services19.Invitation.State.TIMEOUT
+            state: import_services18.Invitation.State.TIMEOUT
           });
         } else {
           import_log20.log.warn("auth failed", err, {
@@ -7129,7 +7115,7 @@ var InvitationsManager = class {
           });
           stream.next({
             ...initialState,
-            state: import_services19.Invitation.State.ERROR
+            state: import_services18.Invitation.State.ERROR
           });
         }
         void ctx.dispose();
@@ -7155,7 +7141,7 @@ var InvitationsManager = class {
       onCancel: async () => {
         stream.next({
           ...initialState,
-          state: import_services19.Invitation.State.CANCELLED
+          state: import_services18.Invitation.State.CANCELLED
         });
         await ctx.dispose();
       },
@@ -7171,7 +7157,7 @@ var InvitationsManager = class {
     };
   }
   async _persistIfRequired(handler, changeStream, invitation) {
-    if (invitation.type === import_services19.Invitation.Type.DELEGATED && invitation.delegationCredentialId == null) {
+    if (invitation.type === import_services18.Invitation.Type.DELEGATED && invitation.delegationCredentialId == null) {
       const delegationCredentialId = await handler.delegate(invitation);
       changeStream.next({
         ...invitation,
@@ -7508,8 +7494,8 @@ var EdgeAgentManager = class extends import_context16.Resource {
         continue;
       }
       if ([
-        import_services20.SpaceState.SPACE_INACTIVE,
-        import_services20.SpaceState.SPACE_CLOSED
+        import_services19.SpaceState.SPACE_INACTIVE,
+        import_services19.SpaceState.SPACE_CLOSED
       ].includes(space.state)) {
         space.notarizationPlugin.setActiveEdgePollingEnabled(false);
         continue;
@@ -7558,16 +7544,22 @@ var EdgeAgentServiceImpl = class {
     this._agentManagerProvider = _agentManagerProvider;
     this._edgeConnection = _edgeConnection;
   }
-  // TODO(mykola): Reconcile with NetworkService.queryStatus.
   queryEdgeStatus() {
     return new import_stream10.Stream(({ ctx, next }) => {
-      const update = () => {
-        next({
-          status: this._edgeConnection?.status ?? import_services21.EdgeStatus.NOT_CONNECTED
-        });
-      };
-      this._edgeConnection?.statusChanged.on(ctx, update);
-      update();
+      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
+          });
+        })
+      );
     });
   }
   async createAgent() {
@@ -7576,7 +7568,7 @@ var EdgeAgentServiceImpl = class {
   queryAgentStatus() {
     return new import_stream10.Stream(({ ctx, next }) => {
       next({
-        status: import_services21.QueryAgentStatusResponse.AgentStatus.UNKNOWN
+        status: import_services20.QueryAgentStatusResponse.AgentStatus.UNKNOWN
       });
       void this._agentManagerProvider().then((agentManager) => {
         next({
@@ -7594,13 +7586,13 @@ var EdgeAgentServiceImpl = class {
 var mapStatus = (agentStatus) => {
   switch (agentStatus) {
     case import_protocols17.EdgeAgentStatus.ACTIVE:
-      return import_services21.QueryAgentStatusResponse.AgentStatus.ACTIVE;
+      return import_services20.QueryAgentStatusResponse.AgentStatus.ACTIVE;
     case import_protocols17.EdgeAgentStatus.INACTIVE:
-      return import_services21.QueryAgentStatusResponse.AgentStatus.INACTIVE;
+      return import_services20.QueryAgentStatusResponse.AgentStatus.INACTIVE;
     case import_protocols17.EdgeAgentStatus.NOT_FOUND:
-      return import_services21.QueryAgentStatusResponse.AgentStatus.NOT_FOUND;
+      return import_services20.QueryAgentStatusResponse.AgentStatus.NOT_FOUND;
     case void 0:
-      return import_services21.QueryAgentStatusResponse.AgentStatus.UNKNOWN;
+      return import_services20.QueryAgentStatusResponse.AgentStatus.UNKNOWN;
   }
 };
 var __dxlog_file27 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-recovery-manager.ts";
@@ -7934,7 +7926,7 @@ var ServiceContext = class extends import_context17.Resource {
     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_services22.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug5.failUndefined)(), this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(import_services21.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();
     }
@@ -8040,7 +8032,7 @@ var ServiceContext = class extends import_context17.Resource {
     return identity;
   }
   getInvitationHandler(invitation) {
-    if (this.identityManager.identity == null && invitation.kind === import_services22.Invitation.Kind.SPACE) {
+    if (this.identityManager.identity == null && invitation.kind === import_services21.Invitation.Kind.SPACE) {
       throw new Error("Identity must be created before joining a space.");
     }
     const factory = this._handlerFactories.get(invitation.kind);
@@ -8122,7 +8114,7 @@ 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_services22.Invitation.Kind.SPACE, (invitation) => {
+    this._handlerFactories.set(import_services21.Invitation.Kind.SPACE, (invitation) => {
       (0, import_invariant23.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file28,
         L: 339,
@@ -8348,7 +8340,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file29,
-      L: 31,
+      L: 30,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8366,7 +8358,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file29,
-      L: 42,
+      L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8374,7 +8366,7 @@ var exportProfileData = async ({ storage, level }) => {
   {
     import_log25.log.info("begin exporting kv pairs", void 0, {
       F: __dxlog_file29,
-      L: 46,
+      L: 45,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8395,7 +8387,7 @@ var exportProfileData = async ({ storage, level }) => {
       count
     }, {
       F: __dxlog_file29,
-      L: 57,
+      L: 56,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8411,7 +8403,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: 80,
+          L: 79,
           S: void 0,
           A: [
             "typeof entry.key === 'string'",
@@ -8421,7 +8413,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: 82,
+          L: 81,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8435,7 +8427,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: 88,
+          L: 87,
           S: void 0,
           A: [
             "entry.key instanceof Uint8Array",
@@ -8444,7 +8436,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         (0, import_invariant25.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file29,
-          L: 89,
+          L: 88,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8469,7 +8461,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
         F: __dxlog_file29,
-        L: 102,
+        L: 101,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -8477,7 +8469,7 @@ var importProfileData = async ({ storage, level }, archive) => {
   }
   import_log25.log.info("committing changes..", void 0, {
     F: __dxlog_file29,
-    L: 110,
+    L: 109,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -8503,7 +8495,7 @@ var DevicesServiceImpl = class {
         } else {
           (0, import_invariant27.invariant)(this._identityManager.identity?.presence, "presence not present", {
             F: __dxlog_file30,
-            L: 37,
+            L: 36,
             S: this,
             A: [
               "this._identityManager.identity?.presence",
@@ -8516,15 +8508,15 @@ var DevicesServiceImpl = class {
               const isMe = this._identityManager.identity?.deviceKey.equals(key);
               let presence;
               if (isMe) {
-                presence = import_services24.Device.PresenceState.ONLINE;
+                presence = import_services23.Device.PresenceState.ONLINE;
               } else if (profile.os?.toUpperCase() === "EDGE") {
-                presence = this._edgeConnection?.status === import_services24.EdgeStatus.CONNECTED ? import_services24.Device.PresenceState.ONLINE : import_services24.Device.PresenceState.OFFLINE;
+                presence = this._edgeConnection?.isConnected ? import_services23.Device.PresenceState.ONLINE : import_services23.Device.PresenceState.OFFLINE;
               } else {
-                presence = peers.some((peer) => peer.identityKey.equals(key)) ? import_services24.Device.PresenceState.ONLINE : import_services24.Device.PresenceState.OFFLINE;
+                presence = peers.some((peer) => peer.identityKey.equals(key)) ? import_services23.Device.PresenceState.ONLINE : import_services23.Device.PresenceState.OFFLINE;
               }
               return {
                 deviceKey: key,
-                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services24.DeviceKind.CURRENT : import_services24.DeviceKind.TRUSTED,
+                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services23.DeviceKind.CURRENT : import_services23.DeviceKind.TRUSTED,
                 profile,
                 presence
               };
@@ -8745,29 +8737,28 @@ var LoggingServiceImpl = class {
 };
 var matchFilter = (filter, level, path2, options) => {
   switch (options) {
-    case import_services25.QueryLogsRequest.MatchingOptions.INCLUSIVE:
+    case import_services24.QueryLogsRequest.MatchingOptions.INCLUSIVE:
       return level >= filter.level && (!filter.pattern || path2.includes(filter.pattern));
-    case import_services25.QueryLogsRequest.MatchingOptions.EXPLICIT:
+    case import_services24.QueryLogsRequest.MatchingOptions.EXPLICIT:
       return level === filter.level && (!filter.pattern || path2.includes(filter.pattern));
   }
 };
 var shouldLog = (entry2, request) => {
-  const options = request.options ?? import_services25.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  const options = request.options ?? import_services24.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   if (request.filters === void 0) {
-    return options === import_services25.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+    return options === import_services24.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, edgeConnection) {
+  constructor(networkManager, signalManager) {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
-    this.edgeConnection = edgeConnection;
   }
   queryStatus() {
-    return new import_stream14.Stream(({ ctx, next }) => {
+    return new import_stream14.Stream(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -8778,9 +8769,13 @@ var NetworkServiceImpl = class {
           }))
         });
       };
-      this.networkManager.connectionStateChanged.on(ctx, () => update());
-      this.signalManager.statusChanged?.on(ctx, () => update());
+      const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
+      const unsubscribeSignal = this.signalManager.statusChanged?.on(() => update());
       update();
+      return () => {
+        unsubscribeSwarm();
+        unsubscribeSignal?.();
+      };
     });
   }
   async updateConfig(request) {
@@ -8796,24 +8791,26 @@ var NetworkServiceImpl = class {
     return this.signalManager.query(request);
   }
   subscribeSwarmState(request) {
-    return new import_stream14.Stream(({ ctx, next }) => {
-      this.signalManager.swarmState?.on(ctx, (state) => {
+    return new import_stream14.Stream(({ next }) => {
+      const unsubscribe = this.signalManager.swarmState?.on((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(({ ctx, next }) => {
-      this.signalManager.onMessage.on(ctx, (message) => {
+    return new import_stream14.Stream(({ next }) => {
+      const unsubscribe = this.signalManager.onMessage.on((message) => {
         if (message.recipient.peerKey === peer.peerKey) {
           next(message);
         }
       });
+      return unsubscribe;
     });
   }
 };
@@ -8837,8 +8834,8 @@ var SystemServiceImpl = class {
     return {
       timestamp: /* @__PURE__ */ new Date(),
       diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util17.jsonKeyReplacer)({
-        truncate: keys === import_services26.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
-        humanize: keys === import_services26.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
+        truncate: keys === import_services25.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
+        humanize: keys === import_services25.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
     };
   }
@@ -8926,14 +8923,14 @@ var ClientServicesHost = class {
     this._systemService = new SystemServiceImpl({
       config: () => this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen && !this._resetting ? import_services23.SystemStatus.ACTIVE : import_services23.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen && !this._resetting ? import_services22.SystemStatus.ACTIVE : import_services22.SystemStatus.INACTIVE,
       getDiagnostics: () => {
         return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
       },
       onUpdateStatus: async (status) => {
-        if (!this.isOpen && status === import_services23.SystemStatus.ACTIVE) {
+        if (!this.isOpen && status === import_services22.SystemStatus.ACTIVE) {
           await this._resourceLock?.acquire();
-        } else if (this.isOpen && status === import_services23.SystemStatus.INACTIVE) {
+        } else if (this.isOpen && status === import_services22.SystemStatus.INACTIVE) {
           await this._resourceLock?.release();
         }
       },
@@ -9131,7 +9128,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, this._edgeConnection),
+      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
       // TODO(burdon): Move to new protobuf definitions.
@@ -9163,7 +9160,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file31,
-      L: 370,
+      L: 366,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9171,7 +9168,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 371,
+      L: 367,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9185,7 +9182,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file31,
-      L: 382,
+      L: 378,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9203,7 +9200,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file31,
-      L: 391,
+      L: 387,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9214,13 +9211,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 396,
+      L: 392,
       S: this,
       C: (f, a) => f(...a)
     });
     import_log26.log.info("resetting...", void 0, {
       F: __dxlog_file31,
-      L: 398,
+      L: 394,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9230,7 +9227,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     import_log26.log.info("reset", void 0, {
       F: __dxlog_file31,
-      L: 405,
+      L: 401,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9238,7 +9235,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file31,
-      L: 406,
+      L: 402,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9316,4 +9313,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-Y747YVDI.cjs.map
+//# sourceMappingURL=chunk-HUMVSL5Y.cjs.map