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

package/dist/lib/browser/{chunk-I3QLQXQD.mjs → chunk-2TKMQ2UP.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.2-main.fbd8ed0";
+var DXOS_VERSION = "0.8.2-staging.7ac8446";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -817,7 +817,6 @@ 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;
@@ -908,7 +907,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _open() {
     log4("open", void 0, {
       F: __dxlog_file6,
-      L: 57,
+      L: 56,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -927,7 +926,7 @@ var EdgeFeedReplicator = class extends Resource {
           _spaceId: this._spaceId
         }, {
           F: __dxlog_file6,
-          L: 71,
+          L: 70,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -940,7 +939,7 @@ var EdgeFeedReplicator = class extends Resource {
         type: payload.type
       }, {
         F: __dxlog_file6,
-        L: 76,
+        L: 75,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -952,14 +951,14 @@ var EdgeFeedReplicator = class extends Resource {
   }
   async _handleReconnect() {
     await this._resetConnection();
-    if (this._messenger.status === EdgeStatus.CONNECTED) {
+    if (this._messenger.isConnected) {
       this._startReplication();
     }
   }
   async _close() {
     log4("close", void 0, {
       F: __dxlog_file6,
-      L: 96,
+      L: 95,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -971,7 +970,7 @@ var EdgeFeedReplicator = class extends Resource {
     this._connectionCtx = connectionCtx;
     log4("connection context created", void 0, {
       F: __dxlog_file6,
-      L: 104,
+      L: 103,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -984,7 +983,7 @@ var EdgeFeedReplicator = class extends Resource {
   async _resetConnection() {
     log4("resetConnection", void 0, {
       F: __dxlog_file6,
-      L: 113,
+      L: 112,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1000,7 +999,7 @@ var EdgeFeedReplicator = class extends Resource {
       hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file6,
-      L: 121,
+      L: 120,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1017,7 +1016,7 @@ var EdgeFeedReplicator = class extends Resource {
       key: feed.key
     }, {
       F: __dxlog_file6,
-      L: 134,
+      L: 133,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1033,7 +1032,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log4("message dropped because connection was disposed", void 0, {
         F: __dxlog_file6,
-        L: 147,
+        L: 146,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1045,14 +1044,14 @@ var EdgeFeedReplicator = class extends Resource {
         blocks: message.blocks.map((b) => b.index)
       }, {
         F: __dxlog_file6,
-        L: 152,
+        L: 151,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file6,
-      L: 158,
+      L: 157,
       S: this,
       A: [
         "message.feedKey",
@@ -1064,7 +1063,7 @@ var EdgeFeedReplicator = class extends Resource {
       type: message.type
     }, {
       F: __dxlog_file6,
-      L: 161,
+      L: 160,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1083,7 +1082,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log4.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file6,
-        L: 176,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1101,7 +1100,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file6,
-                L: 185,
+                L: 184,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1117,7 +1116,7 @@ var EdgeFeedReplicator = class extends Resource {
             if (message.length > feed.length) {
               log4("requesting missing blocks", logMeta, {
                 F: __dxlog_file6,
-                L: 195,
+                L: 194,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1132,7 +1131,7 @@ var EdgeFeedReplicator = class extends Resource {
             } else if (message.length < feed.length) {
               log4("pushing blocks to remote", logMeta, {
                 F: __dxlog_file6,
-                L: 203,
+                L: 202,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1151,7 +1150,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file6,
-            L: 212,
+            L: 211,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1162,7 +1161,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file6,
-              L: 217,
+              L: 216,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1176,7 +1175,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file6,
-            L: 226,
+            L: 225,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1191,7 +1190,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file6,
-      L: 233,
+      L: 232,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1201,7 +1200,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file6,
-        L: 238,
+        L: 237,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1229,7 +1228,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file6,
-      L: 259,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1251,7 +1250,7 @@ var EdgeFeedReplicator = class extends Resource {
       if (!this._remoteLength.has(feed.key)) {
         log4("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file6,
-          L: 280,
+          L: 279,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1276,7 +1275,7 @@ var EdgeFeedReplicator = class extends Resource {
         if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
           log4("resetting on reconnect", void 0, {
             F: __dxlog_file6,
-            L: 297,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1287,7 +1286,7 @@ var EdgeFeedReplicator = class extends Resource {
       }
     }, {
       F: __dxlog_file6,
-      L: 291
+      L: 290
     });
     return connectionCtx;
   }
@@ -1307,12 +1306,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, FIND_PARAMS as FIND_PARAMS2 } from "@dxos/echo-pipeline";
+import { createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { SpaceDocVersion as SpaceDocVersion2 } from "@dxos/echo-protocol";
 import { failedInvariant as failedInvariant3, invariant as invariant11 } from "@dxos/invariant";
 import { PublicKey as PublicKey8 } from "@dxos/keys";
@@ -1390,7 +1389,7 @@ var runEpochMigration = async (ctx, context) => {
       const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
         timeout: LOAD_DOC_TIMEOUT
       });
-      const newRoot = context.echoHost.createDoc(rootHandle.doc());
+      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
       await context.echoHost.flush();
       return {
         newRoot: newRoot.url
@@ -1406,7 +1405,7 @@ var runEpochMigration = async (ctx, context) => {
     case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       invariant3(context.newAutomergeRoot, void 0, {
         F: __dxlog_file7,
-        L: 63,
+        L: 62,
         S: void 0,
         A: [
           "context.newAutomergeRoot",
@@ -1935,14 +1934,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, FIND_PARAMS } from "@dxos/echo-pipeline";
+import { DatabaseRoot, findInlineObjectOfType, AuthStatus, CredentialServerExtension } from "@dxos/echo-pipeline";
 import { SpaceDocVersion, createIdFromSpaceKey, encodeReference } from "@dxos/echo-protocol";
-import { ObjectId, getTypeReference } from "@dxos/echo-schema";
+import { createObjectId, 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";
@@ -2065,11 +2064,10 @@ var DataSpaceManager = class extends Resource4 {
       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, 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 && findInlineObjectOfType(rootDoc, TYPE_PROPERTIES);
           return {
             key: space.key.toHex(),
@@ -2081,7 +2079,7 @@ var DataSpaceManager = class extends Resource4 {
             members: space.inner.spaceState.members.size,
             rootUrl
           };
-        }));
+        });
       }
     });
   }
@@ -2097,7 +2095,7 @@ var DataSpaceManager = class extends Resource4 {
   async _open() {
     log7("open", void 0, {
       F: __dxlog_file10,
-      L: 215,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2105,7 +2103,7 @@ var DataSpaceManager = class extends Resource4 {
       id: this._instanceId
     }), {
       F: __dxlog_file10,
-      L: 216,
+      L: 214,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2113,7 +2111,7 @@ var DataSpaceManager = class extends Resource4 {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file10,
-      L: 217,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2123,7 +2121,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceMetadata
         }, {
           F: __dxlog_file10,
-          L: 221,
+          L: 219,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2134,7 +2132,7 @@ var DataSpaceManager = class extends Resource4 {
           err
         }, {
           F: __dxlog_file10,
-          L: 224,
+          L: 222,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2145,7 +2143,7 @@ var DataSpaceManager = class extends Resource4 {
       id: this._instanceId
     }), {
       F: __dxlog_file10,
-      L: 230,
+      L: 228,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2153,7 +2151,7 @@ var DataSpaceManager = class extends Resource4 {
   async _close() {
     log7("close", void 0, {
       F: __dxlog_file10,
-      L: 235,
+      L: 233,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2184,7 +2182,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 264,
+      L: 262,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2192,7 +2190,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: 269,
+        L: 267,
         S: this,
         A: [
           "Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId))",
@@ -2204,7 +2202,7 @@ var DataSpaceManager = class extends Resource4 {
           documentId
         }, {
           F: __dxlog_file10,
-          L: 276,
+          L: 274,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2218,7 +2216,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 283,
+      L: 281,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2227,7 +2225,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: 288
+        L: 286
       }), newRootDocId);
       DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
       root = await this._echoHost.openSpaceRoot(spaceId, `automerge:${newRootDocId}`);
@@ -2238,7 +2236,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 296,
+      L: 294,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2248,7 +2246,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 301,
+      L: 299,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2257,7 +2255,7 @@ var DataSpaceManager = class extends Resource4 {
     const memberCredential = credentials[1];
     invariant5(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file10,
-      L: 307,
+      L: 305,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2271,7 +2269,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file10,
-      L: 312,
+      L: 310,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2284,18 +2282,7 @@ var DataSpaceManager = class extends Resource4 {
     }
     switch (space.databaseRoot.getVersion()) {
       case SpaceDocVersion.CURRENT: {
-        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) ?? [];
+        const [_, properties] = findInlineObjectOfType(space.databaseRoot.docSync(), TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       case SpaceDocVersion.LEGACY: {
@@ -2307,7 +2294,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceId: space.id
         }, {
           F: __dxlog_file10,
-          L: 336,
+          L: 330,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2328,7 +2315,7 @@ var DataSpaceManager = class extends Resource4 {
         keys: []
       }
     };
-    const propertiesId = ObjectId.random();
+    const propertiesId = createObjectId();
     document.change((doc) => {
       setDeep(doc, [
         "objects",
@@ -2342,14 +2329,14 @@ var DataSpaceManager = class extends Resource4 {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant5(automergeIndex, void 0, {
       F: __dxlog_file10,
-      L: 369,
+      L: 363,
       S: this,
       A: [
         "automergeIndex",
         ""
       ]
     });
-    const document = await this._echoHost.automergeRepo.find(automergeIndex, FIND_PARAMS);
+    const document = this._echoHost.automergeRepo.find(automergeIndex);
     await document.whenReady();
     return document;
   }
@@ -2359,13 +2346,13 @@ var DataSpaceManager = class extends Resource4 {
       opts
     }, {
       F: __dxlog_file10,
-      L: 378,
+      L: 372,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file10,
-      L: 379,
+      L: 373,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2374,7 +2361,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     invariant5(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file10,
-      L: 380,
+      L: 374,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -2398,7 +2385,7 @@ var DataSpaceManager = class extends Resource4 {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     invariant5(space, void 0, {
       F: __dxlog_file10,
-      L: 400,
+      L: 394,
       S: this,
       A: [
         "space",
@@ -2411,7 +2398,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: 419,
+      L: 413,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2421,7 +2408,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: 421,
+      L: 415,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2459,7 +2446,7 @@ var DataSpaceManager = class extends Resource4 {
     const space = this._spaces.get(spaceKey);
     invariant5(space, "Space not found.", {
       F: __dxlog_file10,
-      L: 458,
+      L: 452,
       S: this,
       A: [
         "space",
@@ -2484,7 +2471,7 @@ var DataSpaceManager = class extends Resource4 {
       metadata
     }, {
       F: __dxlog_file10,
-      L: 477,
+      L: 471,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2528,7 +2515,7 @@ var DataSpaceManager = class extends Resource4 {
             err
           }, {
             F: __dxlog_file10,
-            L: 519,
+            L: 513,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2538,7 +2525,7 @@ var DataSpaceManager = class extends Resource4 {
       onAuthFailure: () => {
         log7.warn("auth failure", void 0, {
           F: __dxlog_file10,
-          L: 524,
+          L: 518,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2571,7 +2558,7 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file10,
-            L: 551,
+            L: 545,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2582,7 +2569,7 @@ var DataSpaceManager = class extends Resource4 {
             open: this._lifecycleState === LifecycleState.OPEN
           }, {
             F: __dxlog_file10,
-            L: 554,
+            L: 548,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2601,7 +2588,7 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file10,
-            L: 562,
+            L: 556,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2622,7 +2609,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceId: dataSpace.id
         }, {
           F: __dxlog_file10,
-          L: 576,
+          L: 570,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2652,7 +2639,7 @@ var DataSpaceManager = class extends Resource4 {
         space: space.key
       }, {
         F: __dxlog_file10,
-        L: 603,
+        L: 597,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2685,7 +2672,7 @@ var DataSpaceManager = class extends Resource4 {
       closedSessions
     }, {
       F: __dxlog_file10,
-      L: 629,
+      L: 623,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2700,7 +2687,7 @@ var DataSpaceManager = class extends Resource4 {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file10,
-          L: 643,
+          L: 637,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2845,7 +2832,7 @@ var extractSpaceArchive = async (archive) => {
     const documentId = entry2.fileName.replace(`${SpaceArchiveFileStructure2.documents}/`, "").replace(/\.bin$/, "");
     invariant6(!documentId.includes("/"), void 0, {
       F: __dxlog_file11,
-      L: 28,
+      L: 27,
       S: void 0,
       A: [
         "!documentId.includes('/')",
@@ -2859,7 +2846,7 @@ var extractSpaceArchive = async (archive) => {
     documents
   }, {
     F: __dxlog_file11,
-    L: 32,
+    L: 31,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -2980,7 +2967,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: 119,
+      L: 118,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2990,7 +2977,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant7(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file12,
-      L: 121,
+      L: 120,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3008,7 +2995,7 @@ var SpacesServiceImpl = class {
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file12,
-          L: 134,
+          L: 133,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3100,7 +3087,7 @@ var SpacesServiceImpl = class {
       } else {
         invariant7(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file12,
-          L: 232,
+          L: 231,
           S: this,
           A: [
             "!credential.id",
@@ -3109,7 +3096,7 @@ var SpacesServiceImpl = class {
         });
         invariant7(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file12,
-          L: 233,
+          L: 232,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -3119,7 +3106,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant7(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file12,
-          L: 235,
+          L: 234,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -3196,7 +3183,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: 289,
+      L: 288,
       S: this,
       A: [
         "extracted.metadata.echo?.currentRootUrl",
@@ -3216,7 +3203,7 @@ var SpacesServiceImpl = class {
     const assertion = getCredentialAssertion3(credential);
     invariant7(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file12,
-      L: 300,
+      L: 299,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3226,7 +3213,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     invariant7(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
       F: __dxlog_file12,
-      L: 302,
+      L: 301,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -4291,7 +4278,7 @@ var DataSpace = class {
   constructor(params) {
     this._ctx = new Context6(void 0, {
       F: __dxlog_file16,
-      L: 100
+      L: 97
     });
     this._cache = void 0;
     this._edgeFeedReplicator = void 0;
@@ -4344,7 +4331,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 176,
+      L: 173,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4403,7 +4390,7 @@ var DataSpace = class {
     }
     await this._inner.open(new Context6(void 0, {
       F: __dxlog_file16,
-      L: 250
+      L: 247
     }));
     await this._inner.startProtocol();
     await this._edgeFeedReplicator?.open();
@@ -4412,7 +4399,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 256,
+      L: 253,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4432,14 +4419,14 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 275,
+      L: 272,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new Context6(void 0, {
       F: __dxlog_file16,
-      L: 277
+      L: 274
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4472,7 +4459,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log13("data pipeline initialization cancelled", err, {
             F: __dxlog_file16,
-            L: 315,
+            L: 312,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4480,7 +4467,7 @@ var DataSpace = class {
         }
         log13.error("Error initializing data pipeline", err, {
           F: __dxlog_file16,
-          L: 319,
+          L: 316,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4489,7 +4476,7 @@ var DataSpace = class {
           state: SpaceState4[this._state]
         }, {
           F: __dxlog_file16,
-          L: 321,
+          L: 318,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4509,13 +4496,13 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 337,
+      L: 334,
       S: this,
       C: (f, a) => f(...a)
     });
     log13("initializing control pipeline", void 0, {
       F: __dxlog_file16,
-      L: 339,
+      L: 336,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4524,21 +4511,21 @@ var DataSpace = class {
     const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState4.SPACE_READY);
     log13("initializing automerge root", void 0, {
       F: __dxlog_file16,
-      L: 347,
+      L: 344,
       S: this,
       C: (f, a) => f(...a)
     });
     this._automergeSpaceState.startProcessingRootDocs();
     log13("waiting for space to be ready", void 0, {
       F: __dxlog_file16,
-      L: 351,
+      L: 348,
       S: this,
       C: (f, a) => f(...a)
     });
     await ready;
     log13("space is ready", void 0, {
       F: __dxlog_file16,
-      L: 353,
+      L: 350,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4546,14 +4533,14 @@ var DataSpace = class {
   async *getAllDocuments() {
     invariant11(this._databaseRoot, "Space is not ready", {
       F: __dxlog_file16,
-      L: 357,
+      L: 354,
       S: this,
       A: [
         "this._databaseRoot",
         "'Space is not ready'"
       ]
     });
-    const doc = this._databaseRoot.doc() ?? failedInvariant3();
+    const doc = this._databaseRoot.docSync() ?? failedInvariant3();
     const root = save(doc);
     yield [
       this._databaseRoot.documentId,
@@ -4562,7 +4549,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: 363
+        L: 360
       }), documentUrl);
       yield [
         documentUrl.replace(/^automerge:/, ""),
@@ -4577,7 +4564,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 372,
+      L: 369,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4594,7 +4581,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log13("writable feeds created", void 0, {
       F: __dxlog_file16,
-      L: 389,
+      L: 386,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4648,7 +4635,7 @@ var DataSpace = class {
           count: credentials.length
         }, {
           F: __dxlog_file16,
-          L: 447,
+          L: 444,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4659,14 +4646,14 @@ var DataSpace = class {
         });
         log13("credentials notarized", void 0, {
           F: __dxlog_file16,
-          L: 451,
+          L: 448,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         log13.error("error notarizing credentials for feed admission", err, {
           F: __dxlog_file16,
-          L: 453,
+          L: 450,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4681,17 +4668,16 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file16,
-      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 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) {
@@ -4701,7 +4687,7 @@ var DataSpace = class {
             // Ensure only one root is processed at a time.
             _usingCtx.u(await this._epochProcessingMutex.acquire())
           );
-          const doc = handle.doc() ?? failedInvariant3();
+          const doc = handle.docSync() ?? failedInvariant3();
           if (!doc.access?.spaceKey) {
             handle.change((doc2) => {
               doc2.access = {
@@ -4734,7 +4720,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file16,
-          L: 510,
+          L: 503,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4824,7 +4810,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file16,
-      L: 592,
+      L: 585,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7660,22 +7646,28 @@ _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, EdgeStatus as EdgeStatus2 } from "@dxos/protocols/proto/dxos/client/services";
+import { QueryAgentStatusResponse, QueryEdgeStatusResponse } 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 }) => {
-      const update = () => {
-        next({
-          status: this._edgeConnection?.status ?? EdgeStatus2.NOT_CONNECTED
-        });
-      };
-      this._edgeConnection?.statusChanged.on(ctx, update);
-      update();
+      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
+          });
+        })
+      );
     });
   }
   async createAgent() {
@@ -8490,7 +8482,7 @@ var createLevel = async (config) => {
 };
 
 // packages/sdk/client-services/src/packlets/storage/profile-archive.ts
-import { cbor } from "@automerge/automerge-repo";
+import { cbor } from "@dxos/automerge/automerge-repo";
 import { invariant as invariant23 } from "@dxos/invariant";
 import { log as log26 } from "@dxos/log";
 import { ProfileArchiveEntryType } from "@dxos/protocols";
@@ -8512,7 +8504,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file30,
-      L: 31,
+      L: 30,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8530,7 +8522,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file30,
-      L: 42,
+      L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8538,7 +8530,7 @@ var exportProfileData = async ({ storage, level }) => {
   {
     log26.info("begin exporting kv pairs", void 0, {
       F: __dxlog_file30,
-      L: 46,
+      L: 45,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8559,7 +8551,7 @@ var exportProfileData = async ({ storage, level }) => {
       count
     }, {
       F: __dxlog_file30,
-      L: 57,
+      L: 56,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8575,7 +8567,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         const directory = await storage.createDirectory();
         invariant23(typeof entry2.key === "string", "Invalid key type", {
           F: __dxlog_file30,
-          L: 80,
+          L: 79,
           S: void 0,
           A: [
             "typeof entry.key === 'string'",
@@ -8585,7 +8577,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: 82,
+          L: 81,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8599,7 +8591,7 @@ var importProfileData = async ({ storage, level }, archive) => {
       case ProfileArchiveEntryType.KEY_VALUE: {
         invariant23(entry2.key instanceof Uint8Array, "Invalid key type", {
           F: __dxlog_file30,
-          L: 88,
+          L: 87,
           S: void 0,
           A: [
             "entry.key instanceof Uint8Array",
@@ -8608,7 +8600,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         invariant23(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file30,
-          L: 89,
+          L: 88,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8633,7 +8625,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
         F: __dxlog_file30,
-        L: 102,
+        L: 101,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -8641,7 +8633,7 @@ var importProfileData = async ({ storage, level }, archive) => {
   }
   log26.info("committing changes..", void 0, {
     F: __dxlog_file30,
-    L: 110,
+    L: 109,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -8667,7 +8659,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, EdgeStatus as EdgeStatus3 } from "@dxos/protocols/proto/dxos/client/services";
+import { Device as Device2, DeviceKind as DeviceKind2 } 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) {
@@ -8688,7 +8680,7 @@ var DevicesServiceImpl = class {
         } else {
           invariant24(this._identityManager.identity?.presence, "presence not present", {
             F: __dxlog_file31,
-            L: 37,
+            L: 36,
             S: this,
             A: [
               "this._identityManager.identity?.presence",
@@ -8703,7 +8695,7 @@ var DevicesServiceImpl = class {
               if (isMe) {
                 presence = Device2.PresenceState.ONLINE;
               } else if (profile.os?.toUpperCase() === "EDGE") {
-                presence = this._edgeConnection?.status === EdgeStatus3.CONNECTED ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
+                presence = this._edgeConnection?.isConnected ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
               } else {
                 presence = peers.some((peer) => peer.identityKey.equals(key)) ? Device2.PresenceState.ONLINE : Device2.PresenceState.OFFLINE;
               }
@@ -8963,13 +8955,12 @@ 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, edgeConnection) {
+  constructor(networkManager, signalManager) {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
-    this.edgeConnection = edgeConnection;
   }
   queryStatus() {
-    return new Stream15(({ ctx, next }) => {
+    return new Stream15(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -8980,9 +8971,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) {
@@ -8998,24 +8993,26 @@ var NetworkServiceImpl = class {
     return this.signalManager.query(request);
   }
   subscribeSwarmState(request) {
-    return new Stream15(({ ctx, next }) => {
-      this.signalManager.swarmState?.on(ctx, (state) => {
+    return new Stream15(({ 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 Stream15(({ ctx, next }) => {
-      this.signalManager.onMessage.on(ctx, (message) => {
+    return new Stream15(({ next }) => {
+      const unsubscribe = this.signalManager.onMessage.on((message) => {
         if (message.recipient.peerKey === peer.peerKey) {
           next(message);
         }
       });
+      return unsubscribe;
     });
   }
 };
@@ -9340,7 +9337,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.
@@ -9372,7 +9369,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file32,
-      L: 370,
+      L: 366,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9380,7 +9377,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 371,
+      L: 367,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9394,7 +9391,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file32,
-      L: 382,
+      L: 378,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9412,7 +9409,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file32,
-      L: 391,
+      L: 387,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9423,13 +9420,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 396,
+      L: 392,
       S: this,
       C: (f, a) => f(...a)
     });
     log28.info("resetting...", void 0, {
       F: __dxlog_file32,
-      L: 398,
+      L: 394,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9439,7 +9436,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log28.info("reset", void 0, {
       F: __dxlog_file32,
-      L: 405,
+      L: 401,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9447,7 +9444,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file32,
-      L: 406,
+      L: 402,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9525,4 +9522,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-I3QLQXQD.mjs.map
+//# sourceMappingURL=chunk-2TKMQ2UP.mjs.map