@dxos/client-services 0.8.4-main.8342792842 → 0.8.4-main.8360d9e660

package/dist/lib/browser/{chunk-JUKRMLXU.mjs → chunk-FRMIC6UB.mjs}

@@ -403,7 +403,7 @@ import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // src/version.ts
-var DXOS_VERSION = "0.8.4-main.8342792842";
+var DXOS_VERSION = "0.8.4-main.8360d9e660";
 
 // src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -7667,7 +7667,7 @@ import { failUndefined as failUndefined2, warnAfterTimeout as warnAfterTimeout2
 import { EchoEdgeReplicator, EchoHost, MeshEchoReplicator, MetadataStore, SpaceManager, valueEncoding } from "@dxos/echo-pipeline";
 import { createChainEdgeIdentity, createEphemeralEdgeIdentity } from "@dxos/edge-client";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
-import { invariant as invariant22 } from "@dxos/invariant";
+import { invariant as invariant23 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
 import { PublicKey as PublicKey15 } from "@dxos/keys";
 import { log as log23 } from "@dxos/log";
@@ -7907,22 +7907,28 @@ import { Resource as Resource8 } from "@dxos/context";
 import { MessageSchema } from "@dxos/edge-client";
 import { RuntimeProvider } from "@dxos/effect";
 import { SyncClient } from "@dxos/feed";
+import { invariant as invariant22 } from "@dxos/invariant";
+import { SpaceId as SpaceId4 } from "@dxos/keys";
 import { FeedProtocol } from "@dxos/protocols";
 import { EdgeService as EdgeService2 } from "@dxos/protocols";
 import { createBuf } from "@dxos/protocols/buf";
 import { bufferToArray as bufferToArray2 } from "@dxos/util";
+var __dxlog_file27 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/feed-syncer.ts";
 var encoder = new Encoder({
   tagUint8Array: false,
   useRecords: false
 });
 var DEFAULT_MESSAGE_BLOCKS_LIMIT = 50;
 var DEFAULT_SYNC_CONCURRENCY = 5;
-var DEFAULT_POLLING_INTERVAL = 1e4;
+var DEFAULT_POLLING_INTERVAL = 5e3;
+var DEFAULT_POLL_REQUEST_THROTTLE_MS = 250;
+var MAX_BLOCKING_SYNC_ITERATIONS = 100;
 var FeedSyncer = class extends Resource8 {
-  #syncNamespace;
+  #syncNamespaces;
   #messageBlocksLimit;
   #syncConcurrency;
   #pollingInterval;
+  #pollRequestThrottleMs;
   #runtime;
   #feedStore;
   #edgeClient;
@@ -7931,6 +7937,8 @@ var FeedSyncer = class extends Resource8 {
   #spacesToPoll = /* @__PURE__ */ new Set();
   /** Last time full poll was completed. */
   #lastFullPoll = null;
+  #throttledPollScheduled = false;
+  #lastRequestedPollAt = null;
   constructor(options) {
     super();
     this.#runtime = options.runtime;
@@ -7942,10 +7950,11 @@ var FeedSyncer = class extends Resource8 {
       sendMessage: this.#sendMessage.bind(this)
     });
     this.#getSpaceIds = options.getSpaceIds;
-    this.#syncNamespace = options.syncNamespace;
+    this.#syncNamespaces = options.syncNamespaces;
     this.#messageBlocksLimit = options.messageBlocksLimit ?? DEFAULT_MESSAGE_BLOCKS_LIMIT;
     this.#syncConcurrency = options.syncConcurrency ?? DEFAULT_SYNC_CONCURRENCY;
     this.#pollingInterval = options.pollingInterval ?? DEFAULT_POLLING_INTERVAL;
+    this.#pollRequestThrottleMs = options.pollRequestThrottleMs ?? DEFAULT_POLL_REQUEST_THROTTLE_MS;
   }
   async _open() {
     this._ctx.onDispose(this.#edgeClient.onMessage((msg) => {
@@ -7961,7 +7970,7 @@ var FeedSyncer = class extends Resource8 {
           try: () => cborXdecode(msg.payload.value),
           catch: (error) => new Error(`Failed to decode feed sync message: ${error}`)
         });
-        const payload = yield* Schema.decodeUnknown(FeedProtocol.ProtocolMessage)(decoded);
+        const payload = yield* Schema.validate(FeedProtocol.ProtocolMessage)(decoded);
         yield* this.#syncClient.handleMessage(payload);
       });
       void RuntimeProvider.runPromise(this.#runtime)(handleMessageEffect);
@@ -7977,11 +7986,82 @@ var FeedSyncer = class extends Resource8 {
     await this.#pollTask.open();
     await this.#pushTask.open();
     this.#resetSpacesToPoll();
+    this.#pollTask.schedule();
   }
   async _close() {
     await this.#pollTask.close();
     await this.#pushTask.close();
   }
+  /**
+  * Schedules a best-effort pull without blocking the caller.
+  */
+  schedulePoll() {
+    this.#resetSpacesToPoll();
+    if (this.#throttledPollScheduled) {
+      return;
+    }
+    const now = Date.now();
+    const delay = this.#lastRequestedPollAt == null ? 0 : Math.max(this.#pollRequestThrottleMs - (now - this.#lastRequestedPollAt), 0);
+    this.#throttledPollScheduled = true;
+    scheduleTask9(this._ctx, () => {
+      this.#throttledPollScheduled = false;
+      this.#lastRequestedPollAt = Date.now();
+      this.#pollTask.schedule();
+    }, delay);
+  }
+  /**
+  * Performs queue sync and blocks until there are no pending sync batches.
+  */
+  async syncBlocking({ spaceId, subspaceTag, shouldPush = true, shouldPull = true }) {
+    invariant22(SpaceId4.isValid(spaceId), void 0, {
+      F: __dxlog_file27,
+      L: 190,
+      S: this,
+      A: [
+        "SpaceId.isValid(spaceId)",
+        ""
+      ]
+    });
+    invariant22(FeedProtocol.isWellKnownNamespace(subspaceTag), void 0, {
+      F: __dxlog_file27,
+      L: 191,
+      S: this,
+      A: [
+        "FeedProtocol.isWellKnownNamespace(subspaceTag)",
+        ""
+      ]
+    });
+    if (!shouldPush && !shouldPull) {
+      return;
+    }
+    await RuntimeProvider.runPromise(this.#runtime)(Effect.gen(this, function* () {
+      let done = false;
+      let iterations = 0;
+      while (!done) {
+        done = true;
+        if (shouldPull) {
+          const pullResult = yield* this.#syncClient.pull({
+            spaceId,
+            feedNamespace: subspaceTag,
+            limit: this.#messageBlocksLimit
+          });
+          done &&= pullResult.done;
+        }
+        if (shouldPush) {
+          const pushResult = yield* this.#syncClient.push({
+            spaceId,
+            feedNamespace: subspaceTag,
+            limit: this.#messageBlocksLimit
+          });
+          done &&= pushResult.done;
+        }
+        iterations++;
+        if (iterations > MAX_BLOCKING_SYNC_ITERATIONS) {
+          throw new Error("Blocking sync exceeded max iterations.");
+        }
+      }
+    }));
+  }
   #resetSpacesToPoll() {
     this.#spacesToPoll.clear();
     this.#getSpaceIds().forEach((spaceId) => {
