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

package/dist/lib/browser/{chunk-MHDASPY5.mjs → chunk-LY3V7LMQ.mjs}

@@ -397,7 +397,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.8.1";
+var DXOS_VERSION = "0.8.2-main.10c050d";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -556,13 +556,6 @@ import { Trigger } from "@dxos/async";
 import { log as log2 } from "@dxos/log";
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/diagnostics/browser-diagnostics-broadcast.ts";
 var CHANNEL_NAME = "dxos.diagnostics.broadcast";
-var MessageType;
-(function(MessageType2) {
-  MessageType2["PROBE"] = "probe";
-  MessageType2["PROBE_ACK"] = "probe-ack";
-  MessageType2["REQUEST_DIAGNOSTICS"] = "request-diagnostics";
-  MessageType2["RECEIVE_DIAGNOSTICS"] = "receive-diagnostics";
-})(MessageType || (MessageType = {}));
 var createCollectDiagnosticsBroadcastSender = () => {
   return {
     broadcastDiagnosticsRequest: async () => {
@@ -817,6 +810,7 @@ import { log as log4, logInfo } from "@dxos/log";
 import { EdgeService } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
 import { MessageSchema as RouterMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
+import { EdgeStatus } from "@dxos/protocols/proto/dxos/client/services";
 import { ComplexMap as ComplexMap2, arrayToBuffer, bufferToArray, defaultMap, rangeFromTo } from "@dxos/util";
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -824,67 +818,70 @@ function _ts_decorate(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _using_ctx() {
-  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
-    var err = new Error();
-    err.name = "SuppressedError";
-    err.suppressed = suppressed;
-    err.error = error;
-    return err;
-  }, empty = {}, stack = [];
-  function using(isAwait, value) {
-    if (value != null) {
-      if (Object(value) !== value) {
-        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-      }
-      if (isAwait) {
-        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
-      }
-      if (dispose == null) {
-        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
-      }
-      if (typeof dispose !== "function") {
-        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
-      }
-      stack.push({
-        v: value,
-        d: dispose,
-        a: isAwait
-      });
-    } else if (isAwait) {
-      stack.push({
-        d: value,
-        a: isAwait
-      });
-    }
-    return value;
+function _ts_add_disposable_resource(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
   }
-  return {
-    e: empty,
-    u: using.bind(null, false),
-    a: using.bind(null, true),
-    d: function() {
-      var error = this.e;
-      function next() {
-        while (resource = stack.pop()) {
-          try {
-            var resource, disposalResult = resource.d && resource.d.call(resource.v);
-            if (resource.a) {
-              return Promise.resolve(disposalResult).then(next, err);
-            }
-          } catch (e) {
-            return err(e);
-          }
+  return value;
+}
+function _ts_dispose_resources(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources = function _ts_dispose_resources5(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
-        if (error !== empty) throw error;
-      }
-      function err(e) {
-        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
-        return next();
       }
-      return next();
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
-  };
+    return next();
+  })(env);
 }
 var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/edge-feed-replicator.ts";
 var EdgeFeedReplicator = class extends Resource {
@@ -907,7 +904,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _open() {
     log4("open", void 0, {
       F: __dxlog_file6,
-      L: 56,
+      L: 57,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -926,7 +923,7 @@ var EdgeFeedReplicator = class extends Resource {
           _spaceId: this._spaceId
         }, {
           F: __dxlog_file6,
-          L: 70,
+          L: 71,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -939,7 +936,7 @@ var EdgeFeedReplicator = class extends Resource {
         type: payload.type
       }, {
         F: __dxlog_file6,
-        L: 75,
+        L: 76,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -951,14 +948,14 @@ var EdgeFeedReplicator = class extends Resource {
   }
   async _handleReconnect() {
     await this._resetConnection();
-    if (this._messenger.isConnected) {
+    if (this._messenger.status === EdgeStatus.CONNECTED) {
       this._startReplication();
     }
   }
   async _close() {
     log4("close", void 0, {
       F: __dxlog_file6,
-      L: 95,
+      L: 96,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -970,7 +967,7 @@ var EdgeFeedReplicator = class extends Resource {
     this._connectionCtx = connectionCtx;
     log4("connection context created", void 0, {
       F: __dxlog_file6,
-      L: 103,
+      L: 104,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -983,7 +980,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _resetConnection() {
     log4("resetConnection", void 0, {
       F: __dxlog_file6,
-      L: 112,
+      L: 113,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -999,7 +996,7 @@ var EdgeFeedReplicator = class extends Resource {
       hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file6,
-      L: 120,
+      L: 121,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1016,7 +1013,7 @@ var EdgeFeedReplicator = class extends Resource {
       key: feed.key
     }, {
       F: __dxlog_file6,
-      L: 133,
+      L: 134,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1032,7 +1029,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log4("message dropped because connection was disposed", void 0, {
         F: __dxlog_file6,
-        L: 146,
+        L: 147,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1044,14 +1041,14 @@ var EdgeFeedReplicator = class extends Resource {
         blocks: message.blocks.map((b) => b.index)
       }, {
         F: __dxlog_file6,
-        L: 151,
+        L: 152,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file6,
-      L: 157,
+      L: 158,
       S: this,
       A: [
         "message.feedKey",
@@ -1063,7 +1060,7 @@ var EdgeFeedReplicator = class extends Resource {
       type: message.type
     }, {
       F: __dxlog_file6,
-      L: 160,
+      L: 161,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1082,7 +1079,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log4.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file6,
-        L: 175,
+        L: 176,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1091,8 +1088,12 @@ var EdgeFeedReplicator = class extends Resource {
     scheduleMicroTask(this._connectionCtx, async () => {
       switch (message.type) {
         case "metadata": {
+          const env = {
+            stack: [],
+            error: void 0,
+            hasError: false
+          };
           try {
-            var _usingCtx = _using_ctx();
             const feedKey = PublicKey3.fromHex(message.feedKey);
             const feed = this._feeds.get(feedKey);
             if (!feed) {
@@ -1100,13 +1101,13 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file6,
-                L: 184,
+                L: 185,
                 S: this,
                 C: (f, a) => f(...a)
               });
               return;
             }
-            const _guard = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
+            const _guard = _ts_add_disposable_resource(env, await this._getPushMutex(feed.key).acquire(), false);
             this._remoteLength.set(feedKey, message.length);
             const logMeta = {
               localLength: feed.length,
@@ -1116,7 +1117,7 @@ var EdgeFeedReplicator = class extends Resource {
             if (message.length > feed.length) {
               log4("requesting missing blocks", logMeta, {
                 F: __dxlog_file6,
-                L: 194,
+                L: 195,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1131,17 +1132,18 @@ var EdgeFeedReplicator = class extends Resource {
             } else if (message.length < feed.length) {
               log4("pushing blocks to remote", logMeta, {
                 F: __dxlog_file6,
-                L: 202,
+                L: 203,
                 S: this,
                 C: (f, a) => f(...a)
               });
               await this._pushBlocks(feed, message.length, feed.length);
             }
             break;
-          } catch (_) {
-            _usingCtx.e = _;
+          } catch (e) {
+            env.error = e;
+            env.hasError = true;
           } finally {
-            _usingCtx.d();
+            _ts_dispose_resources(env);
           }
         }
         case "data": {
@@ -1150,7 +1152,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file6,
-            L: 211,
+            L: 212,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1161,7 +1163,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file6,
-              L: 216,
+              L: 217,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1175,7 +1177,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file6,
-            L: 225,
+            L: 226,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1190,7 +1192,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file6,
-      L: 232,
+      L: 233,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1200,7 +1202,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file6,
-        L: 237,
+        L: 238,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1228,7 +1230,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file6,
-      L: 258,
+      L: 259,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1244,13 +1246,17 @@ var EdgeFeedReplicator = class extends Resource {
     }
   }
   async _pushBlocksIfNeeded(feed) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx();
-      const _ = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
+      const _ = _ts_add_disposable_resource(env, await this._getPushMutex(feed.key).acquire(), false);
       if (!this._remoteLength.has(feed.key)) {
         log4("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file6,
-          L: 279,
+          L: 280,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1260,10 +1266,11 @@ var EdgeFeedReplicator = class extends Resource {
       if (remoteLength < feed.length) {
         await this._pushBlocks(feed, remoteLength, feed.length);
       }
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      _usingCtx.d();
+      _ts_dispose_resources(env);
     }
   }
   _createConnectionContext() {
@@ -1275,7 +1282,7 @@ var EdgeFeedReplicator = class extends Resource {
         if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
           log4("resetting on reconnect", void 0, {
             F: __dxlog_file6,
-            L: 296,
+            L: 297,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1286,7 +1293,7 @@ var EdgeFeedReplicator = class extends Resource {
       }
     }, {
       F: __dxlog_file6,
-      L: 290
+      L: 291
     });
     return connectionCtx;
   }
@@ -1306,12 +1313,12 @@ var bufferizeBlock = (block) => ({
 });
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
+import { save } from "@automerge/automerge";
 import { Event as Event7, Mutex as Mutex2, scheduleTask as scheduleTask4, sleep as sleep3, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
-import { save } from "@dxos/automerge/automerge";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
 import { Context as Context6, ContextDisposedError, cancelWithContext as cancelWithContext2 } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
-import { createMappedFeedWriter } from "@dxos/echo-pipeline";
+import { createMappedFeedWriter, FIND_PARAMS as FIND_PARAMS2 } from "@dxos/echo-pipeline";
 import { SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
 import { failedInvariant as failedInvariant3, invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
@@ -1329,12 +1336,7 @@ import { Resource as Resource2 } from "@dxos/context";
 import { checkCredentialType } from "@dxos/credentials";
 var AutomergeSpaceState = class extends Resource2 {
   constructor(_onNewRoot) {
-    super();
-    this._onNewRoot = _onNewRoot;
-    this.rootUrl = void 0;
-    this.lastEpoch = void 0;
-    this.onNewEpoch = new Event2();
-    this._isProcessingRootDocs = false;
+    super(), this._onNewRoot = _onNewRoot, this.rootUrl = void 0, this.lastEpoch = void 0, this.onNewEpoch = new Event2(), this._isProcessingRootDocs = false;
   }
   async _open(ctx) {
   }
@@ -1389,7 +1391,7 @@ var runEpochMigration = async (ctx, context) => {
       const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
         timeout: LOAD_DOC_TIMEOUT
       });
-      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
+      const newRoot = context.echoHost.createDoc(rootHandle.doc());
       await context.echoHost.flush();
       return {
         newRoot: newRoot.url
@@ -1405,7 +1407,7 @@ var runEpochMigration = async (ctx, context) => {
     case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       invariant3(context.newAutomergeRoot, void 0, {
         F: __dxlog_file7,
-        L: 62,
+        L: 63,
         S: void 0,
         A: [
           "context.newAutomergeRoot",
@@ -1852,8 +1854,7 @@ var NotarizationTeleportExtension = class extends RpcExtension {
       exposed: {
         NotarizationService: schema2.getService("dxos.mesh.teleport.notarization.NotarizationService")
       }
-    });
-    this._params = _params;
+    }), this._params = _params;
   }
   async getHandlers() {
     return {
@@ -1934,14 +1935,14 @@ var DefaultSpaceStateMachine = class {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
+import { interpretAsDocumentId } from "@automerge/automerge-repo";
 import { Event as Event4, synchronized, trackLeaks } from "@dxos/async";
-import { interpretAsDocumentId } from "@dxos/automerge/automerge-repo";
 import { PropertiesType, TYPE_PROPERTIES } from "@dxos/client-protocol";
 import { Context as Context4, LifecycleState, Resource as Resource4, cancelWithContext } from "@dxos/context";
 import { createAdmissionCredentials, getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
-import { DatabaseRoot, findInlineObjectOfType, AuthStatus, CredentialServerExtension } from "@dxos/echo-pipeline";
+import { DatabaseRoot, findInlineObjectOfType, AuthStatus, CredentialServerExtension, FIND_PARAMS } from "@dxos/echo-pipeline";
 import { SpaceDocVersion, createIdFromSpaceKey, encodeReference } from "@dxos/echo-protocol";
-import { createObjectId, getTypeReference } from "@dxos/echo-schema";
+import { ObjectId, getTypeReference } from "@dxos/echo-schema";
 import { writeMessages } from "@dxos/feed-store";
 import { assertArgument, assertState, failedInvariant, invariant as invariant5 } from "@dxos/invariant";
 import { PublicKey as PublicKey5 } from "@dxos/keys";
@@ -2064,10 +2065,11 @@ var DataSpaceManager = class extends Resource4 {
       id: "spaces",
       name: "Spaces",
       fetch: async () => {
-        return Array.from(this._spaces.values()).map((space) => {
+        return Promise.all(Array.from(this._spaces.values()).map(async (space) => {
           const rootUrl = space.automergeSpaceState.rootUrl;
-          const rootHandle = rootUrl ? this._echoHost.automergeRepo.find(rootUrl) : void 0;
-          const rootDoc = rootHandle?.docSync();
+          const rootHandle = rootUrl ? await this._echoHost.automergeRepo.find(rootUrl, FIND_PARAMS) : void 0;
+          await rootHandle?.whenReady();
+          const rootDoc = rootHandle?.doc();
           const properties = rootDoc && findInlineObjectOfType(rootDoc, TYPE_PROPERTIES);
           return {
             key: space.key.toHex(),
@@ -2079,7 +2081,7 @@ var DataSpaceManager = class extends Resource4 {
             members: space.inner.spaceState.members.size,
             rootUrl
           };
-        });
+        }));
       }
     });
   }
@@ -2095,7 +2097,7 @@ var DataSpaceManager = class extends Resource4 {
   async _open() {
     log7("open", void 0, {
       F: __dxlog_file10,
-      L: 213,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2103,7 +2105,7 @@ var DataSpaceManager = class extends Resource4 {
       id: this._instanceId
     }), {
       F: __dxlog_file10,
-      L: 214,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2111,7 +2113,7 @@ var DataSpaceManager = class extends Resource4 {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file10,
-      L: 215,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2121,7 +2123,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceMetadata
         }, {
           F: __dxlog_file10,
-          L: 219,
+          L: 221,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2132,7 +2134,7 @@ var DataSpaceManager = class extends Resource4 {
           err
         }, {
           F: __dxlog_file10,
-          L: 222,
+          L: 224,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2143,7 +2145,7 @@ var DataSpaceManager = class extends Resource4 {
       id: this._instanceId
     }), {
       F: __dxlog_file10,
-      L: 228,
+      L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2151,7 +2153,7 @@ var DataSpaceManager = class extends Resource4 {
   async _close() {
     log7("close", void 0, {
       F: __dxlog_file10,
-      L: 233,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2182,7 +2184,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 262,
+      L: 264,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2190,7 +2192,7 @@ var DataSpaceManager = class extends Resource4 {
     if (options.documents) {
       invariant5(Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId)), "Invalid document IDs", {
         F: __dxlog_file10,
-        L: 267,
+        L: 269,
         S: this,
         A: [
           "Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId))",
@@ -2202,7 +2204,7 @@ var DataSpaceManager = class extends Resource4 {
           documentId
         }, {
           F: __dxlog_file10,
-          L: 274,
+          L: 276,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2216,7 +2218,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 281,
+      L: 283,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2225,7 +2227,7 @@ var DataSpaceManager = class extends Resource4 {
       const newRootDocId = documentIdMapping[interpretAsDocumentId(options.rootUrl)] ?? failedInvariant();
       const rootDocHandle = await this._echoHost.loadDoc(Context4.default(void 0, {
         F: __dxlog_file10,
-        L: 286
+        L: 288
       }), newRootDocId);
       DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
       root = await this._echoHost.openSpaceRoot(spaceId, `automerge:${newRootDocId}`);
@@ -2236,7 +2238,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 294,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2246,7 +2248,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 299,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2255,7 +2257,7 @@ var DataSpaceManager = class extends Resource4 {
     const memberCredential = credentials[1];
     invariant5(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file10,
-      L: 305,
+      L: 307,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2269,7 +2271,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 310,
+      L: 312,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2282,7 +2284,18 @@ var DataSpaceManager = class extends Resource4 {
     }
     switch (space.databaseRoot.getVersion()) {
       case SpaceDocVersion.CURRENT: {
-        const [_, properties] = findInlineObjectOfType(space.databaseRoot.docSync(), TYPE_PROPERTIES) ?? [];
+        if (!space.databaseRoot.handle.isReady()) {
+          log7.warn("waiting for space root to be ready", {
+            spaceId: space.id
+          }, {
+            F: __dxlog_file10,
+            L: 325,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await space.databaseRoot.handle.whenReady();
+        }
+        const [_, properties] = findInlineObjectOfType(space.databaseRoot.doc(), TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       case SpaceDocVersion.LEGACY: {
@@ -2294,7 +2307,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceId: space.id
         }, {
           F: __dxlog_file10,
-          L: 330,
+          L: 336,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2315,7 +2328,7 @@ var DataSpaceManager = class extends Resource4 {
         keys: []
       }
     };
-    const propertiesId = createObjectId();
+    const propertiesId = ObjectId.random();
     document.change((doc) => {
       setDeep(doc, [
         "objects",
@@ -2329,14 +2342,14 @@ var DataSpaceManager = class extends Resource4 {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant5(automergeIndex, void 0, {
       F: __dxlog_file10,
-      L: 363,
+      L: 369,
       S: this,
       A: [
         "automergeIndex",
         ""
       ]
     });
-    const document = this._echoHost.automergeRepo.find(automergeIndex);
+    const document = await this._echoHost.automergeRepo.find(automergeIndex, FIND_PARAMS);
     await document.whenReady();
     return document;
   }
@@ -2346,13 +2359,13 @@ var DataSpaceManager = class extends Resource4 {
       opts
     }, {
       F: __dxlog_file10,
-      L: 372,
+      L: 378,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file10,
-      L: 373,
+      L: 379,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2361,7 +2374,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     invariant5(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file10,
-      L: 374,
+      L: 380,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -2385,7 +2398,7 @@ var DataSpaceManager = class extends Resource4 {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     invariant5(space, void 0, {
       F: __dxlog_file10,
-      L: 394,
+      L: 400,
       S: this,
       A: [
         "space",
@@ -2398,7 +2411,7 @@ var DataSpaceManager = class extends Resource4 {
     const credentials = await createAdmissionCredentials(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
     invariant5(credentials[0].credential, void 0, {
       F: __dxlog_file10,
-      L: 413,
+      L: 419,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2408,7 +2421,7 @@ var DataSpaceManager = class extends Resource4 {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant5(getCredentialAssertion2(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file10,
-      L: 415,
+      L: 421,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2446,7 +2459,7 @@ var DataSpaceManager = class extends Resource4 {
     const space = this._spaces.get(spaceKey);
     invariant5(space, "Space not found.", {
       F: __dxlog_file10,
-      L: 452,
+      L: 458,
       S: this,
       A: [
         "space",
@@ -2471,7 +2484,7 @@ var DataSpaceManager = class extends Resource4 {
       metadata
     }, {
       F: __dxlog_file10,
-      L: 471,
+      L: 477,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2515,7 +2528,7 @@ var DataSpaceManager = class extends Resource4 {
             err
           }, {
             F: __dxlog_file10,
-            L: 513,
+            L: 519,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2525,7 +2538,7 @@ var DataSpaceManager = class extends Resource4 {
       onAuthFailure: () => {
         log7.warn("auth failure", void 0, {
           F: __dxlog_file10,
-          L: 518,
+          L: 524,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2558,7 +2571,7 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file10,
-            L: 545,
+            L: 551,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2569,7 +2582,7 @@ var DataSpaceManager = class extends Resource4 {
             open: this._lifecycleState === LifecycleState.OPEN
           }, {
             F: __dxlog_file10,
-            L: 548,
+            L: 554,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2588,7 +2601,7 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file10,
-            L: 556,
+            L: 562,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2609,7 +2622,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceId: dataSpace.id
         }, {
           F: __dxlog_file10,
-          L: 570,
+          L: 576,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2639,7 +2652,7 @@ var DataSpaceManager = class extends Resource4 {
         space: space.key
       }, {
         F: __dxlog_file10,
-        L: 597,
+        L: 603,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2672,7 +2685,7 @@ var DataSpaceManager = class extends Resource4 {
       closedSessions
     }, {
       F: __dxlog_file10,
-      L: 623,
+      L: 629,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2687,7 +2700,7 @@ var DataSpaceManager = class extends Resource4 {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file10,
-          L: 637,
+          L: 643,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2832,7 +2845,7 @@ var extractSpaceArchive = async (archive) => {
     const documentId = entry2.fileName.replace(`${SpaceArchiveFileStructure2.documents}/`, "").replace(/\.bin$/, "");
     invariant6(!documentId.includes("/"), void 0, {
       F: __dxlog_file11,
-      L: 27,
+      L: 28,
       S: void 0,
       A: [
         "!documentId.includes('/')",
@@ -2846,7 +2859,7 @@ var extractSpaceArchive = async (archive) => {
     documents
   }, {
     F: __dxlog_file11,
-    L: 31,
+    L: 32,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -2857,67 +2870,70 @@ var extractSpaceArchive = async (archive) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
-function _using_ctx2() {
-  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
-    var err = new Error();
-    err.name = "SuppressedError";
-    err.suppressed = suppressed;
-    err.error = error;
-    return err;
-  }, empty = {}, stack = [];
-  function using(isAwait, value) {
-    if (value != null) {
-      if (Object(value) !== value) {
-        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-      }
-      if (isAwait) {
-        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
-      }
-      if (dispose == null) {
-        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
-      }
-      if (typeof dispose !== "function") {
-        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
-      }
-      stack.push({
-        v: value,
-        d: dispose,
-        a: isAwait
-      });
-    } else if (isAwait) {
-      stack.push({
-        d: value,
-        a: isAwait
-      });
-    }
-    return value;
+function _ts_add_disposable_resource2(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
   }
-  return {
-    e: empty,
-    u: using.bind(null, false),
-    a: using.bind(null, true),
-    d: function() {
-      var error = this.e;
-      function next() {
-        while (resource = stack.pop()) {
-          try {
-            var resource, disposalResult = resource.d && resource.d.call(resource.v);
-            if (resource.a) {
-              return Promise.resolve(disposalResult).then(next, err);
-            }
-          } catch (e) {
-            return err(e);
-          }
+  return value;
+}
+function _ts_dispose_resources2(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources2 = function _ts_dispose_resources5(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
-        if (error !== empty) throw error;
-      }
-      function err(e) {
-        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
-        return next();
       }
-      return next();
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
-  };
+    return next();
+  })(env);
 }
 var __dxlog_file12 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
@@ -2967,7 +2983,7 @@ var SpacesServiceImpl = class {
     const credentials = await createAdmissionCredentials2(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     invariant7(credentials[0].credential, void 0, {
       F: __dxlog_file12,
-      L: 118,
+      L: 119,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2977,7 +2993,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant7(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file12,
-      L: 120,
+      L: 121,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2995,7 +3011,7 @@ var SpacesServiceImpl = class {
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file12,
-          L: 133,
+          L: 134,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3087,7 +3103,7 @@ var SpacesServiceImpl = class {
       } else {
         invariant7(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file12,
-          L: 231,
+          L: 232,
           S: this,
           A: [
             "!credential.id",
@@ -3096,7 +3112,7 @@ var SpacesServiceImpl = class {
         });
         invariant7(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file12,
-          L: 232,
+          L: 233,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -3106,7 +3122,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant7(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file12,
-          L: 234,
+          L: 235,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -3153,9 +3169,13 @@ var SpacesServiceImpl = class {
     });
   }
   async exportSpace(request) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx2();
-      const writer = _usingCtx.a(await new SpaceArchiveWriter().open());
+      const writer = _ts_add_disposable_resource2(env, await new SpaceArchiveWriter().open(), true);
       assertArgument4(SpaceId2.isValid(request.spaceId), "Invalid space ID");
       const dataSpaceManager = await this._getDataSpaceManager();
       const space = dataSpaceManager.getSpaceById(request.spaceId) ?? raise(new Error("Space not found"));
@@ -3172,10 +3192,12 @@ var SpacesServiceImpl = class {
       return {
         archive
       };
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      await _usingCtx.d();
+      const result = _ts_dispose_resources2(env);
+      if (result) await result;
     }
   }
   async importSpace(request) {
@@ -3183,7 +3205,7 @@ var SpacesServiceImpl = class {
     const extracted = await extractSpaceArchive(request.archive);
     invariant7(extracted.metadata.echo?.currentRootUrl, "Space archive does not contain a root URL", {
       F: __dxlog_file12,
-      L: 288,
+      L: 289,
       S: this,
       A: [
         "extracted.metadata.echo?.currentRootUrl",
@@ -3203,7 +3225,7 @@ var SpacesServiceImpl = class {
     const assertion = getCredentialAssertion3(credential);
     invariant7(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file12,
-      L: 299,
+      L: 300,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3213,7 +3235,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     invariant7(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
       F: __dxlog_file12,
-      L: 301,
+      L: 302,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -3613,7 +3635,7 @@ var IdentityManager = class {
       L: 135
     }));
   }
-  async createIdentity({ displayName, deviceProfile } = {}) {
+  async createIdentity({ profile, deviceProfile } = {}) {
     invariant9(!this._identity, "Identity already exists.", {
       F: __dxlog_file14,
       L: 140,
@@ -3671,10 +3693,8 @@ var IdentityManager = class {
         // Feed admission.
         await generator.createFeedAdmission(identityRecord.haloSpace.key, identityRecord.haloSpace.dataFeedKey, AdmittedFeed3.Designation.DATA)
       ];
-      if (displayName) {
-        credentials.push(await generator.createProfileCredential({
-          displayName
-        }));
+      if (profile) {
+        credentials.push(await generator.createProfileCredential(profile));
       }
       credentials.push(await generator.createDeviceAuthorization(identityRecord.deviceKey));
       credentials.push(await generator.createDeviceProfile({
@@ -3791,7 +3811,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file14,
-      L: 273,
+      L: 277,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3805,7 +3825,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file14,
-      L: 284,
+      L: 288,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3816,7 +3836,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     invariant9(this._identity, "Identity not initialized.", {
       F: __dxlog_file14,
-      L: 291,
+      L: 295,
       S: this,
       A: [
         "this._identity",
@@ -3847,7 +3867,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     invariant9(this._identity, "Identity not initialized.", {
       F: __dxlog_file14,
-      L: 308,
+      L: 312,
       S: this,
       A: [
         "this._identity",
@@ -3883,7 +3903,7 @@ var IdentityManager = class {
   async _constructIdentity(identityRecord) {
     invariant9(!this._identity, void 0, {
       F: __dxlog_file14,
-      L: 334,
+      L: 338,
       S: this,
       A: [
         "!this._identity",
@@ -3894,7 +3914,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file14,
-      L: 335,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3909,7 +3929,7 @@ var IdentityManager = class {
     });
     invariant9(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file14,
-      L: 348,
+      L: 352,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -3921,7 +3941,7 @@ var IdentityManager = class {
     });
     invariant9(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file14,
-      L: 352,
+      L: 356,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -3960,7 +3980,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file14,
-      L: 383,
+      L: 387,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3985,7 +4005,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         log11.warn("auth failure", void 0, {
           F: __dxlog_file14,
-          L: 408,
+          L: 412,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4020,13 +4040,7 @@ var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/s
 var DEFAULT_SPACE_SEARCH_TIMEOUT = 1e4;
 var IdentityServiceImpl = class extends Resource6 {
   constructor(_identityManager, _recoveryManager, _keyring, _dataSpaceManagerProvider, _createIdentity, _onProfileUpdate) {
-    super();
-    this._identityManager = _identityManager;
-    this._recoveryManager = _recoveryManager;
-    this._keyring = _keyring;
-    this._dataSpaceManagerProvider = _dataSpaceManagerProvider;
-    this._createIdentity = _createIdentity;
-    this._onProfileUpdate = _onProfileUpdate;
+    super(), this._identityManager = _identityManager, this._recoveryManager = _recoveryManager, this._keyring = _keyring, this._dataSpaceManagerProvider = _dataSpaceManagerProvider, this._createIdentity = _createIdentity, this._onProfileUpdate = _onProfileUpdate;
   }
   async _open() {
     const identity = this._identityManager.identity;
@@ -4036,7 +4050,7 @@ var IdentityServiceImpl = class extends Resource6 {
   }
   async createIdentity(request) {
     await this._createIdentity({
-      displayName: request.profile?.displayName,
+      profile: request.profile,
       deviceProfile: request.deviceProfile
     });
     const dataSpaceManager = this._dataSpaceManagerProvider();
@@ -4211,74 +4225,77 @@ function _ts_decorate6(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _using_ctx3() {
-  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
-    var err = new Error();
-    err.name = "SuppressedError";
-    err.suppressed = suppressed;
-    err.error = error;
-    return err;
-  }, empty = {}, stack = [];
-  function using(isAwait, value) {
-    if (value != null) {
-      if (Object(value) !== value) {
-        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-      }
-      if (isAwait) {
-        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
-      }
-      if (dispose == null) {
-        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
-      }
-      if (typeof dispose !== "function") {
-        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
-      }
-      stack.push({
-        v: value,
-        d: dispose,
-        a: isAwait
-      });
-    } else if (isAwait) {
-      stack.push({
-        d: value,
-        a: isAwait
-      });
-    }
-    return value;
+function _ts_add_disposable_resource3(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
   }
-  return {
-    e: empty,
-    u: using.bind(null, false),
-    a: using.bind(null, true),
-    d: function() {
-      var error = this.e;
-      function next() {
-        while (resource = stack.pop()) {
-          try {
-            var resource, disposalResult = resource.d && resource.d.call(resource.v);
-            if (resource.a) {
-              return Promise.resolve(disposalResult).then(next, err);
-            }
-          } catch (e) {
-            return err(e);
-          }
+  return value;
+}
+function _ts_dispose_resources3(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources3 = function _ts_dispose_resources5(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
-        if (error !== empty) throw error;
       }
-      function err(e) {
-        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
-        return next();
-      }
-      return next();
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
-  };
+    return next();
+  })(env);
 }
 var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
     this._ctx = new Context6(void 0, {
       F: __dxlog_file16,
-      L: 97
+      L: 100
     });
     this._cache = void 0;
     this._edgeFeedReplicator = void 0;
@@ -4331,7 +4348,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 173,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4390,7 +4407,7 @@ var DataSpace = class {
     }
     await this._inner.open(new Context6(void 0, {
       F: __dxlog_file16,
-      L: 247
+      L: 250
     }));
     await this._inner.startProtocol();
     await this._edgeFeedReplicator?.open();
@@ -4399,7 +4416,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 253,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4419,14 +4436,14 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 272,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new Context6(void 0, {
       F: __dxlog_file16,
-      L: 274
+      L: 277
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4459,7 +4476,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log13("data pipeline initialization cancelled", err, {
             F: __dxlog_file16,
-            L: 312,
+            L: 315,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4467,7 +4484,7 @@ var DataSpace = class {
         }
         log13.error("Error initializing data pipeline", err, {
           F: __dxlog_file16,
-          L: 316,
+          L: 319,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4476,7 +4493,7 @@ var DataSpace = class {
           state: SpaceState4[this._state]
         }, {
           F: __dxlog_file16,
-          L: 318,
+          L: 321,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4496,13 +4513,13 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 334,
+      L: 337,
       S: this,
       C: (f, a) => f(...a)
     });
     log13("initializing control pipeline", void 0, {
       F: __dxlog_file16,
-      L: 336,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4511,21 +4528,21 @@ var DataSpace = class {
     const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState4.SPACE_READY);
     log13("initializing automerge root", void 0, {
       F: __dxlog_file16,
-      L: 344,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
     this._automergeSpaceState.startProcessingRootDocs();
     log13("waiting for space to be ready", void 0, {
       F: __dxlog_file16,
-      L: 348,
+      L: 351,
       S: this,
       C: (f, a) => f(...a)
     });
     await ready;
     log13("space is ready", void 0, {
       F: __dxlog_file16,
-      L: 350,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4533,14 +4550,14 @@ var DataSpace = class {
   async *getAllDocuments() {
     invariant11(this._databaseRoot, "Space is not ready", {
       F: __dxlog_file16,
-      L: 354,
+      L: 357,
       S: this,
       A: [
         "this._databaseRoot",
         "'Space is not ready'"
       ]
     });
-    const doc = this._databaseRoot.docSync() ?? failedInvariant3();
+    const doc = this._databaseRoot.doc() ?? failedInvariant3();
     const root = save(doc);
     yield [
       this._databaseRoot.documentId,
@@ -4549,7 +4566,7 @@ var DataSpace = class {
     for (const documentUrl of this._databaseRoot.getAllLinkedDocuments()) {
       const data = await this._echoHost.exportDoc(Context6.default(void 0, {
         F: __dxlog_file16,
-        L: 360
+        L: 363
       }), documentUrl);
       yield [
         documentUrl.replace(/^automerge:/, ""),
@@ -4564,7 +4581,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 369,
+      L: 372,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4581,7 +4598,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log13("writable feeds created", void 0, {
       F: __dxlog_file16,
-      L: 386,
+      L: 389,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4635,7 +4652,7 @@ var DataSpace = class {
           count: credentials.length
         }, {
           F: __dxlog_file16,
-          L: 444,
+          L: 447,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4646,14 +4663,14 @@ var DataSpace = class {
         });
         log13("credentials notarized", void 0, {
           F: __dxlog_file16,
-          L: 448,
+          L: 451,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         log13.error("error notarizing credentials for feed admission", err, {
           F: __dxlog_file16,
-          L: 450,
+          L: 453,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4668,26 +4685,28 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file16,
-      L: 460,
+      L: 463,
       S: this,
       C: (f, a) => f(...a)
     });
-    const handle = this._echoHost.automergeRepo.find(rootUrl);
+    let handle;
     queueMicrotask(async () => {
       try {
+        const env = {
+          stack: [],
+          error: void 0,
+          hasError: false
+        };
         try {
-          var _usingCtx = _using_ctx3();
           await warnAfterTimeout(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
+            handle = await cancelWithContext2(this._ctx, this._echoHost.automergeRepo.find(rootUrl, FIND_PARAMS2));
             await cancelWithContext2(this._ctx, handle.whenReady());
           });
           if (this._ctx.disposed) {
             return;
           }
-          const _guard = (
-            // Ensure only one root is processed at a time.
-            _usingCtx.u(await this._epochProcessingMutex.acquire())
-          );
-          const doc = handle.docSync() ?? failedInvariant3();
+          const _guard = _ts_add_disposable_resource3(env, await this._epochProcessingMutex.acquire(), false);
+          const doc = handle.doc() ?? failedInvariant3();
           if (!doc.access?.spaceKey) {
             handle.change((doc2) => {
               doc2.access = {
@@ -4705,10 +4724,11 @@ var DataSpace = class {
           } else {
             this.stateUpdate.emit();
           }
-        } catch (_) {
-          _usingCtx.e = _;
+        } catch (e) {
+          env.error = e;
+          env.hasError = true;
         } finally {
-          _usingCtx.d();
+          _ts_dispose_resources3(env);
         }
       } catch (err) {
         if (err instanceof ContextDisposedError) {
@@ -4720,7 +4740,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file16,
-          L: 503,
+          L: 510,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4810,7 +4830,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 585,
+      L: 592,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5221,15 +5241,10 @@ var InvitationGuestExtension = class extends RpcExtension2 {
       exposed: {
         InvitationHostService: schema4.getService("dxos.halo.invitations.InvitationHostService")
       }
-    });
-    this._invitationFlowMutex = _invitationFlowMutex;
-    this._callbacks = _callbacks;
-    this._ctx = new Context7(void 0, {
+    }), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks, this._ctx = new Context7(void 0, {
       F: __dxlog_file19,
       L: 38
-    });
-    this._remoteOptionsTrigger = new Trigger5();
-    this._invitationFlowLock = null;
+    }), this._remoteOptionsTrigger = new Trigger5(), this._invitationFlowLock = null;
   }
   hasFlowLock() {
     return this._invitationFlowLock != null;
@@ -5358,20 +5373,10 @@ var InvitationHostExtension = class extends RpcExtension3 {
       exposed: {
         InvitationHostService: schema5.getService("dxos.halo.invitations.InvitationHostService")
       }
-    });
-    this._invitationFlowMutex = _invitationFlowMutex;
-    this._callbacks = _callbacks;
-    this._ctx = new Context8(void 0, {
+    }), this._invitationFlowMutex = _invitationFlowMutex, this._callbacks = _callbacks, this._ctx = new Context8(void 0, {
       F: __dxlog_file20,
       L: 57
-    });
-    this._remoteOptionsTrigger = new Trigger6();
-    this._challenge = void 0;
-    this.guestProfile = void 0;
-    this.authenticationPassed = false;
-    this.authenticationRetry = 0;
-    this.completedTrigger = new Trigger6();
-    this._invitationFlowLock = null;
+    }), this._remoteOptionsTrigger = new Trigger6(), this._challenge = void 0, this.guestProfile = void 0, this.authenticationPassed = false, this.authenticationRetry = 0, this.completedTrigger = new Trigger6(), this._invitationFlowLock = null;
   }
   hasFlowLock() {
     return this._invitationFlowLock != null;
@@ -7075,14 +7080,14 @@ var InvitationsManager = class {
       }
     }, {
       F: __dxlog_file25,
-      L: 236
+      L: 239
     });
     ctx.onDispose(() => {
       log21("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file25,
-        L: 243,
+        L: 246,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7115,7 +7120,7 @@ var InvitationsManager = class {
             ...handler.toJSON()
           }, {
             F: __dxlog_file25,
-            L: 263,
+            L: 274,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7126,7 +7131,7 @@ var InvitationsManager = class {
         } else {
           log21.warn("auth failed", err, {
             F: __dxlog_file25,
-            L: 266,
+            L: 277,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7139,14 +7144,14 @@ var InvitationsManager = class {
       }
     }, {
       F: __dxlog_file25,
-      L: 260
+      L: 271
     });
     ctx.onDispose(() => {
       log21("complete", {
         ...handler.toJSON()
       }, {
         F: __dxlog_file25,
-        L: 273,
+        L: 284,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7191,7 +7196,7 @@ var InvitationsManager = class {
     } catch (err) {
       log21.catch(err, void 0, {
         F: __dxlog_file25,
-        L: 309,
+        L: 320,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7215,10 +7220,6 @@ function _ts_decorate7(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file26 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/locks/browser.ts";
-var Message;
-(function(Message2) {
-  Message2["ACQUIRING"] = "acquiring";
-})(Message || (Message = {}));
 var Lock = class {
   constructor({ lockKey, onAcquire, onRelease }) {
     this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
@@ -7422,13 +7423,7 @@ var AGENT_STATUS_QUERY_RETRY_JITTER = 1e3;
 var AGENT_FEED_ADDED_CHECK_INTERVAL_MS = 3e3;
 var EdgeAgentManager = class extends Resource7 {
   constructor(_edgeFeatures, _edgeHttpClient, _dataSpaceManager, _identity) {
-    super();
-    this._edgeFeatures = _edgeFeatures;
-    this._edgeHttpClient = _edgeHttpClient;
-    this._dataSpaceManager = _dataSpaceManager;
-    this._identity = _identity;
-    this.agentStatusChanged = new Event9();
-    this._lastKnownDeviceCount = 0;
+    super(), this._edgeFeatures = _edgeFeatures, this._edgeHttpClient = _edgeHttpClient, this._dataSpaceManager = _dataSpaceManager, this._identity = _identity, this.agentStatusChanged = new Event9(), this._lastKnownDeviceCount = 0;
   }
   get agentStatus() {
     return this._agentStatus;
@@ -7646,28 +7641,22 @@ _ts_decorate9([
 // packages/sdk/client-services/src/packlets/agents/edge-agent-service.ts
 import { Stream as Stream11 } from "@dxos/codec-protobuf/stream";
 import { EdgeAgentStatus as EdgeAgentStatus2 } from "@dxos/protocols";
-import { QueryAgentStatusResponse, QueryEdgeStatusResponse } from "@dxos/protocols/proto/dxos/client/services";
+import { QueryAgentStatusResponse, EdgeStatus as EdgeStatus2 } from "@dxos/protocols/proto/dxos/client/services";
 var EdgeAgentServiceImpl = class {
   constructor(_agentManagerProvider, _edgeConnection) {
     this._agentManagerProvider = _agentManagerProvider;
     this._edgeConnection = _edgeConnection;
   }
+  // TODO(mykola): Reconcile with NetworkService.queryStatus.
   queryEdgeStatus() {
     return new Stream11(({ ctx, next }) => {
-      next({
-        status: 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: QueryEdgeStatusResponse.EdgeStatus.CONNECTED
-          });
-        })
-      );
+      const update = () => {
+        next({
+          status: this._edgeConnection?.status ?? EdgeStatus2.NOT_CONNECTED
+        });
+      };
+      this._edgeConnection?.statusChanged.on(ctx, update);
+      update();
     });
   }
   async createAgent() {
@@ -7743,7 +7732,7 @@ var EdgeIdentityRecoveryManager = class {
     const identity = this._identityProvider();
     invariant21(identity, void 0, {
       F: __dxlog_file28,
-      L: 37,
+      L: 39,
       S: this,
       A: [
         "identity",
@@ -7794,7 +7783,7 @@ var EdgeIdentityRecoveryManager = class {
   async requestRecoveryChallenge() {
     invariant21(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file28,
-      L: 74,
+      L: 76,
       S: this,
       A: [
         "this._edgeClient",
@@ -7824,7 +7813,7 @@ var EdgeIdentityRecoveryManager = class {
   async recoverIdentityWithExternalSignature({ lookupKey, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData }) {
     invariant21(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file28,
-      L: 106,
+      L: 108,
       S: this,
       A: [
         "this._edgeClient",
@@ -7858,7 +7847,7 @@ var EdgeIdentityRecoveryManager = class {
   async recoverIdentityWithToken({ token }) {
     invariant21(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file28,
-      L: 139,
+      L: 141,
       S: this,
       A: [
         "this._edgeClient",
@@ -7886,7 +7875,7 @@ var EdgeIdentityRecoveryManager = class {
   async recoverIdentity({ recoveryCode }) {
     invariant21(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file28,
-      L: 163,
+      L: 165,
       S: this,
       A: [
         "this._edgeClient",
@@ -7917,7 +7906,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     log24.info("recovering identity", response, {
       F: __dxlog_file28,
-      L: 189,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7945,86 +7934,75 @@ function _ts_decorate10(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-function _using_ctx4() {
-  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
-    var err = new Error();
-    err.name = "SuppressedError";
-    err.suppressed = suppressed;
-    err.error = error;
-    return err;
-  }, empty = {}, stack = [];
-  function using(isAwait, value) {
-    if (value != null) {
-      if (Object(value) !== value) {
-        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
-      }
-      if (isAwait) {
-        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
-      }
-      if (dispose == null) {
-        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
-      }
-      if (typeof dispose !== "function") {
-        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
-      }
-      stack.push({
-        v: value,
-        d: dispose,
-        a: isAwait
-      });
-    } else if (isAwait) {
-      stack.push({
-        d: value,
-        a: isAwait
-      });
-    }
-    return value;
+function _ts_add_disposable_resource4(env, value, async) {
+  if (value !== null && value !== void 0) {
+    if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
+    var dispose, inner;
+    if (async) {
+      if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
+      dispose = value[Symbol.asyncDispose];
+    }
+    if (dispose === void 0) {
+      if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
+      dispose = value[Symbol.dispose];
+      if (async) inner = dispose;
+    }
+    if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
+    if (inner) dispose = function() {
+      try {
+        inner.call(this);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    };
+    env.stack.push({
+      value,
+      dispose,
+      async
+    });
+  } else if (async) {
+    env.stack.push({
+      async: true
+    });
   }
-  return {
-    e: empty,
-    u: using.bind(null, false),
-    a: using.bind(null, true),
-    d: function() {
-      var error = this.e;
-      function next() {
-        while (resource = stack.pop()) {
-          try {
-            var resource, disposalResult = resource.d && resource.d.call(resource.v);
-            if (resource.a) {
-              return Promise.resolve(disposalResult).then(next, err);
-            }
-          } catch (e) {
-            return err(e);
-          }
+  return value;
+}
+function _ts_dispose_resources4(env) {
+  var _SuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed, message) {
+    var e = new Error(message);
+    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
+  };
+  return (_ts_dispose_resources4 = function _ts_dispose_resources5(env2) {
+    function fail(e) {
+      env2.error = env2.hasError ? new _SuppressedError(e, env2.error, "An error was suppressed during disposal.") : e;
+      env2.hasError = true;
+    }
+    var r, s = 0;
+    function next() {
+      while (r = env2.stack.pop()) {
+        try {
+          if (!r.async && s === 1) return s = 0, env2.stack.push(r), Promise.resolve().then(next);
+          if (r.dispose) {
+            var result = r.dispose.call(r.value);
+            if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) {
+              fail(e);
+              return next();
+            });
+          } else s |= 1;
+        } catch (e) {
+          fail(e);
         }
-        if (error !== empty) throw error;
-      }
-      function err(e) {
-        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
-        return next();
       }
-      return next();
+      if (s === 1) return env2.hasError ? Promise.reject(env2.error) : Promise.resolve();
+      if (env2.hasError) throw env2.error;
     }
-  };
+    return next();
+  })(env);
 }
 var __dxlog_file29 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource8 {
   constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtimeParams, _edgeFeatures) {
-    super();
-    this.storage = storage;
-    this.level = level;
-    this.networkManager = networkManager;
-    this.signalManager = signalManager;
-    this._edgeConnection = _edgeConnection;
-    this._edgeHttpClient = _edgeHttpClient;
-    this._runtimeParams = _runtimeParams;
-    this._edgeFeatures = _edgeFeatures;
-    this._edgeIdentityUpdateMutex = new Mutex4();
-    this.initialized = new Trigger9();
-    this._meshReplicator = void 0;
-    this._echoEdgeReplicator = void 0;
-    this._handlerFactories = /* @__PURE__ */ new Map();
-    this._instanceId = PublicKey15.random().toHex();
+    super(), this.storage = storage, this.level = level, this.networkManager = networkManager, this.signalManager = signalManager, this._edgeConnection = _edgeConnection, this._edgeHttpClient = _edgeHttpClient, this._runtimeParams = _runtimeParams, this._edgeFeatures = _edgeFeatures, this._edgeIdentityUpdateMutex = new Mutex4(), this.initialized = new Trigger9(), this._meshReplicator = void 0, this._echoEdgeReplicator = void 0, this._handlerFactories = /* @__PURE__ */ new Map(), this._instanceId = PublicKey15.random().toHex();
     this.metadataStore = new MetadataStore(storage.createDirectory("metadata"));
     this.blobStore = new BlobStore(storage.createDirectory("blobs"));
     this.keyring = new Keyring(storage.createDirectory("keyring"));
@@ -8059,7 +8037,10 @@ var ServiceContext = class extends Resource8 {
     this.echoHost = new EchoHost({
       kv: this.level,
       peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex(),
-      getSpaceKeyByRootDocumentId: (documentId) => this.spaceManager.findSpaceByRootDocumentId(documentId)?.key
+      getSpaceKeyByRootDocumentId: (documentId) => this.spaceManager.findSpaceByRootDocumentId(documentId)?.key,
+      indexing: {
+        vector: this._runtimeParams?.enableVectorIndexing
+      }
     });
     this._meshReplicator = new MeshEchoReplicator();
     this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeParams?.invitationConnectionDefaultParams);
@@ -8078,7 +8059,7 @@ var ServiceContext = class extends Resource8 {
     await this._checkStorageVersion();
     log25("opening...", void 0, {
       F: __dxlog_file29,
-      L: 199,
+      L: 203,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8086,7 +8067,7 @@ var ServiceContext = class extends Resource8 {
       id: this._instanceId
     }), {
       F: __dxlog_file29,
-      L: 200,
+      L: 204,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8113,7 +8094,7 @@ var ServiceContext = class extends Resource8 {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file29,
-      L: 228,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8121,13 +8102,13 @@ var ServiceContext = class extends Resource8 {
       id: this._instanceId
     }), {
       F: __dxlog_file29,
-      L: 230,
+      L: 234,
       S: this,
       C: (f, a) => f(...a)
     });
     log25("opened", void 0, {
       F: __dxlog_file29,
-      L: 231,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8135,7 +8116,7 @@ var ServiceContext = class extends Resource8 {
   async _close(ctx) {
     log25("closing...", void 0, {
       F: __dxlog_file29,
-      L: 235,
+      L: 239,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8154,7 +8135,7 @@ var ServiceContext = class extends Resource8 {
     await this._edgeConnection?.close();
     log25("closed", void 0, {
       F: __dxlog_file29,
-      L: 251,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8165,7 +8146,7 @@ var ServiceContext = class extends Resource8 {
     await identity.joinNetwork();
     await this._initialize(new Context10(void 0, {
       F: __dxlog_file29,
-      L: 258
+      L: 262
     }));
     return identity;
   }
@@ -8176,7 +8157,7 @@ var ServiceContext = class extends Resource8 {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant22(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file29,
-      L: 267,
+      L: 271,
       S: this,
       A: [
         "factory",
@@ -8202,7 +8183,7 @@ var ServiceContext = class extends Resource8 {
     await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
     await this._initialize(new Context10(void 0, {
       F: __dxlog_file29,
-      L: 286
+      L: 290
     }));
     return identity;
   }
@@ -8216,7 +8197,7 @@ var ServiceContext = class extends Resource8 {
   async _initialize(ctx) {
     log25("initializing spaces...", void 0, {
       F: __dxlog_file29,
-      L: 301,
+      L: 305,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8255,7 +8236,7 @@ var ServiceContext = class extends Resource8 {
     this._handlerFactories.set(Invitation10.Kind.SPACE, (invitation) => {
       invariant22(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file29,
-        L: 339,
+        L: 343,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -8279,7 +8260,7 @@ var ServiceContext = class extends Resource8 {
             details: assertion
           }, {
             F: __dxlog_file29,
-            L: 355,
+            L: 359,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8290,7 +8271,7 @@ var ServiceContext = class extends Resource8 {
             details: assertion
           }, {
             F: __dxlog_file29,
-            L: 359,
+            L: 363,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8301,7 +8282,7 @@ var ServiceContext = class extends Resource8 {
             details: assertion
           }, {
             F: __dxlog_file29,
-            L: 364,
+            L: 368,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8312,7 +8293,7 @@ var ServiceContext = class extends Resource8 {
         } catch (err) {
           log25.catch(err, void 0, {
             F: __dxlog_file29,
-            L: 370,
+            L: 374,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8322,9 +8303,13 @@ var ServiceContext = class extends Resource8 {
     await identity.space.spaceState.addCredentialProcessor(this._deviceSpaceSync);
   }
   async _setNetworkIdentity(params) {
+    const env = {
+      stack: [],
+      error: void 0,
+      hasError: false
+    };
     try {
-      var _usingCtx = _using_ctx4();
-      const _ = _usingCtx.u(await this._edgeIdentityUpdateMutex.acquire());
+      const _ = _ts_add_disposable_resource4(env, await this._edgeIdentityUpdateMutex.acquire(), false);
       let edgeIdentity;
       const identity = this.identityManager.identity;
       if (identity) {
@@ -8333,7 +8318,7 @@ var ServiceContext = class extends Resource8 {
           swarms: this.networkManager.topics
         }, {
           F: __dxlog_file29,
-          L: 384,
+          L: 388,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -8347,7 +8332,7 @@ var ServiceContext = class extends Resource8 {
           });
           invariant22(identity.deviceCredentialChain, void 0, {
             F: __dxlog_file29,
-            L: 403,
+            L: 407,
             S: this,
             A: [
               "identity.deviceCredentialChain",
@@ -8365,10 +8350,11 @@ var ServiceContext = class extends Resource8 {
         identityKey: edgeIdentity.identityKey,
         peerKey: edgeIdentity.peerKey
       });
-    } catch (_) {
-      _usingCtx.e = _;
+    } catch (e) {
+      env.error = e;
+      env.hasError = true;
     } finally {
-      _usingCtx.d();
+      _ts_dispose_resources4(env);
     }
   }
 };
@@ -8482,7 +8468,7 @@ var createLevel = async (config) => {
 };
 
 // packages/sdk/client-services/src/packlets/storage/profile-archive.ts
-import { cbor } from "@dxos/automerge/automerge-repo";
+import { cbor } from "@automerge/automerge-repo";
 import { invariant as invariant23 } from "@dxos/invariant";
 import { log as log26 } from "@dxos/log";
 import { ProfileArchiveEntryType } from "@dxos/protocols";
@@ -8504,7 +8490,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file30,
-      L: 30,
+      L: 31,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8522,7 +8508,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file30,
-      L: 41,
+      L: 42,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8530,7 +8516,7 @@ var exportProfileData = async ({ storage, level }) => {
   {
     log26.info("begin exporting kv pairs", void 0, {
       F: __dxlog_file30,
-      L: 45,
+      L: 46,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8551,7 +8537,7 @@ var exportProfileData = async ({ storage, level }) => {
       count
     }, {
       F: __dxlog_file30,
-      L: 56,
+      L: 57,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8567,7 +8553,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         const directory = await storage.createDirectory();
         invariant23(typeof entry2.key === "string", "Invalid key type", {
           F: __dxlog_file30,
-          L: 79,
+          L: 80,
           S: void 0,
           A: [
             "typeof entry.key === 'string'",
@@ -8577,7 +8563,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         const file = await directory.getOrCreateFile(entry2.key);
         invariant23(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file30,
-          L: 81,
+          L: 82,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8591,7 +8577,7 @@ var importProfileData = async ({ storage, level }, archive) => {
       case ProfileArchiveEntryType.KEY_VALUE: {
         invariant23(entry2.key instanceof Uint8Array, "Invalid key type", {
           F: __dxlog_file30,
-          L: 87,
+          L: 88,
           S: void 0,
           A: [
             "entry.key instanceof Uint8Array",
@@ -8600,7 +8586,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         invariant23(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file30,
-          L: 88,
+          L: 89,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8625,7 +8611,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
         F: __dxlog_file30,
-        L: 101,
+        L: 102,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -8633,7 +8619,7 @@ var importProfileData = async ({ storage, level }, archive) => {
   }
   log26.info("committing changes..", void 0, {
     F: __dxlog_file30,
-    L: 109,
+    L: 110,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -8659,7 +8645,7 @@ import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 import { SubscriptionList as SubscriptionList3 } from "@dxos/async";
 import { Stream as Stream12 } from "@dxos/codec-protobuf/stream";
 import { invariant as invariant24 } from "@dxos/invariant";
-import { Device as Device2, DeviceKind as DeviceKind2 } from "@dxos/protocols/proto/dxos/client/services";
+import { Device as Device2, DeviceKind as DeviceKind2, EdgeStatus as EdgeStatus3 } from "@dxos/protocols/proto/dxos/client/services";
 var __dxlog_file31 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager, _edgeConnection) {
@@ -8680,7 +8666,7 @@ var DevicesServiceImpl = class {
         } else {
           invariant24(this._identityManager.identity?.presence, "presence not present", {
             F: __dxlog_file31,
-            L: 36,
+            L: 37,
             S: this,
             A: [
               "this._identityManager.identity?.presence",
@@ -8695,7 +8681,7 @@ var DevicesServiceImpl = class {
               if (isMe) {
                 presence = Device2.PresenceState.ONLINE;
               } else if (profile.os?.toUpperCase() === "EDGE") {
-                presence = this._edgeConnection?.isConnected ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
+                presence = this._edgeConnection?.status === EdgeStatus3.CONNECTED ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
               } else {
                 presence = peers.some((peer) => peer.identityKey.equals(key)) ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
               }
@@ -8955,12 +8941,13 @@ var LOG_PROCESSING = 0;
 // packages/sdk/client-services/src/packlets/network/network-service.ts
 import { Stream as Stream15 } from "@dxos/codec-protobuf/stream";
 var NetworkServiceImpl = class {
-  constructor(networkManager, signalManager) {
+  constructor(networkManager, signalManager, edgeConnection) {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
+    this.edgeConnection = edgeConnection;
   }
   queryStatus() {
-    return new Stream15(({ next }) => {
+    return new Stream15(({ ctx, next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -8971,13 +8958,9 @@ var NetworkServiceImpl = class {
           }))
         });
       };
-      const unsubscribeSwarm = this.networkManager.connectionStateChanged.on(() => update());
-      const unsubscribeSignal = this.signalManager.statusChanged?.on(() => update());
+      this.networkManager.connectionStateChanged.on(ctx, () => update());
+      this.signalManager.statusChanged?.on(ctx, () => update());
       update();
-      return () => {
-        unsubscribeSwarm();
-        unsubscribeSignal?.();
-      };
     });
   }
   async updateConfig(request) {
@@ -8993,26 +8976,24 @@ var NetworkServiceImpl = class {
     return this.signalManager.query(request);
   }
   subscribeSwarmState(request) {
-    return new Stream15(({ next }) => {
-      const unsubscribe = this.signalManager.swarmState?.on((state) => {
+    return new Stream15(({ ctx, next }) => {
+      this.signalManager.swarmState?.on(ctx, (state) => {
         if (request.topic.equals(state.swarmKey)) {
           next(state);
         }
       });
-      return unsubscribe;
     });
   }
   async sendMessage(message) {
     return this.signalManager.sendMessage(message);
   }
   subscribeMessages(peer) {
-    return new Stream15(({ next }) => {
-      const unsubscribe = this.signalManager.onMessage.on((message) => {
+    return new Stream15(({ ctx, next }) => {
+      this.signalManager.onMessage.on(ctx, (message) => {
         if (message.recipient.peerKey === peer.peerKey) {
           next(message);
         }
       });
-      return unsubscribe;
     });
   }
 };
@@ -9108,6 +9089,9 @@ var ClientServicesHost = class {
     if (this._runtimeParams.disableP2pReplication === void 0) {
       this._runtimeParams.disableP2pReplication = config?.get("runtime.client.disableP2pReplication", false);
     }
+    if (this._runtimeParams.enableVectorIndexing === void 0) {
+      this._runtimeParams.enableVectorIndexing = config?.get("runtime.client.enableVectorIndexing", false);
+    }
     if (config) {
       this.initialize({
         config,
@@ -9122,7 +9106,7 @@ var ClientServicesHost = class {
           if (!this._opening) {
             void this.open(new Context11(void 0, {
               F: __dxlog_file32,
-              L: 137
+              L: 141
             }));
           }
         },
@@ -9180,7 +9164,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     invariant25(!this._open, "service host is open", {
       F: __dxlog_file32,
-      L: 203,
+      L: 207,
       S: this,
       A: [
         "!this._open",
@@ -9189,14 +9173,14 @@ var ClientServicesHost = class {
     });
     log28("initializing...", void 0, {
       F: __dxlog_file32,
-      L: 204,
+      L: 208,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       invariant25(!this._config, "config already set", {
         F: __dxlog_file32,
-        L: 207,
+        L: 211,
         S: this,
         A: [
           "!this._config",
@@ -9211,7 +9195,7 @@ var ClientServicesHost = class {
     if (!options.signalManager) {
       log28.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file32,
-        L: 215,
+        L: 219,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -9231,7 +9215,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     invariant25(!this._networkManager, "network manager already set", {
       F: __dxlog_file32,
-      L: 237,
+      L: 241,
       S: this,
       A: [
         "!this._networkManager",
@@ -9249,7 +9233,7 @@ var ClientServicesHost = class {
     });
     log28("initialized", void 0, {
       F: __dxlog_file32,
-      L: 250,
+      L: 254,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9263,13 +9247,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 261,
+      L: 265,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant25(this._config, "config not set", {
       F: __dxlog_file32,
-      L: 263,
+      L: 267,
       S: this,
       A: [
         "this._config",
@@ -9278,7 +9262,7 @@ var ClientServicesHost = class {
     });
     invariant25(this._storage, "storage not set", {
       F: __dxlog_file32,
-      L: 264,
+      L: 268,
       S: this,
       A: [
         "this._storage",
@@ -9287,7 +9271,7 @@ var ClientServicesHost = class {
     });
     invariant25(this._signalManager, "signal manager not set", {
       F: __dxlog_file32,
-      L: 265,
+      L: 269,
       S: this,
       A: [
         "this._signalManager",
@@ -9296,7 +9280,7 @@ var ClientServicesHost = class {
     });
     invariant25(this._networkManager, "network manager not set", {
       F: __dxlog_file32,
-      L: 266,
+      L: 270,
       S: this,
       A: [
         "this._networkManager",
@@ -9308,7 +9292,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file32,
-      L: 269,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9337,7 +9321,7 @@ var ClientServicesHost = class {
       SpacesService: new SpacesServiceImpl(this._serviceContext.identityManager, this._serviceContext.spaceManager, dataSpaceManagerProvider),
       DataService: this._serviceContext.echoHost.dataService,
       QueryService: this._serviceContext.echoHost.queryService,
-      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager),
+      NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager, this._serviceContext.signalManager, this._edgeConnection),
       LoggingService: this._loggingService,
       TracingService: this._tracingService,
       // TODO(burdon): Move to new protobuf definitions.
@@ -9369,7 +9353,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file32,
-      L: 366,
+      L: 374,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9377,7 +9361,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 367,
+      L: 375,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9391,7 +9375,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file32,
-      L: 378,
+      L: 386,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9409,7 +9393,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file32,
-      L: 387,
+      L: 395,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9420,13 +9404,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 392,
+      L: 400,
       S: this,
       C: (f, a) => f(...a)
     });
     log28.info("resetting...", void 0, {
       F: __dxlog_file32,
-      L: 394,
+      L: 402,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9436,7 +9420,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log28.info("reset", void 0, {
       F: __dxlog_file32,
-      L: 401,
+      L: 409,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9444,7 +9428,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 402,
+      L: 410,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9522,4 +9506,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-MHDASPY5.mjs.map
+//# sourceMappingURL=chunk-LY3V7LMQ.mjs.map