@dxos/client-services 0.5.9-main.55e2125 → 0.5.9-main.5ad2d33

package/dist/lib/node/{chunk-QN3UVJ5U.cjs → chunk-E6HB26ZB.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_QN3UVJ5U_exports = {};
-__export(chunk_QN3UVJ5U_exports, {
+var chunk_E6HB26ZB_exports = {};
+__export(chunk_E6HB26ZB_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   ClientServicesProviderResource: () => ClientServicesProviderResource,
@@ -70,7 +70,7 @@ __export(chunk_QN3UVJ5U_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_QN3UVJ5U_exports);
+module.exports = __toCommonJS(chunk_E6HB26ZB_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -216,32 +216,28 @@ var import_util7 = require("@dxos/util");
 var import_async14 = require("@dxos/async");
 var import_context11 = require("@dxos/context");
 var import_credentials14 = require("@dxos/credentials");
-var import_async15 = require("@dxos/async");
-var import_automerge = require("@dxos/automerge/automerge");
-var import_context12 = require("@dxos/context");
 var import_echo_db = require("@dxos/echo-db");
-var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_protocol2 = require("@dxos/echo-protocol");
 var import_echo_schema = require("@dxos/echo-schema");
 var import_invariant13 = require("@dxos/invariant");
 var import_log13 = require("@dxos/log");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util8 = require("@dxos/util");
-var import_async16 = require("@dxos/async");
-var import_context13 = require("@dxos/context");
+var import_async15 = require("@dxos/async");
+var import_context12 = require("@dxos/context");
 var import_invariant14 = require("@dxos/invariant");
 var import_keys11 = require("@dxos/keys");
 var import_log14 = require("@dxos/log");
 var import_protocols10 = require("@dxos/protocols");
 var import_teleport3 = require("@dxos/teleport");
-var import_util9 = require("@dxos/util");
-var import_async17 = require("@dxos/async");
+var import_util8 = require("@dxos/util");
+var import_async16 = require("@dxos/async");
 var import_client_protocol5 = require("@dxos/client-protocol");
-var import_context14 = require("@dxos/context");
+var import_context13 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
 var import_echo_db2 = require("@dxos/echo-db");
+var import_echo_pipeline3 = require("@dxos/echo-pipeline");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
-var import_echo_pipeline5 = require("@dxos/echo-pipeline");
-var import_echo_protocol2 = require("@dxos/echo-protocol");
+var import_echo_protocol3 = require("@dxos/echo-protocol");
 var import_echo_schema2 = require("@dxos/echo-schema");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_invariant15 = require("@dxos/invariant");
@@ -252,12 +248,12 @@ var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials16 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_teleport_extension_gossip2 = require("@dxos/teleport-extension-gossip");
 var import_tracing6 = require("@dxos/tracing");
-var import_util10 = require("@dxos/util");
+var import_util9 = require("@dxos/util");
 var import_credentials17 = require("@dxos/credentials");
 var import_debug4 = require("@dxos/debug");
 var import_credentials18 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe4 = require("@dxos/timeframe");
-var import_async18 = require("@dxos/async");
+var import_async17 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_credentials19 = require("@dxos/credentials");
 var import_debug5 = require("@dxos/debug");
@@ -267,12 +263,12 @@ var import_log16 = require("@dxos/log");
 var import_protocols12 = require("@dxos/protocols");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing7 = require("@dxos/tracing");
-var import_async19 = require("@dxos/async");
-var import_context15 = require("@dxos/context");
+var import_async18 = require("@dxos/async");
+var import_context14 = require("@dxos/context");
 var import_credentials20 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
 var import_echo_db3 = require("@dxos/echo-db");
-var import_echo_pipeline6 = require("@dxos/echo-pipeline");
+var import_echo_pipeline5 = require("@dxos/echo-pipeline");
 var import_feed_store6 = require("@dxos/feed-store");
 var import_invariant17 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
@@ -282,7 +278,7 @@ var import_protocols13 = require("@dxos/protocols");
 var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing8 = require("@dxos/tracing");
-var import_util11 = require("@dxos/util");
+var import_util10 = require("@dxos/util");
 var import_invariant18 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log18 = require("@dxos/log");
@@ -291,7 +287,7 @@ var import_config = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
 var import_client_protocol6 = require("@dxos/client-protocol");
 var import_config2 = require("@dxos/protocols/proto/dxos/config");
-var import_util12 = require("@dxos/util");
+var import_util11 = require("@dxos/util");
 var import_node_path = __toESM(require("node:path"));
 var import_keys14 = require("@dxos/keys");
 var import_kv_store = require("@dxos/kv-store");
@@ -299,10 +295,10 @@ var import_automerge_repo = require("@dxos/automerge/automerge-repo");
 var import_invariant19 = require("@dxos/invariant");
 var import_log19 = require("@dxos/log");
 var import_protocols15 = require("@dxos/protocols");
-var import_util13 = require("@dxos/util");
-var import_async20 = require("@dxos/async");
+var import_util12 = require("@dxos/util");
+var import_async19 = require("@dxos/async");
 var import_client_protocol7 = require("@dxos/client-protocol");
-var import_context16 = require("@dxos/context");
+var import_context15 = require("@dxos/context");
 var import_invariant20 = require("@dxos/invariant");
 var import_keys15 = require("@dxos/keys");
 var import_log20 = require("@dxos/log");
@@ -312,30 +308,30 @@ var import_protocols16 = require("@dxos/protocols");
 var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing9 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
-var import_async21 = require("@dxos/async");
+var import_async20 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
 var import_invariant21 = require("@dxos/invariant");
 var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
 var import_config3 = require("@dxos/config");
 var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing10 = require("@dxos/tracing");
-var import_util14 = require("@dxos/util");
+var import_util13 = require("@dxos/util");
 var import_keys16 = require("@dxos/keys");
-var import_util15 = require("@dxos/util");
-var import_async22 = require("@dxos/async");
+var import_util14 = require("@dxos/util");
+var import_async21 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_keys17 = require("@dxos/keys");
-var import_util16 = require("@dxos/util");
-var import_async23 = require("@dxos/async");
+var import_util15 = require("@dxos/util");
+var import_async22 = require("@dxos/async");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
 var import_keys18 = require("@dxos/keys");
 var import_log21 = require("@dxos/log");
 var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util17 = require("@dxos/util");
+var import_util16 = require("@dxos/util");
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
 var import_codec_protobuf16 = require("@dxos/codec-protobuf");
 var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util18 = require("@dxos/util");
+var import_util17 = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
     const subscriptions = new import_async.EventSubscriptions();
@@ -650,7 +646,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.5.9-main.55e2125";
+var DXOS_VERSION = "0.5.9-main.5ad2d33";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1804,7 +1800,7 @@ var IdentityServiceImpl = class extends import_context4.Resource {
             duplicate: space.id
           }, {
             F: __dxlog_file7,
-            L: 127,
+            L: 129,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1815,6 +1811,13 @@ var IdentityServiceImpl = class extends import_context4.Resource {
         recodedDefaultSpace = true;
         recordedDefaultSpaceTrigger.wake();
       }
+    }, (err) => {
+      import_log5.log.catch(err, void 0, {
+        F: __dxlog_file7,
+        L: 140,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     });
     await Promise.race([
       allProcessed,
@@ -3819,11 +3822,12 @@ var AutomergeSpaceState = class extends import_context11.Resource {
   }
 };
 var __dxlog_file15 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
+var LOAD_DOC_TIMEOUT = 1e4;
 var runEpochMigration = async (ctx, context) => {
   switch (context.migration) {
     case import_services13.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
-      const document = context.repo.create();
-      await context.repo.flush();
+      const document = context.echoHost.createDoc();
+      await context.echoHost.flush();
       return {
         newRoot: document.url
       };
@@ -3832,10 +3836,11 @@ var runEpochMigration = async (ctx, context) => {
       if (!context.currentRoot) {
         throw new Error("Space does not have an automerge root");
       }
-      const rootHandle = context.repo.find(context.currentRoot);
-      await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
-      const newRoot = context.repo.create(rootHandle.docSync());
-      await context.repo.flush();
+      const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
+      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
+      await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
@@ -3843,66 +3848,76 @@ var runEpochMigration = async (ctx, context) => {
     case import_services13.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
       import_log13.log.info("Fragmenting", void 0, {
         F: __dxlog_file15,
-        L: 63,
+        L: 64,
         S: void 0,
         C: (f, a) => f(...a)
       });
       const currentRootUrl = context.currentRoot;
-      const rootHandle = context.repo.find(currentRootUrl);
-      await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
       const objects = Object.entries(rootHandle.docSync().objects);
       const properties = (0, import_echo_db.findInlineObjectOfType)(rootHandle.docSync(), import_echo_schema.TYPE_PROPERTIES);
       const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
       (0, import_invariant13.invariant)(properties, "Properties not found", {
         F: __dxlog_file15,
-        L: 73,
+        L: 75,
         S: void 0,
         A: [
           "properties",
           "'Properties not found'"
         ]
       });
-      const newSpaceDoc = {
+      const newRoot = context.echoHost.createDoc({
         ...rootHandle.docSync(),
         objects: Object.fromEntries([
           properties
         ])
-      };
-      const newRoot = context.repo.create(newSpaceDoc);
+      });
       (0, import_invariant13.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
         F: __dxlog_file15,
-        L: 78,
+        L: 82,
         S: void 0,
         A: [
           "typeof newRoot.url === 'string' && newRoot.url.length > 0",
           ""
         ]
       });
-      const docLoader = new import_echo_pipeline3.AutomergeDocumentLoaderImpl(context.spaceId, context.repo, context.spaceKey);
-      await docLoader.loadSpaceRootDocHandle(ctx, {
-        rootUrl: newRoot.url
-      });
-      otherObjects.forEach(([key, value]) => {
-        const handle = docLoader.createDocumentForObject(key);
-        handle.change((doc) => {
-          (0, import_util8.assignDeep)(doc, [
-            "objects",
-            key
-          ], value);
+      const newLinks = [];
+      for (const [id, objData] of otherObjects) {
+        const handle = context.echoHost.createDoc({
+          version: import_echo_protocol2.SpaceDocVersion.CURRENT,
+          access: {
+            spaceKey: context.spaceKey.toHex()
+          },
+          objects: {
+            [id]: objData
+          }
         });
+        newLinks.push([
+          id,
+          handle.url
+        ]);
+      }
+      newRoot.change((doc) => {
+        doc.links ??= {};
+        for (const [id, url] of newLinks) {
+          doc.links[id] = url;
+        }
       });
-      await context.repo.flush();
+      await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
     }
     case import_services13.CreateEpochRequest.Migration.MIGRATE_REFERENCES_TO_DXN: {
       const currentRootUrl = context.currentRoot;
-      const rootHandle = context.repo.find(currentRootUrl);
-      await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(rootHandle.whenReady(), 1e4));
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
       (0, import_invariant13.invariant)(rootHandle.docSync(), "Root doc not found", {
         F: __dxlog_file15,
-        L: 100,
+        L: 115,
         S: void 0,
         A: [
           "rootHandle.docSync()",
@@ -3912,20 +3927,23 @@ var runEpochMigration = async (ctx, context) => {
       const newRootContent = await (0, import_echo_db.convertLegacySpaceRootDoc)(structuredClone(rootHandle.docSync()));
       for (const [id, url] of Object.entries(newRootContent.links ?? {})) {
         try {
-          const handle = context.repo.find(url);
-          await (0, import_context12.cancelWithContext)(ctx, (0, import_async15.asyncTimeout)(handle.whenReady(), 1e4));
-          (0, import_invariant13.invariant)(handle.docSync(), "Doc not found", {
+          const handle = await context.echoHost.loadDoc(ctx, url, {
+            timeout: LOAD_DOC_TIMEOUT
+          });
+          (0, import_invariant13.invariant)(handle.docSync(), void 0, {
             F: __dxlog_file15,
-            L: 108,
+            L: 122,
             S: void 0,
             A: [
               "handle.docSync()",
-              "'Doc not found'"
+              ""
             ]
           });
           const newDoc = await (0, import_echo_db.convertLegacyReferences)(structuredClone(handle.docSync()));
           const migratedDoc = (0, import_echo_db.migrateDocument)(handle.docSync(), newDoc);
-          const newHandle = context.repo.import(import_automerge.next.save(migratedDoc));
+          const newHandle = context.echoHost.createDoc(migratedDoc, {
+            preserveHistory: true
+          });
           newRootContent.links[id] = newHandle.url;
         } catch (err) {
           import_log13.log.warn("Failed to migrate reference", {
@@ -3934,7 +3952,7 @@ var runEpochMigration = async (ctx, context) => {
             error: err
           }, {
             F: __dxlog_file15,
-            L: 114,
+            L: 128,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -3942,8 +3960,10 @@ var runEpochMigration = async (ctx, context) => {
         }
       }
       const migratedRoot = (0, import_echo_db.migrateDocument)(rootHandle.docSync(), newRootContent);
-      const newRoot = context.repo.import(import_automerge.next.save(migratedRoot));
-      await context.repo.flush();
+      const newRoot = context.echoHost.createDoc(migratedRoot, {
+        preserveHistory: true
+      });
+      await context.echoHost.flush();
       return {
         newRoot: newRoot.url
       };
@@ -3951,14 +3971,14 @@ var runEpochMigration = async (ctx, context) => {
     case import_services13.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
       (0, import_invariant13.invariant)(context.newAutomergeRoot, void 0, {
         F: __dxlog_file15,
-        L: 129,
+        L: 143,
         S: void 0,
         A: [
           "context.newAutomergeRoot",
           ""
         ]
       });
-      await context.repo.flush();
+      await context.echoHost.flush();
       return {
         newRoot: context.newAutomergeRoot
       };
@@ -3973,14 +3993,14 @@ var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
 var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
-    this._ctx = new import_context13.Context(void 0, {
+    this._ctx = new import_context12.Context(void 0, {
       F: __dxlog_file16,
       L: 62
     });
-    this._extensionOpened = new import_async16.Event();
+    this._extensionOpened = new import_async15.Event();
     this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new import_util9.ComplexSet(import_keys11.PublicKey.hash);
-    this._processCredentialsTriggers = new import_util9.ComplexMap(import_keys11.PublicKey.hash);
+    this._processedCredentials = new import_util8.ComplexSet(import_keys11.PublicKey.hash);
+    this._processCredentialsTriggers = new import_util8.ComplexMap(import_keys11.PublicKey.hash);
   }
   get hasWriter() {
     return !!this._writer;
@@ -4011,7 +4031,7 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new import_async16.Trigger();
+    const errors = new import_async15.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
         import_log14.log.warn("Notarization error", {
@@ -4028,7 +4048,7 @@ var NotarizationPlugin = class {
     });
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      (0, import_async16.scheduleTask)(ctx, () => {
+      (0, import_async15.scheduleTask)(ctx, () => {
         import_log14.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
@@ -4039,12 +4059,12 @@ var NotarizationPlugin = class {
           C: (f, a) => f(...a)
         });
         void ctx.dispose();
-        errors.throw(new import_async16.TimeoutError(timeout, "Notarization timed out"));
+        errors.throw(new import_async15.TimeoutError(timeout, "Notarization timed out"));
       }, timeout);
     }
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
     const peersTried = /* @__PURE__ */ new Set();
-    const notarizeTask = new import_async16.DeferredTask(ctx, async () => {
+    const notarizeTask = new import_async15.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
           return;
@@ -4062,7 +4082,7 @@ var NotarizationPlugin = class {
             C: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async16.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
+          (0, import_async15.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
@@ -4084,7 +4104,7 @@ var NotarizationPlugin = class {
           S: this,
           C: (f, a) => f(...a)
         });
-        await (0, import_async16.sleep)(successDelay);
+        await (0, import_async15.sleep)(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           import_log14.log.info("error notarizing (recoverable)", err, {
@@ -4101,7 +4121,7 @@ var NotarizationPlugin = class {
     this._extensionOpened.on(ctx, () => notarizeTask.schedule());
     try {
       await Promise.race([
-        (0, import_context13.rejectOnDispose)(ctx),
+        (0, import_context12.rejectOnDispose)(ctx),
         allNotarized,
         errors.wait()
       ]);
@@ -4142,7 +4162,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util9.entry)(this._processCredentialsTriggers, id).orInsert(new import_async16.Trigger()).value.wait();
+    await (0, import_util8.entry)(this._processCredentialsTriggers, id).orInsert(new import_async15.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -4641,7 +4661,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file17,
-          L: 431,
+          L: 433,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4669,7 +4689,7 @@ var DataSpace = class {
       return null;
     }
     const { newRoot } = await runEpochMigration(ctx, {
-      repo: this._echoHost.automergeRepo,
+      echoHost: this._echoHost,
       spaceId: this.id,
       spaceKey: this.key,
       migration: options.migration,
@@ -4727,7 +4747,7 @@ var DataSpace = class {
       state: import_services12.SpaceState[this._state]
     }, {
       F: __dxlog_file17,
-      L: 512,
+      L: 514,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4870,12 +4890,12 @@ var DataSpaceManager = class {
     this._echoHost = _echoHost;
     this._invitationsManager = _invitationsManager;
     this._params = _params;
-    this._ctx = new import_context14.Context(void 0, {
+    this._ctx = new import_context13.Context(void 0, {
       F: __dxlog_file18,
       L: 104
     });
-    this.updated = new import_async17.Event();
-    this._spaces = new import_util10.ComplexMap(import_keys12.PublicKey.hash);
+    this.updated = new import_async16.Event();
+    this._spaces = new import_util9.ComplexMap(import_keys12.PublicKey.hash);
     this._isOpen = false;
     this._instanceId = import_keys12.PublicKey.random().toHex();
     import_tracing6.trace.diagnostic({
@@ -4928,7 +4948,7 @@ var DataSpaceManager = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    await (0, import_util10.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
+    await (0, import_util9.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
         (0, import_log15.log)("load space", {
           spaceMetadata
@@ -5032,13 +5052,13 @@ var DataSpaceManager = class {
       return false;
     }
     switch (space.databaseRoot.getVersion()) {
-      case import_echo_protocol2.SpaceDocVersion.CURRENT: {
+      case import_echo_protocol3.SpaceDocVersion.CURRENT: {
         const [_, properties] = (0, import_echo_db2.findInlineObjectOfType)(space.databaseRoot.docSync(), import_echo_schema2.TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
-      case import_echo_protocol2.SpaceDocVersion.LEGACY: {
+      case import_echo_protocol3.SpaceDocVersion.LEGACY: {
         const convertedDoc = await (0, import_echo_db2.convertLegacyReferences)(space.databaseRoot.docSync());
-        const [_, properties] = (0, import_echo_db2.findInlineObjectOfType)(convertedDoc, import_echo_protocol2.LEGACY_TYPE_PROPERTIES) ?? [];
+        const [_, properties] = (0, import_echo_db2.findInlineObjectOfType)(convertedDoc, import_echo_protocol3.LEGACY_TYPE_PROPERTIES) ?? [];
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       default:
@@ -5059,7 +5079,7 @@ var DataSpaceManager = class {
     const document = await this._getSpaceRootDocument(space);
     const properties = {
       system: {
-        type: (0, import_echo_protocol2.encodeReference)((0, import_echo_schema2.getTypeReference)(import_client_protocol5.PropertiesType))
+        type: (0, import_echo_protocol3.encodeReference)((0, import_echo_schema2.getTypeReference)(import_client_protocol5.PropertiesType))
       },
       data: {
         [DEFAULT_SPACE_KEY]: this._signingContext.identityKey.toHex()
@@ -5070,7 +5090,7 @@ var DataSpaceManager = class {
     };
     const propertiesId = (0, import_echo_schema2.generateEchoId)();
     document.change((doc) => {
-      (0, import_util10.assignDeep)(doc, [
+      (0, import_util9.assignDeep)(doc, [
         "objects",
         propertiesId
       ], properties);
@@ -5177,7 +5197,7 @@ var DataSpaceManager = class {
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await (0, import_context14.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
+    await (0, import_context13.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
       return !!space && space.state === import_services14.SpaceState.READY;
     }));
@@ -5224,10 +5244,10 @@ var DataSpaceManager = class {
       swarmIdentity: {
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
-        credentialAuthenticator: (0, import_util10.deferFunction)(() => dataSpace.authVerifier.verifier)
+        credentialAuthenticator: (0, import_util9.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
       onAuthorizedConnection: (session) => {
-        session.addExtension("dxos.mesh.teleport.admission-discovery", new import_echo_pipeline5.CredentialServerExtension(space));
+        session.addExtension("dxos.mesh.teleport.admission-discovery", new import_echo_pipeline4.CredentialServerExtension(space));
         session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
           remotePeerId: session.remotePeerId
         }));
@@ -5329,7 +5349,7 @@ var DataSpaceManager = class {
       const peers = presence.getPeersByIdentityKey(member.key);
       const sessions = peers.map((p) => p.peerId && spaceProtocol.sessions.get(p.peerId));
       const sessionsToClose = sessions.filter((s) => {
-        return (s && member.role === import_credentials16.SpaceMember.Role.REMOVED !== (s.authStatus === import_echo_pipeline4.AuthStatus.FAILURE)) ?? false;
+        return (s && member.role === import_credentials16.SpaceMember.Role.REMOVED !== (s.authStatus === import_echo_pipeline3.AuthStatus.FAILURE)) ?? false;
       });
       sessionsToClose.forEach((session) => {
         void session.close().catch(import_log15.log.error);
@@ -5402,19 +5422,19 @@ var DataSpaceManager = class {
   }
 };
 _ts_decorate5([
-  import_async17.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "open", null);
 _ts_decorate5([
-  import_async17.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "close", null);
 _ts_decorate5([
-  import_async17.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 _ts_decorate5([
-  import_async17.synchronized
+  import_async16.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = _ts_decorate5([
-  (0, import_async17.trackLeaks)("open", "close")
+  (0, import_async16.trackLeaks)("open", "close")
 ], DataSpaceManager);
 var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
@@ -5482,7 +5502,7 @@ var SpacesServiceImpl = class {
   }
   querySpaces() {
     return new import_codec_protobuf11.Stream(({ next, ctx }) => {
-      const scheduler = new import_async18.UpdateScheduler(ctx, async () => {
+      const scheduler = new import_async17.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
         (0, import_log16.log)("update", {
@@ -5500,9 +5520,9 @@ var SpacesServiceImpl = class {
       }, {
         maxFrequency: process.env.NODE_ENV === "test" ? void 0 : 2
       });
-      (0, import_async18.scheduleTask)(ctx, async () => {
+      (0, import_async17.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async18.EventSubscriptions();
+        const subscriptions = new import_async17.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
@@ -5542,7 +5562,7 @@ var SpacesServiceImpl = class {
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      (0, import_async18.scheduleTask)(ctx, async () => {
+      (0, import_async17.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
@@ -5561,7 +5581,7 @@ var SpacesServiceImpl = class {
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      (0, import_async18.scheduleTask)(ctx, async () => {
+      (0, import_async17.scheduleTask)(ctx, async () => {
         await space.spaceState.addCredentialProcessor(processor);
         if (noTail) {
           close();
@@ -5700,7 +5720,8 @@ var SpacesServiceImpl = class {
         startDataTimeframe: void 0,
         currentDataTimeframe: void 0,
         targetDataTimeframe: void 0,
-        totalDataTimeframe: void 0
+        totalDataTimeframe: void 0,
+        spaceRootUrl: space.databaseRoot?.url
       },
       members: Array.from(space.inner.spaceState.members.values()).map((member) => {
         const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
@@ -5753,7 +5774,7 @@ function _ts_decorate6(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class extends import_context15.Resource {
+var ServiceContext = class extends import_context14.Resource {
   constructor(storage, level, networkManager, signalManager, _runtimeParams) {
     super();
     this.storage = storage;
@@ -5761,11 +5782,11 @@ var ServiceContext = class extends import_context15.Resource {
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._runtimeParams = _runtimeParams;
-    this.initialized = new import_async19.Trigger();
+    this.initialized = new import_async18.Trigger();
     this._handlerFactories = /* @__PURE__ */ new Map();
     this._instanceId = import_keys13.PublicKey.random().toHex();
-    this.metadataStore = new import_echo_pipeline6.MetadataStore(storage.createDirectory("metadata"));
-    this.snapshotStore = new import_echo_pipeline6.SnapshotStore(storage.createDirectory("snapshots"));
+    this.metadataStore = new import_echo_pipeline5.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_pipeline5.SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
     this.feedStore = new import_feed_store6.FeedStore({
@@ -5773,12 +5794,12 @@ var ServiceContext = class extends import_context15.Resource {
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline6.valueEncoding,
+          valueEncoding: import_echo_pipeline5.valueEncoding,
           stats: true
         }
       })
     });
-    this.spaceManager = new import_echo_pipeline6.SpaceManager({
+    this.spaceManager = new import_echo_pipeline5.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       blobStore: this.blobStore,
@@ -5869,7 +5890,7 @@ var ServiceContext = class extends import_context15.Resource {
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize(new import_context15.Context(void 0, {
+    await this._initialize(new import_context14.Context(void 0, {
       F: __dxlog_file20,
       L: 187
     }));
@@ -5898,7 +5919,7 @@ var ServiceContext = class extends import_context15.Resource {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new import_context15.Context(void 0, {
+    await this._initialize(new import_context14.Context(void 0, {
       F: __dxlog_file20,
       L: 209
     }));
@@ -6011,7 +6032,7 @@ _ts_decorate6([
   import_tracing8.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate6([
-  (0, import_util11.safeInstanceof)("dxos.client-services.ServiceContext"),
+  (0, import_util10.safeInstanceof)("dxos.client-services.ServiceContext"),
   import_tracing8.trace.resource()
 ], ServiceContext);
 var ServiceRegistry = class {
@@ -6091,7 +6112,7 @@ _ts_decorate7([
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => import_lock_file.LockFile.isLocked(lockPath);
 var getRootPath = (config) => {
-  const { dataRoot = (0, import_util12.isNode)() ? import_client_protocol6.DX_DATA : "dxos/storage" } = config ?? {};
+  const { dataRoot = (0, import_util11.isNode)() ? import_client_protocol6.DX_DATA : "dxos/storage" } = config ?? {};
   return `${dataRoot}/`;
 };
 var isPersistent = (config) => {
@@ -6219,14 +6240,15 @@ var exportProfileData = async ({ storage, level }) => {
   return archive;
 };
 var importProfileData = async ({ storage, level }, archive) => {
-  const batch = level.batch();
+  let batch = level.batch();
+  let count = 0;
   for (const entry2 of archive.storage) {
     switch (entry2.type) {
       case import_protocols15.ProfileArchiveEntryType.FILE: {
         const directory = await storage.createDirectory();
         (0, import_invariant19.invariant)(typeof entry2.key === "string", "Invalid key type", {
           F: __dxlog_file22,
-          L: 78,
+          L: 79,
           S: void 0,
           A: [
             "typeof entry.key === 'string'",
@@ -6236,21 +6258,21 @@ var importProfileData = async ({ storage, level }, archive) => {
         const file = await directory.getOrCreateFile(entry2.key);
         (0, import_invariant19.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file22,
-          L: 80,
+          L: 81,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
             "'Invalid value type'"
           ]
         });
-        await file.write(0, (0, import_util13.arrayToBuffer)(entry2.value));
+        await file.write(0, (0, import_util12.arrayToBuffer)(entry2.value));
         await file.close();
         break;
       }
       case import_protocols15.ProfileArchiveEntryType.KEY_VALUE: {
         (0, import_invariant19.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
           F: __dxlog_file22,
-          L: 86,
+          L: 87,
           S: void 0,
           A: [
             "entry.key instanceof Uint8Array",
@@ -6259,7 +6281,7 @@ var importProfileData = async ({ storage, level }, archive) => {
         });
         (0, import_invariant19.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
           F: __dxlog_file22,
-          L: 87,
+          L: 88,
           S: void 0,
           A: [
             "entry.value instanceof Uint8Array",
@@ -6275,7 +6297,27 @@ var importProfileData = async ({ storage, level }, archive) => {
       default:
         throw new Error(`Invalid entry type: ${entry2.type}`);
     }
+    if (++count % 1e3 === 0) {
+      await batch.write();
+      batch = level.batch();
+      import_log19.log.info("importing", {
+        count,
+        total: archive.storage.length,
+        progress: `${(count / archive.storage.length * 100).toFixed()}%`
+      }, {
+        F: __dxlog_file22,
+        L: 101,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+    }
   }
+  import_log19.log.info("committing changes..", void 0, {
+    F: __dxlog_file22,
+    L: 109,
+    S: void 0,
+    C: (f, a) => f(...a)
+  });
   await batch.write();
 };
 var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
@@ -6337,7 +6379,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async21.EventSubscriptions();
+      const subscriptions = new import_async20.EventSubscriptions();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -6377,7 +6419,7 @@ var DiagnosticsCollector = class {
       client: clientDiagnostics,
       broadcast: await this.broadcastSender.broadcastDiagnosticsRequest()
     };
-    return JSON.parse(JSON.stringify(diagnostics, (0, import_util14.jsonKeyReplacer)(options)));
+    return JSON.parse(JSON.stringify(diagnostics, (0, import_util13.jsonKeyReplacer)(options)));
   }
 };
 var findSystemServiceProvider = () => {
@@ -6387,7 +6429,7 @@ var findSystemServiceProvider = () => {
 };
 var findConfigs = () => {
   const configs = import_tracing10.TRACE_PROCESSOR.findResourcesByAnnotation(import_config3.ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(import_util14.nonNullable);
+  return configs.map((r) => r.instance.deref()).filter(import_util13.nonNullable);
 };
 var ContactsServiceImpl = class {
   constructor(_identityManager, _spaceManager, _dataSpaceManagerProvider) {
@@ -6428,7 +6470,7 @@ var ContactsServiceImpl = class {
         });
       }
       return acc;
-    }, new import_util16.ComplexMap(import_keys17.PublicKey.hash));
+    }, new import_util15.ComplexMap(import_keys17.PublicKey.hash));
     return {
       contacts: [
         ...contacts.values()
@@ -6436,16 +6478,16 @@ var ContactsServiceImpl = class {
     };
   }
   queryContacts() {
-    const subscribedSpaceKeySet = new import_util16.ComplexSet(import_keys17.PublicKey.hash);
+    const subscribedSpaceKeySet = new import_util15.ComplexSet(import_keys17.PublicKey.hash);
     return new import_codec_protobuf13.Stream(({ next, ctx }) => {
-      const pushUpdateTask = new import_async22.UpdateScheduler(ctx, async () => {
+      const pushUpdateTask = new import_async21.UpdateScheduler(ctx, async () => {
         const contacts = await this.getContacts();
         next(contacts);
       }, {
         maxFrequency: 2
       });
-      (0, import_async22.scheduleTask)(ctx, async () => {
-        const subscriptions = new import_async22.EventSubscriptions();
+      (0, import_async21.scheduleTask)(ctx, async () => {
+        const subscriptions = new import_async21.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeToSpaceAndUpdate = () => {
           const oldSetSize = subscribedSpaceKeySet.size;
@@ -6468,7 +6510,7 @@ var ContactsServiceImpl = class {
 };
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async23.Event();
+    this._logs = new import_async22.Event();
     this._started = Date.now();
     this._sessionId = import_keys18.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
@@ -6484,15 +6526,15 @@ var LoggingServiceImpl = class {
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
-      import_util17.tracer.clear();
+      import_util16.tracer.clear();
     }
     if (record === true) {
-      import_util17.tracer.start();
+      import_util16.tracer.start();
     } else if (record === false) {
-      import_util17.tracer.stop();
+      import_util16.tracer.stop();
     }
     return {
-      recording: import_util17.tracer.recording
+      recording: import_util16.tracer.recording
     };
   }
   /**
@@ -6500,10 +6542,10 @@ var LoggingServiceImpl = class {
   */
   queryMetrics({ interval = 5e3 }) {
     const getNumericalValues = (key) => {
-      const events = import_util17.tracer.get(key) ?? [];
+      const events = import_util16.tracer.get(key) ?? [];
       return {
         key,
-        stats: (0, import_util17.numericalValues)(events, "duration")
+        stats: (0, import_util16.numericalValues)(events, "duration")
       };
     };
     return new import_codec_protobuf14.Stream(({ next }) => {
@@ -6541,7 +6583,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util17.jsonify)((0, import_log21.getContextFromEntry)(entry2)),
+          context: (0, import_util16.jsonify)((0, import_log21.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -6550,7 +6592,7 @@ var LoggingServiceImpl = class {
             scope: {
               hostSessionId: this._sessionId,
               uptimeSeconds: (Date.now() - this._started) / 1e3,
-              name: (0, import_util17.getDebugName)(entry2.meta?.S)
+              name: (0, import_util16.getDebugName)(entry2.meta?.S)
             }
           }
         };
@@ -6631,7 +6673,7 @@ var SystemServiceImpl = class {
     const diagnostics = await this._getDiagnostics();
     return {
       timestamp: /* @__PURE__ */ new Date(),
-      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util18.jsonKeyReplacer)({
+      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util17.jsonKeyReplacer)({
         truncate: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
         humanize: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
@@ -6688,7 +6730,7 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = import_tracing9.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async20.Event();
+    this._statusUpdate = new import_async19.Event();
     this._opening = false;
     this._open = false;
     this._storage = storage;
@@ -6707,7 +6749,7 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new import_context16.Context(void 0, {
+            void this.open(new import_context15.Context(void 0, {
               F: __dxlog_file24,
               L: 121
             }));
@@ -7030,11 +7072,11 @@ _ts_decorate8([
   import_tracing9.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate8([
-  import_async20.synchronized,
+  import_async19.synchronized,
   import_tracing9.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate8([
-  import_async20.synchronized,
+  import_async19.synchronized,
   import_tracing9.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate8([
@@ -7084,4 +7126,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-QN3UVJ5U.cjs.map
+//# sourceMappingURL=chunk-E6HB26ZB.cjs.map