@@ -8009,12 +8089,18 @@ var FeedSyncer = class extends Resource8 {
   }
   #pollTask = new AsyncTask(async () => Effect.gen(this, function* () {
     yield* Effect.forEach(this.#spacesToPoll, (spaceId) => Effect.gen(this, function* () {
-      const { done } = yield* this.#syncClient.pull({
-        spaceId,
-        feedNamespace: this.#syncNamespace,
-        limit: this.#messageBlocksLimit
-      });
-      if (done) {
+      let doneForAllNamespaces = true;
+      for (const feedNamespace of this.#syncNamespaces) {
+        const { done } = yield* this.#syncClient.pull({
+          spaceId,
+          feedNamespace,
+          limit: this.#messageBlocksLimit
+        });
+        if (!done) {
+          doneForAllNamespaces = false;
+        }
+      }
+      if (doneForAllNamespaces) {
         this.#spacesToPoll.delete(spaceId);
       }
     }), {
@@ -8032,12 +8118,18 @@ var FeedSyncer = class extends Resource8 {
   }).pipe(RuntimeProvider.runPromise(this.#runtime)));
   #pushTask = new AsyncTask(async () => Effect.gen(this, function* () {
     yield* Effect.forEach(this.#getSpaceIds(), (spaceId) => Effect.gen(this, function* () {
-      const { done } = yield* this.#syncClient.push({
-        spaceId,
-        feedNamespace: this.#syncNamespace,
-        limit: this.#messageBlocksLimit
-      });
-      if (!done) {
+      let doneForAllNamespaces = true;
+      for (const feedNamespace of this.#syncNamespaces) {
+        const { done } = yield* this.#syncClient.push({
+          spaceId,
+          feedNamespace,
+          limit: this.#messageBlocksLimit
+        });
+        if (!done) {
+          doneForAllNamespaces = false;
+        }
+      }
+      if (!doneForAllNamespaces) {
         this.#pushTask.schedule();
       }
     }), {
@@ -8118,7 +8210,7 @@ function _ts_dispose_resources4(env) {
     return next();
   })(env);
 }
