@dxos/client-services 0.8.2-main.f11618f → 0.8.2-main.fbd8ed0

package/dist/lib/node-esm/{chunk-QLUXYSIC.mjs → chunk-XNCWQTDB.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.f11618f";
+var DXOS_VERSION = "0.8.2-main.fbd8ed0";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -1229,12 +1229,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";
@@ -1312,7 +1312,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
@@ -1328,7 +1328,7 @@ var runEpochMigration = async (ctx, context) => {
     case CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       invariant3(context.newAutomergeRoot, void 0, {
         F: __dxlog_file6,
-        L: 62,
+        L: 63,
         S: void 0,
         A: [
           "context.newAutomergeRoot",
@@ -1857,12 +1857,12 @@ 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 { ObjectId, getTypeReference } from "@dxos/echo-schema";
 import { writeMessages } from "@dxos/feed-store";
@@ -1987,10 +1987,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(),
@@ -2002,7 +2003,7 @@ var DataSpaceManager = class extends Resource4 {
             members: space.inner.spaceState.members.size,
             rootUrl
           };
-        });
+        }));
       }
     });
   }
@@ -2018,7 +2019,7 @@ var DataSpaceManager = class extends Resource4 {
   async _open() {
     log6("open", void 0, {
       F: __dxlog_file9,
-      L: 213,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2026,7 +2027,7 @@ var DataSpaceManager = class extends Resource4 {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 214,
+      L: 216,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2034,7 +2035,7 @@ var DataSpaceManager = class extends Resource4 {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file9,
-      L: 215,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2044,7 +2045,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceMetadata
         }, {
           F: __dxlog_file9,
-          L: 219,
+          L: 221,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2055,7 +2056,7 @@ var DataSpaceManager = class extends Resource4 {
           err
         }, {
           F: __dxlog_file9,
-          L: 222,
+          L: 224,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2066,7 +2067,7 @@ var DataSpaceManager = class extends Resource4 {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 228,
+      L: 230,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2074,7 +2075,7 @@ var DataSpaceManager = class extends Resource4 {
   async _close() {
     log6("close", void 0, {
       F: __dxlog_file9,
-      L: 233,
+      L: 235,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2105,7 +2106,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 262,
+      L: 264,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2113,7 +2114,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_file9,
-        L: 267,
+        L: 269,
         S: this,
         A: [
           "Object.keys(options.documents).every((documentId) => /^[a-zA-Z0-9]+$/.test(documentId))",
@@ -2125,7 +2126,7 @@ var DataSpaceManager = class extends Resource4 {
           documentId
         }, {
           F: __dxlog_file9,
-          L: 274,
+          L: 276,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2139,7 +2140,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 281,
+      L: 283,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2148,7 +2149,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_file9,
-        L: 286
+        L: 288
       }), newRootDocId);
       DatabaseRoot.mapLinks(rootDocHandle, documentIdMapping);
       root = await this._echoHost.openSpaceRoot(spaceId, `automerge:${newRootDocId}`);
@@ -2159,7 +2160,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 294,
+      L: 296,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2169,7 +2170,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 299,
+      L: 301,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2178,7 +2179,7 @@ var DataSpaceManager = class extends Resource4 {
     const memberCredential = credentials[1];
     invariant5(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 305,
+      L: 307,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2192,7 +2193,7 @@ var DataSpaceManager = class extends Resource4 {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 310,
+      L: 312,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2205,7 +2206,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()) {
+          log6.warn("waiting for space root to be ready", {
+            spaceId: space.id
+          }, {
+            F: __dxlog_file9,
+            L: 325,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await space.databaseRoot.handle.whenReady();
+        }
+        const [_, properties] = findInlineObjectOfType(space.databaseRoot.doc(), TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       case SpaceDocVersion.LEGACY: {
@@ -2217,7 +2229,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceId: space.id
         }, {
           F: __dxlog_file9,
-          L: 330,
+          L: 336,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2252,14 +2264,14 @@ var DataSpaceManager = class extends Resource4 {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant5(automergeIndex, void 0, {
       F: __dxlog_file9,
-      L: 363,
+      L: 369,
       S: this,
       A: [
         "automergeIndex",
         ""
       ]
     });
-    const document = this._echoHost.automergeRepo.find(automergeIndex);
+    const document = await this._echoHost.automergeRepo.find(automergeIndex, FIND_PARAMS);
     await document.whenReady();
     return document;
   }
@@ -2269,13 +2281,13 @@ var DataSpaceManager = class extends Resource4 {
       opts
     }, {
       F: __dxlog_file9,
-      L: 372,
+      L: 378,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file9,
-      L: 373,
+      L: 379,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2284,7 +2296,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     invariant5(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file9,
-      L: 374,
+      L: 380,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -2308,7 +2320,7 @@ var DataSpaceManager = class extends Resource4 {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     invariant5(space, void 0, {
       F: __dxlog_file9,
-      L: 394,
+      L: 400,
       S: this,
       A: [
         "space",
@@ -2321,7 +2333,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_file9,
-      L: 413,
+      L: 419,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2331,7 +2343,7 @@ var DataSpaceManager = class extends Resource4 {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant5(getCredentialAssertion2(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 415,
+      L: 421,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2369,7 +2381,7 @@ var DataSpaceManager = class extends Resource4 {
     const space = this._spaces.get(spaceKey);
     invariant5(space, "Space not found.", {
       F: __dxlog_file9,
-      L: 452,
+      L: 458,
       S: this,
       A: [
         "space",
@@ -2394,7 +2406,7 @@ var DataSpaceManager = class extends Resource4 {
       metadata
     }, {
       F: __dxlog_file9,
-      L: 471,
+      L: 477,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2438,7 +2450,7 @@ var DataSpaceManager = class extends Resource4 {
             err
           }, {
             F: __dxlog_file9,
-            L: 513,
+            L: 519,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2448,7 +2460,7 @@ var DataSpaceManager = class extends Resource4 {
       onAuthFailure: () => {
         log6.warn("auth failure", void 0, {
           F: __dxlog_file9,
-          L: 518,
+          L: 524,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2481,7 +2493,7 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 545,
+            L: 551,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2492,7 +2504,7 @@ var DataSpaceManager = class extends Resource4 {
             open: this._lifecycleState === LifecycleState.OPEN
           }, {
             F: __dxlog_file9,
-            L: 548,
+            L: 554,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2511,7 +2523,7 @@ var DataSpaceManager = class extends Resource4 {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 556,
+            L: 562,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2532,7 +2544,7 @@ var DataSpaceManager = class extends Resource4 {
           spaceId: dataSpace.id
         }, {
           F: __dxlog_file9,
-          L: 570,
+          L: 576,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2562,7 +2574,7 @@ var DataSpaceManager = class extends Resource4 {
         space: space.key
       }, {
         F: __dxlog_file9,
-        L: 597,
+        L: 603,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2595,7 +2607,7 @@ var DataSpaceManager = class extends Resource4 {
       closedSessions
     }, {
       F: __dxlog_file9,
-      L: 623,
+      L: 629,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2610,7 +2622,7 @@ var DataSpaceManager = class extends Resource4 {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file9,
-          L: 637,
+          L: 643,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2755,7 +2767,7 @@ var extractSpaceArchive = async (archive) => {
     const documentId = entry2.fileName.replace(`${SpaceArchiveFileStructure2.documents}/`, "").replace(/\.bin$/, "");
     invariant6(!documentId.includes("/"), void 0, {
       F: __dxlog_file10,
-      L: 27,
+      L: 28,
       S: void 0,
       A: [
         "!documentId.includes('/')",
@@ -2769,7 +2781,7 @@ var extractSpaceArchive = async (archive) => {
     documents
   }, {
     F: __dxlog_file10,
-    L: 31,
+    L: 32,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -2890,7 +2902,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_file11,
-      L: 118,
+      L: 119,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2900,7 +2912,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant7(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file11,
-      L: 120,
+      L: 121,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2918,7 +2930,7 @@ var SpacesServiceImpl = class {
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file11,
-          L: 133,
+          L: 134,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3010,7 +3022,7 @@ var SpacesServiceImpl = class {
       } else {
         invariant7(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file11,
-          L: 231,
+          L: 232,
           S: this,
           A: [
             "!credential.id",
@@ -3019,7 +3031,7 @@ var SpacesServiceImpl = class {
         });
         invariant7(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file11,
-          L: 232,
+          L: 233,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -3029,7 +3041,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant7(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file11,
-          L: 234,
+          L: 235,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -3106,7 +3118,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_file11,
-      L: 288,
+      L: 289,
       S: this,
       A: [
         "extracted.metadata.echo?.currentRootUrl",
@@ -3126,7 +3138,7 @@ var SpacesServiceImpl = class {
     const assertion = getCredentialAssertion3(credential);
     invariant7(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file11,
-      L: 299,
+      L: 300,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3136,7 +3148,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     invariant7(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
       F: __dxlog_file11,
-      L: 301,
+      L: 302,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -4201,7 +4213,7 @@ var DataSpace = class {
   constructor(params) {
     this._ctx = new Context6(void 0, {
       F: __dxlog_file15,
-      L: 97
+      L: 100
     });
     this._cache = void 0;
     this._edgeFeedReplicator = void 0;
@@ -4254,7 +4266,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 173,
+      L: 176,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4313,7 +4325,7 @@ var DataSpace = class {
     }
     await this._inner.open(new Context6(void 0, {
       F: __dxlog_file15,
-      L: 247
+      L: 250
     }));
     await this._inner.startProtocol();
     await this._edgeFeedReplicator?.open();
@@ -4322,7 +4334,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 253,
+      L: 256,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4342,14 +4354,14 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 272,
+      L: 275,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new Context6(void 0, {
       F: __dxlog_file15,
-      L: 274
+      L: 277
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4382,7 +4394,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log12("data pipeline initialization cancelled", err, {
             F: __dxlog_file15,
-            L: 312,
+            L: 315,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4390,7 +4402,7 @@ var DataSpace = class {
         }
         log12.error("Error initializing data pipeline", err, {
           F: __dxlog_file15,
-          L: 316,
+          L: 319,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4399,7 +4411,7 @@ var DataSpace = class {
           state: SpaceState4[this._state]
         }, {
           F: __dxlog_file15,
-          L: 318,
+          L: 321,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4419,13 +4431,13 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 334,
+      L: 337,
       S: this,
       C: (f, a) => f(...a)
     });
     log12("initializing control pipeline", void 0, {
       F: __dxlog_file15,
-      L: 336,
+      L: 339,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4434,21 +4446,21 @@ var DataSpace = class {
     const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState4.SPACE_READY);
     log12("initializing automerge root", void 0, {
       F: __dxlog_file15,
-      L: 344,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
     this._automergeSpaceState.startProcessingRootDocs();
     log12("waiting for space to be ready", void 0, {
       F: __dxlog_file15,
-      L: 348,
+      L: 351,
       S: this,
       C: (f, a) => f(...a)
     });
     await ready;
     log12("space is ready", void 0, {
       F: __dxlog_file15,
-      L: 350,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4456,14 +4468,14 @@ var DataSpace = class {
   async *getAllDocuments() {
     invariant11(this._databaseRoot, "Space is not ready", {
       F: __dxlog_file15,
-      L: 354,
+      L: 357,
       S: this,
       A: [
         "this._databaseRoot",
         "'Space is not ready'"
       ]
     });
-    const doc = this._databaseRoot.docSync() ?? failedInvariant3();
+    const doc = this._databaseRoot.doc() ?? failedInvariant3();
     const root = save(doc);
     yield [
       this._databaseRoot.documentId,
@@ -4472,7 +4484,7 @@ var DataSpace = class {
     for (const documentUrl of this._databaseRoot.getAllLinkedDocuments()) {
       const data = await this._echoHost.exportDoc(Context6.default(void 0, {
         F: __dxlog_file15,
-        L: 360
+        L: 363
       }), documentUrl);
       yield [
         documentUrl.replace(/^automerge:/, ""),
@@ -4487,7 +4499,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 369,
+      L: 372,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4504,7 +4516,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     log12("writable feeds created", void 0, {
       F: __dxlog_file15,
-      L: 386,
+      L: 389,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4558,7 +4570,7 @@ var DataSpace = class {
           count: credentials.length
         }, {
           F: __dxlog_file15,
-          L: 444,
+          L: 447,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4569,14 +4581,14 @@ var DataSpace = class {
         });
         log12("credentials notarized", void 0, {
           F: __dxlog_file15,
-          L: 448,
+          L: 451,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         log12.error("error notarizing credentials for feed admission", err, {
           F: __dxlog_file15,
-          L: 450,
+          L: 453,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4591,16 +4603,17 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file15,
-      L: 460,
+      L: 463,
       S: this,
       C: (f, a) => f(...a)
     });
-    const handle = this._echoHost.automergeRepo.find(rootUrl);
+    let handle;
     queueMicrotask(async () => {
       try {
         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) {
@@ -4610,7 +4623,7 @@ var DataSpace = class {
             // Ensure only one root is processed at a time.
             _usingCtx.u(await this._epochProcessingMutex.acquire())
           );
-          const doc = handle.docSync() ?? failedInvariant3();
+          const doc = handle.doc() ?? failedInvariant3();
           if (!doc.access?.spaceKey) {
             handle.change((doc2) => {
               doc2.access = {
@@ -4643,7 +4656,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file15,
-          L: 503,
+          L: 510,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4733,7 +4746,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file15,
-      L: 585,
+      L: 592,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8334,7 +8347,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 invariant24 } from "@dxos/invariant";
 import { log as log25 } from "@dxos/log";
 import { ProfileArchiveEntryType } from "@dxos/protocols";
@@ -8356,7 +8369,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file29,
-      L: 30,
+      L: 31,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8374,7 +8387,7 @@ var exportProfileData = async ({ storage, level }) => {
       count: files.length
     }, {
       F: __dxlog_file29,
-      L: 41,
+      L: 42,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8382,7 +8395,7 @@ var exportProfileData = async ({ storage, level }) => {
   {
     log25.info("begin exporting kv pairs", void 0, {
       F: __dxlog_file29,
-      L: 45,
+      L: 46,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8403,7 +8416,7 @@ var exportProfileData = async ({ storage, level }) => {
       count
     }, {
       F: __dxlog_file29,
-      L: 56,
+      L: 57,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -8419,7 +8432,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         const directory = await storage.createDirectory();
         invariant24(typeof entry2.key === "string", "Invalid key type", {
           F: __dxlog_file29,
-          L: 79,
+          L: 80,
           S: void 0,
           A: [
             "typeof entry.key === 'string'",
@@ -8429,7 +8442,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         const file = await directory.getOrCreateFile(entry2.key);
         invariant24(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file29,
-          L: 81,
+          L: 82,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8443,7 +8456,7 @@ var importProfileData = async ({ storage, level }, archive) => {
       case ProfileArchiveEntryType.KEY_VALUE: {
         invariant24(entry2.key instanceof Uint8Array, "Invalid key type", {
           F: __dxlog_file29,
-          L: 87,
+          L: 88,
           S: void 0,
           A: [
             "entry.key instanceof Uint8Array",
@@ -8452,7 +8465,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         invariant24(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file29,
-          L: 88,
+          L: 89,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -8477,7 +8490,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
         F: __dxlog_file29,
-        L: 101,
+        L: 102,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -8485,7 +8498,7 @@ var importProfileData = async ({ storage, level }, archive) => {
   }
   log25.info("committing changes..", void 0, {
     F: __dxlog_file29,
-    L: 109,
+    L: 110,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -9369,4 +9382,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-QLUXYSIC.mjs.map
+//# sourceMappingURL=chunk-XNCWQTDB.mjs.map