-var __dxlog_file27 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var __dxlog_file28 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
 var ServiceContext = class extends Resource9 {
   storage;
   level;
@@ -8153,14 +8245,14 @@ var ServiceContext = class extends Resource9 {
   constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtime, _runtimeProps, _edgeFeatures) {
     super(), this.storage = storage, this.level = level, this.networkManager = networkManager, this.signalManager = signalManager, this._edgeConnection = _edgeConnection, this._edgeHttpClient = _edgeHttpClient, this._runtime = _runtime, this._runtimeProps = _runtimeProps, this._edgeFeatures = _edgeFeatures;
     log23("runtimeProps", this._runtimeProps, {
-      F: __dxlog_file27,
-      L: 123,
+      F: __dxlog_file28,
+      L: 122,
       S: this,
       C: (f, a) => f(...a)
     });
     log23("edgeFeatures", this._edgeFeatures, {
-      F: __dxlog_file27,
-      L: 124,
+      F: __dxlog_file28,
+      L: 123,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8200,7 +8292,14 @@ var ServiceContext = class extends Resource9 {
       peerIdProvider: () => this.identityManager.identity?.deviceKey?.toHex(),
       getSpaceKeyByRootDocumentId: (documentId) => this.spaceManager.findSpaceByRootDocumentId(documentId)?.key,
       runtime: this._runtime,
-      localQueues: this._runtimeProps?.enableLocalQueues
+      syncQueue: async (request) => {
+        return this._feedSyncer?.syncBlocking({
+          spaceId: request.spaceId,
+          subspaceTag: request.subspaceTag,
+          shouldPush: request.shouldPush,
+          shouldPull: request.shouldPull
+        });
+      }
     });
     this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeProps?.invitationConnectionDefaultProps);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
@@ -8221,73 +8320,247 @@ var ServiceContext = class extends Resource9 {
         edgeClient: this._edgeConnection,
         peerId: this.identityManager.identity?.deviceKey?.toHex() ?? "",
         getSpaceIds: () => this.echoHost.spaceIds,
-        syncNamespace: FeedProtocol2.WellKnownNamespaces.data
+        syncNamespaces: [
+          FeedProtocol2.WellKnownNamespaces.data,
+          FeedProtocol2.WellKnownNamespaces.trace
+        ]
       });
     }
   }
   async _open(ctx) {
     await this._checkStorageVersion();
     log23("opening...", void 0, {
-      F: __dxlog_file27,
-      L: 225,
+      F: __dxlog_file28,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
     log23.trace("dxos.sdk.service-context.open", trace9.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file27,
-      L: 226,
+      F: __dxlog_file28,
+      L: 232,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log23("opening identityManager...", void 0, {
+      F: __dxlog_file28,
+      L: 234,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.identityManager.open(ctx);
+    log23("identityManager opened", {
+      hasIdentity: !!this.identityManager.identity
+    }, {
+      F: __dxlog_file28,
+      L: 236,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log23("setting network identity...", void 0, {
+      F: __dxlog_file28,
+      L: 238,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this._setNetworkIdentity();
+    log23("network identity set", void 0, {
+      F: __dxlog_file28,
+      L: 240,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log23("opening edge connection...", void 0, {
+      F: __dxlog_file28,
+      L: 242,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this._edgeConnection?.open();
+    log23("edge connection opened", void 0, {
+      F: __dxlog_file28,
+      L: 244,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log23("opening signal manager...", void 0, {
+      F: __dxlog_file28,
+      L: 246,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this.signalManager.open();
+    log23("signal manager opened", void 0, {
+      F: __dxlog_file28,
+      L: 248,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log23("opening network manager...", void 0, {
+      F: __dxlog_file28,
+      L: 250,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this.networkManager.open();
+    log23("network manager opened", void 0, {
+      F: __dxlog_file28,
+      L: 252,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log23("opening echo host...", void 0, {
+      F: __dxlog_file28,
+      L: 254,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this.echoHost.open(ctx);
+    log23("echo host opened", void 0, {
+      F: __dxlog_file28,
+      L: 256,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     if (this._meshReplicator) {
+      log23("adding mesh replicator...", void 0, {
+        F: __dxlog_file28,
+        L: 259,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       await this.echoHost.addReplicator(this._meshReplicator);
+      log23("mesh replicator added", void 0, {
+        F: __dxlog_file28,
+        L: 261,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     }
     if (this._echoEdgeReplicator) {
+      log23("adding edge replicator...", void 0, {
+        F: __dxlog_file28,
+        L: 264,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       await this.echoHost.addReplicator(this._echoEdgeReplicator);
+      log23("edge replicator added", void 0, {
+        F: __dxlog_file28,
+        L: 266,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     }
+    log23("loading metadata store...", void 0, {
+      F: __dxlog_file28,
+      L: 269,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this.metadataStore.load();
+    log23("metadata store loaded", void 0, {
+      F: __dxlog_file28,
+      L: 271,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log23("opening space manager...", void 0, {
+      F: __dxlog_file28,
+      L: 273,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this.spaceManager.open();
+    log23("space manager opened", void 0, {
+      F: __dxlog_file28,
+      L: 275,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     if (this.identityManager.identity) {
+      log23("joining network...", void 0, {
+        F: __dxlog_file28,
+        L: 278,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       await this.identityManager.identity.joinNetwork();
+      log23("network joined", void 0, {
+        F: __dxlog_file28,
+        L: 280,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      log23("initializing spaces...(calling _initialize)", void 0, {
+        F: __dxlog_file28,
+        L: 282,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       await this._initialize(ctx);
+      log23("spaces initialized", void 0, {
+        F: __dxlog_file28,
+        L: 284,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } else {
+      log23("no identity, skipping network join and space initialization", void 0, {
+        F: __dxlog_file28,
+        L: 286,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     }
+    log23("opening feed syncer...", void 0, {
+      F: __dxlog_file28,
+      L: 289,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this._feedSyncer?.open();
+    log23("feed syncer opened", void 0, {
+      F: __dxlog_file28,
+      L: 291,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log23("loading persistent invitations...", void 0, {
+      F: __dxlog_file28,
+      L: 293,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
     log23("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file27,
-      L: 256,
+      F: __dxlog_file28,
+      L: 295,
       S: this,
       C: (f, a) => f(...a)
     });
     log23.trace("dxos.sdk.service-context.open", trace9.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file27,
-      L: 258,
+      F: __dxlog_file28,
+      L: 297,
       S: this,
       C: (f, a) => f(...a)
     });
     log23("opened", void 0, {
-      F: __dxlog_file27,
-      L: 259,
+      F: __dxlog_file28,
+      L: 298,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
     log23("closing...", void 0, {
-      F: __dxlog_file27,
-      L: 263,
+      F: __dxlog_file28,
+      L: 302,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8306,8 +8579,8 @@ var ServiceContext = class extends Resource9 {
     await this.feedStore.close();
     await this.metadataStore.close();
     log23("closed", void 0, {
-      F: __dxlog_file27,
-      L: 282,
+      F: __dxlog_file28,
+      L: 321,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8317,8 +8590,8 @@ var ServiceContext = class extends Resource9 {
     await this._setNetworkIdentity();
     await identity.joinNetwork();
     await this._initialize(new Context10(void 0, {
-      F: __dxlog_file27,
-      L: 289
+      F: __dxlog_file28,
+      L: 328
     }));
     return identity;
   }
@@ -8327,9 +8600,9 @@ var ServiceContext = class extends Resource9 {
       throw new Error("Identity must be created before joining a space.");
     }
     const factory = this._handlerFactories.get(invitation.kind);
-    invariant22(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file27,
-      L: 298,
+    invariant23(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file28,
+      L: 337,
       S: this,
       A: [
         "factory",
@@ -8354,8 +8627,8 @@ var ServiceContext = class extends Resource9 {
     await identity.joinNetwork();
     await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
     await this._initialize(new Context10(void 0, {
-      F: __dxlog_file27,
-      L: 317
+      F: __dxlog_file28,
+      L: 356
     }));
     return identity;
   }
@@ -8367,9 +8640,9 @@ var ServiceContext = class extends Resource9 {
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    log23("initializing spaces...", void 0, {
-      F: __dxlog_file27,
-      L: 332,
+    log23("_initialize: start", void 0, {
+      F: __dxlog_file28,
+      L: 371,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8387,6 +8660,12 @@ var ServiceContext = class extends Resource9 {
         });
       }
     };
+    log23("_initialize: creating DataSpaceManager", void 0, {
+      F: __dxlog_file28,
+      L: 383,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this.dataSpaceManager = new DataSpaceManager({
       spaceManager: this.spaceManager,
       metadataStore: this.metadataStore,
@@ -8402,13 +8681,37 @@ var ServiceContext = class extends Resource9 {
       runtimeProps: this._runtimeProps,
       edgeFeatures: this._edgeFeatures
     });
+    log23("_initialize: opening DataSpaceManager...", void 0, {
+      F: __dxlog_file28,
+      L: 399,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this.dataSpaceManager.open();
+    log23("_initialize: DataSpaceManager opened", void 0, {
+      F: __dxlog_file28,
+      L: 401,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this.edgeAgentManager = new EdgeAgentManager(this._edgeFeatures, this._edgeHttpClient, this.dataSpaceManager, identity);
+    log23("_initialize: opening EdgeAgentManager...", void 0, {
+      F: __dxlog_file28,
+      L: 409,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this.edgeAgentManager.open();
+    log23("_initialize: EdgeAgentManager opened", void 0, {
+      F: __dxlog_file28,
+      L: 411,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._handlerFactories.set(Invitation10.Kind.SPACE, (invitation) => {
-      invariant22(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file27,
-        L: 370,
+      invariant23(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file28,
+        L: 414,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -8418,6 +8721,12 @@ var ServiceContext = class extends Resource9 {
       return new SpaceInvitationProtocol(this.dataSpaceManager, signingContext, this.keyring, invitation.spaceKey);
     });
     this.initialized.wake();
+    log23("_initialize: initialized.wake() called", void 0, {
+      F: __dxlog_file28,
+      L: 418,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._deviceSpaceSync = {
       processCredential: async (credential) => {
         const assertion = getCredentialAssertion6(credential);
@@ -8431,8 +8740,8 @@ var ServiceContext = class extends Resource9 {
           log23("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file27,
-            L: 386,
+            F: __dxlog_file28,
+            L: 431,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8442,8 +8751,8 @@ var ServiceContext = class extends Resource9 {
           log23("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file27,
-            L: 390,
+            F: __dxlog_file28,
+            L: 435,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8453,8 +8762,8 @@ var ServiceContext = class extends Resource9 {
           log23("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file27,
-            L: 395,
+            F: __dxlog_file28,
+            L: 440,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8464,8 +8773,8 @@ var ServiceContext = class extends Resource9 {
           });
         } catch (err) {
           log23.catch(err, void 0, {
-            F: __dxlog_file27,
-            L: 401,
+            F: __dxlog_file28,
+            L: 446,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -8481,40 +8790,102 @@ var ServiceContext = class extends Resource9 {
       hasError: false
     };
     try {
+      log23("_setNetworkIdentity: acquiring mutex...", void 0, {
+        F: __dxlog_file28,
+        L: 455,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       const _ = _ts_add_disposable_resource4(env, await this._edgeIdentityUpdateMutex.acquire(), false);
+      log23("_setNetworkIdentity: mutex acquired", void 0, {
+        F: __dxlog_file28,
+        L: 457,
+        S: this,
+        C: (f, a) => f(...a)
+      });
       let edgeIdentity;
       const identity = this.identityManager.identity;
       if (identity) {
-        log23("setting identity on edge connection", {
+        log23("_setNetworkIdentity: has identity", {
           identity: identity.identityKey.toHex(),
-          swarms: this.networkManager.topics
+          hasDeviceCredential: !!params?.deviceCredential
         }, {
-          F: __dxlog_file27,
-          L: 415,
+          F: __dxlog_file28,
+          L: 462,
           S: this,
           C: (f, a) => f(...a)
         });
         if (params?.deviceCredential) {
+          log23("_setNetworkIdentity: creating chain edge identity with device credential...", void 0, {
+            F: __dxlog_file28,
+            L: 468,
+            S: this,
+            C: (f, a) => f(...a)
+          });
           edgeIdentity = await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, params?.deviceCredential && {
             credential: params.deviceCredential
           }, []);
+          log23("_setNetworkIdentity: chain edge identity created", void 0, {
+            F: __dxlog_file28,
+            L: 476,
+            S: this,
+            C: (f, a) => f(...a)
+          });
         } else {
+          log23("_setNetworkIdentity: waiting for identity.ready()...", void 0, {
+            F: __dxlog_file28,
+            L: 478,
+            S: this,
+            C: (f, a) => f(...a)
+          });
           await warnAfterTimeout2(1e4, "Waiting for identity to be ready for edge connection", async () => {
             await identity.ready();
           });
-          invariant22(identity.deviceCredentialChain, void 0, {
-            F: __dxlog_file27,
-            L: 434,
+          log23("_setNetworkIdentity: identity.ready() resolved", {
+            hasDeviceCredentialChain: !!identity.deviceCredentialChain
+          }, {
+            F: __dxlog_file28,
+            L: 483,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          invariant23(identity.deviceCredentialChain, void 0, {
+            F: __dxlog_file28,
+            L: 487,
             S: this,
             A: [
               "identity.deviceCredentialChain",
               ""
             ]
           });
+          log23("_setNetworkIdentity: creating chain edge identity...", void 0, {
+            F: __dxlog_file28,
+            L: 489,
+            S: this,
+            C: (f, a) => f(...a)
+          });
           edgeIdentity = await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, identity.deviceCredentialChain, []);
+          log23("_setNetworkIdentity: chain edge identity created", void 0, {
+            F: __dxlog_file28,
+            L: 497,
+            S: this,
+            C: (f, a) => f(...a)
+          });
         }
       } else {
+        log23("_setNetworkIdentity: no identity, creating ephemeral edge identity...", void 0, {
+          F: __dxlog_file28,
+          L: 500,
+          S: this,
+          C: (f, a) => f(...a)
+        });
         edgeIdentity = await createEphemeralEdgeIdentity();
+        log23("_setNetworkIdentity: ephemeral edge identity created", void 0, {
+          F: __dxlog_file28,
+          L: 502,
+          S: this,
+          C: (f, a) => f(...a)
+        });
       }
       this._edgeConnection?.setIdentity(edgeIdentity);
       this._edgeHttpClient?.setIdentity(edgeIdentity);
@@ -8522,6 +8893,12 @@ var ServiceContext = class extends Resource9 {
         identityKey: edgeIdentity.identityKey,
         peerKey: edgeIdentity.peerKey
       });
+      log23("_setNetworkIdentity: done", void 0, {
+        F: __dxlog_file28,
+        L: 511,
+        S: this,
+        C: (f, a) => f(...a)
+      });
     } catch (e) {
       env.error = e;
       env.hasError = true;
@@ -8657,7 +9034,7 @@ import { clientServiceBundle } from "@dxos/client-protocol";
 import { Context as Context11 } from "@dxos/context";
 import { EdgeClient, EdgeHttpClient, createStubEdgeIdentity } from "@dxos/edge-client";
 import { RuntimeProvider as RuntimeProvider2 } from "@dxos/effect";
-import { invariant as invariant24 } from "@dxos/invariant";
+import { invariant as invariant25 } from "@dxos/invariant";
 import { PublicKey as PublicKey19 } from "@dxos/keys";
 import { log as log25 } from "@dxos/log";
 import { EdgeSignalManager, WebsocketSignalManager } from "@dxos/messaging";
@@ -8671,9 +9048,9 @@ import { WebsocketRpcClient } from "@dxos/websocket-rpc";
 // src/packlets/devices/devices-service.ts
 import { SubscriptionList as SubscriptionList3 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf/stream";
-import { invariant as invariant23 } from "@dxos/invariant";
+import { invariant as invariant24 } from "@dxos/invariant";
 import { Device as Device2, DeviceKind as DeviceKind2, EdgeStatus as EdgeStatus3 } from "@dxos/protocols/proto/dxos/client/services";
-var __dxlog_file28 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file29 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   _identityManager;
   _edgeConnection;
@@ -8693,8 +9070,8 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
-          invariant23(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file28,
+          invariant24(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file29,
             L: 37,
             S: this,
             A: [
@@ -9102,7 +9479,7 @@ function _ts_decorate9(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file29 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file30 = "/__w/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   _resourceLock;
   _serviceRegistry;
@@ -9156,7 +9533,7 @@ var ClientServicesHost = class {
         onAcquire: () => {
           if (!this._opening) {
             void this.open(new Context11(void 0, {
-              F: __dxlog_file29,
+              F: __dxlog_file30,
               L: 147
             }));
           }
@@ -9231,8 +9608,8 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    invariant24(!this._open, "service host is open", {
-      F: __dxlog_file29,
+    invariant25(!this._open, "service host is open", {
+      F: __dxlog_file30,
       L: 237,
       S: this,
       A: [
@@ -9241,7 +9618,7 @@ var ClientServicesHost = class {
       ]
     });
     log25("initializing...", void 0, {
-      F: __dxlog_file29,
+      F: __dxlog_file30,
       L: 238,
       S: this,
       C: (f, a) => f(...a)
@@ -9253,12 +9630,9 @@ var ClientServicesHost = class {
       if (this._runtimeProps.enableVectorIndexing === void 0) {
         this._runtimeProps.enableVectorIndexing = config?.get("runtime.client.enableVectorIndexing", false);
       }
-      if (this._runtimeProps.enableLocalQueues === void 0) {
-        this._runtimeProps.enableLocalQueues = config?.get("runtime.client.enableLocalQueues", false);
-      }
-      invariant24(!this._config, "config already set", {
-        F: __dxlog_file29,
-        L: 251,
+      invariant25(!this._config, "config already set", {
+        F: __dxlog_file30,
+        L: 248,
         S: this,
         A: [
           "!this._config",
@@ -9285,9 +9659,9 @@ var ClientServicesHost = class {
       edgeConnection: this._edgeConnection
     }) : new WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    invariant24(!this._networkManager, "network manager already set", {
-      F: __dxlog_file29,
-      L: 282,
+    invariant25(!this._networkManager, "network manager already set", {
+      F: __dxlog_file30,
+      L: 279,
       S: this,
       A: [
         "!this._networkManager",
@@ -9304,8 +9678,8 @@ var ClientServicesHost = class {
       } : void 0
     });
     log25("initialized", void 0, {
-      F: __dxlog_file29,
-      L: 295,
+      F: __dxlog_file30,
+      L: 292,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9318,41 +9692,41 @@ var ClientServicesHost = class {
     log25.trace("dxos.client-services.host.open", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file29,
-      L: 306,
+      F: __dxlog_file30,
+      L: 303,
       S: this,
       C: (f, a) => f(...a)
     });
-    invariant24(this._config, "config not set", {
-      F: __dxlog_file29,
-      L: 308,
+    invariant25(this._config, "config not set", {
+      F: __dxlog_file30,
+      L: 305,
       S: this,
       A: [
         "this._config",
         "'config not set'"
       ]
     });
-    invariant24(this._storage, "storage not set", {
-      F: __dxlog_file29,
-      L: 309,
+    invariant25(this._storage, "storage not set", {
+      F: __dxlog_file30,
+      L: 306,
       S: this,
       A: [
         "this._storage",
         "'storage not set'"
       ]
     });
-    invariant24(this._signalManager, "signal manager not set", {
-      F: __dxlog_file29,
-      L: 310,
+    invariant25(this._signalManager, "signal manager not set", {
+      F: __dxlog_file30,
+      L: 307,
       S: this,
       A: [
         "this._signalManager",
         "'signal manager not set'"
       ]
     });
-    invariant24(this._networkManager, "network manager not set", {
-      F: __dxlog_file29,
-      L: 311,
+    invariant25(this._networkManager, "network manager not set", {
+      F: __dxlog_file30,
+      L: 308,
       S: this,
       A: [
         "this._networkManager",
@@ -9363,8 +9737,8 @@ var ClientServicesHost = class {
     log25("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file29,
-      L: 314,
+      F: __dxlog_file30,
+      L: 311,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9405,8 +9779,32 @@ var ClientServicesHost = class {
       }),
       EdgeAgentService: new EdgeAgentServiceImpl(agentManagerProvider, this._edgeConnection)
     });
+    log25("service-host: opening service context...", void 0, {
+      F: __dxlog_file30,
+      L: 395,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this._serviceContext.open(ctx);
+    log25("service-host: service context opened", void 0, {
+      F: __dxlog_file30,
+      L: 397,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log25("service-host: opening identity service...", void 0, {
+      F: __dxlog_file30,
+      L: 399,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await identityService.open();
+    log25("service-host: identity service opened", void 0, {
+      F: __dxlog_file30,
+      L: 401,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     const devtoolsProxy = this._config?.get("runtime.client.devtoolsProxy");
     if (devtoolsProxy) {
       this._devtoolsProxy = new WebsocketRpcClient({
@@ -9425,16 +9823,16 @@ var ClientServicesHost = class {
     log25("opened", {
       deviceKey
     }, {
-      F: __dxlog_file29,
-      L: 417,
+      F: __dxlog_file30,
+      L: 419,
       S: this,
       C: (f, a) => f(...a)
     });
     log25.trace("dxos.client-services.host.open", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file29,
-      L: 418,
+      F: __dxlog_file30,
+      L: 420,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9447,8 +9845,8 @@ var ClientServicesHost = class {
     log25("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file29,
-      L: 429,
+      F: __dxlog_file30,
+      L: 431,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9465,8 +9863,8 @@ var ClientServicesHost = class {
     log25("closed", {
       deviceKey
     }, {
-      F: __dxlog_file29,
-      L: 438,
+      F: __dxlog_file30,
+      L: 440,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9476,14 +9874,14 @@ var ClientServicesHost = class {
     log25.trace("dxos.sdk.client-services-host.reset", trace10.begin({
       id: traceId
     }), {
-      F: __dxlog_file29,
-      L: 443,
+      F: __dxlog_file30,
+      L: 445,
       S: this,
       C: (f, a) => f(...a)
     });
     log25.info("resetting...", void 0, {
-      F: __dxlog_file29,
-      L: 445,
+      F: __dxlog_file30,
+      L: 447,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9496,24 +9894,24 @@ var ClientServicesHost = class {
       log25.warn("failed to clear leveldb during reset", {
         err
       }, {
-        F: __dxlog_file29,
-        L: 455,
+        F: __dxlog_file30,
+        L: 457,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     await this._storage.reset();
     log25.info("reset", void 0, {
-      F: __dxlog_file29,
-      L: 458,
+      F: __dxlog_file30,
+      L: 460,
       S: this,
       C: (f, a) => f(...a)
     });
     log25.trace("dxos.sdk.client-services-host.reset", trace10.end({
       id: traceId
     }), {
-      F: __dxlog_file29,
-      L: 459,
+      F: __dxlog_file30,
+      L: 461,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -9584,4 +9982,4 @@ export {
   ServiceRegistry,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-JUKRMLXU.mjs.map
+//# sourceMappingURL=chunk-FRMIC6UB.mjs.map