@dxos/client-services 0.6.12-main.78ddbdf → 0.6.12-main.7907542

package/dist/lib/node-esm/{chunk-3HDLTAT2.mjs → chunk-EQAI46LQ.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.6.12-main.78ddbdf";
+var DXOS_VERSION = "0.6.12-main.7907542";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -670,7 +670,7 @@ var TrustedKeySetAuthVerifier = class {
         return false;
       }
       if (this._isTrustedKey(credential.issuer)) {
-        log2("key is not currently in trusted set, waiting...", {
+        log2("key is trusted -- auth success", {
           key: credential.issuer
         }, {
           F: __dxlog_file4,
@@ -697,7 +697,10 @@ var TrustedKeySetAuthVerifier = class {
           trigger.wake(true);
         } else {
           log2("key is not currently in trusted set, waiting...", {
-            key: credential.issuer
+            key: credential.issuer,
+            trusted: [
+              ...this._params.trustedKeysProvider()
+            ]
           }, {
             F: __dxlog_file4,
             L: 84,
@@ -730,11 +733,17 @@ import { Context as Context3, Resource } from "@dxos/context";
 import { EdgeConnectionClosedError, EdgeIdentityChangedError } from "@dxos/edge-client";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { PublicKey as PublicKey3 } from "@dxos/keys";
-import { log as log3 } from "@dxos/log";
+import { log as log3, logInfo } from "@dxos/log";
 import { EdgeService } from "@dxos/protocols";
 import { buf } from "@dxos/protocols/buf";
 import { MessageSchema as RouterMessageSchema } from "@dxos/protocols/buf/dxos/edge/messenger_pb";
 import { ComplexMap as ComplexMap2, arrayToBuffer, bufferToArray, defaultMap, rangeFromTo } from "@dxos/util";
+function _ts_decorate(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
 function _using_ctx() {
   var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
     var err = new Error();
@@ -816,6 +825,12 @@ var EdgeFeedReplicator = class extends Resource {
     this._spaceId = spaceId;
   }
   async _open() {
+    log3("open", void 0, {
+      F: __dxlog_file5,
+      L: 56,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._ctx.onDispose(this._messenger.addListener((message) => {
       if (!message.serviceId) {
         return;
@@ -831,20 +846,20 @@ var EdgeFeedReplicator = class extends Resource {
           _spaceId: this._spaceId
         }, {
           F: __dxlog_file5,
-          L: 66,
+          L: 70,
           S: this,
           C: (f, a) => f(...a)
         });
         return;
       }
       const payload = decodeCbor(message.payload.value);
-      log3.info("receive", {
+      log3("receive", {
         from: message.source,
         feedKey: payload.feedKey,
         type: payload.type
       }, {
         F: __dxlog_file5,
-        L: 71,
+        L: 75,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -852,46 +867,44 @@ var EdgeFeedReplicator = class extends Resource {
     }));
     this._messenger.connected.on(this._ctx, async () => {
       await this._resetConnection();
-      this._connected = true;
-      const connectionCtx = new Context3({
-        onError: async (err) => {
-          if (connectionCtx !== this._connectionCtx) {
-            return;
-          }
-          if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
-            log3("resetting on reconnect", void 0, {
-              F: __dxlog_file5,
-              L: 86,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            await this._resetConnection();
-          } else {
-            this._ctx.raise(err);
-          }
-        }
-      }, {
-        F: __dxlog_file5,
-        L: 80
-      });
-      this._connectionCtx = connectionCtx;
-      log3("connection context created", void 0, {
-        F: __dxlog_file5,
-        L: 94,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-      scheduleMicroTask(connectionCtx, async () => {
-        for (const feed of this._feeds.values()) {
-          await this._replicateFeed(connectionCtx, feed);
-        }
-      });
+      this._startReplication();
     });
+    if (this._messenger.isConnected) {
+      this._startReplication();
+    }
   }
   async _close() {
+    log3("close", void 0, {
+      F: __dxlog_file5,
+      L: 91,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this._resetConnection();
   }
+  _startReplication() {
+    this._connected = true;
+    const connectionCtx = this._createConnectionContext();
+    this._connectionCtx = connectionCtx;
+    log3("connection context created", void 0, {
+      F: __dxlog_file5,
+      L: 99,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    scheduleMicroTask(connectionCtx, async () => {
+      for (const feed of this._feeds.values()) {
+        await this._replicateFeed(connectionCtx, feed);
+      }
+    });
+  }
   async _resetConnection() {
+    log3("resetConnection", void 0, {
+      F: __dxlog_file5,
+      L: 108,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._connected = false;
     await this._connectionCtx?.dispose();
     this._connectionCtx = void 0;
@@ -899,10 +912,12 @@ var EdgeFeedReplicator = class extends Resource {
   }
   async addFeed(feed) {
     log3.info("addFeed", {
-      key: feed.key
+      key: feed.key,
+      connected: this._connected,
+      hasConnectionCtx: !!this._connectionCtx
     }, {
       F: __dxlog_file5,
-      L: 115,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -915,6 +930,14 @@ var EdgeFeedReplicator = class extends Resource {
     return defaultMap(this._pushMutex, key, () => new Mutex());
   }
   async _replicateFeed(ctx, feed) {
+    log3("replicateFeed", {
+      key: feed.key
+    }, {
+      F: __dxlog_file5,
+      L: 129,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this._sendMessage({
       type: "get-metadata",
       feedKey: feed.key.toHex()
@@ -927,7 +950,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log3.info("message dropped because connection was disposed", void 0, {
         F: __dxlog_file5,
-        L: 140,
+        L: 142,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -941,13 +964,13 @@ var EdgeFeedReplicator = class extends Resource {
     };
     log3.info("sending message", logPayload, {
       F: __dxlog_file5,
-      L: 146,
+      L: 148,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant2(message.feedKey, void 0, {
       F: __dxlog_file5,
-      L: 148,
+      L: 150,
       S: this,
       A: [
         "message.feedKey",
@@ -955,6 +978,14 @@ var EdgeFeedReplicator = class extends Resource {
       ]
     });
     const payloadValue = bufferToArray(encodeCbor(message));
+    log3("send", {
+      type: message.type
+    }, {
+      F: __dxlog_file5,
+      L: 153,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await this._messenger.send(buf.create(RouterMessageSchema, {
       source: {
         identityKey: this._messenger.identityKey,
@@ -970,7 +1001,7 @@ var EdgeFeedReplicator = class extends Resource {
     if (!this._connectionCtx) {
       log3.warn("received message after connection context was disposed", void 0, {
         F: __dxlog_file5,
-        L: 165,
+        L: 168,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -985,7 +1016,7 @@ var EdgeFeedReplicator = class extends Resource {
               message
             }, {
               F: __dxlog_file5,
-              L: 171,
+              L: 174,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -996,7 +1027,7 @@ var EdgeFeedReplicator = class extends Resource {
                 feedKey
               }, {
                 F: __dxlog_file5,
-                L: 176,
+                L: 179,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -1029,7 +1060,7 @@ var EdgeFeedReplicator = class extends Resource {
             blocks: message.blocks.map((b) => b.index)
           }, {
             F: __dxlog_file5,
-            L: 198,
+            L: 201,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1040,7 +1071,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             }, {
               F: __dxlog_file5,
-              L: 203,
+              L: 206,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -1054,7 +1085,7 @@ var EdgeFeedReplicator = class extends Resource {
             ...message
           }, {
             F: __dxlog_file5,
-            L: 212,
+            L: 215,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1069,7 +1100,7 @@ var EdgeFeedReplicator = class extends Resource {
       to
     }, {
       F: __dxlog_file5,
-      L: 219,
+      L: 222,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1079,7 +1110,7 @@ var EdgeFeedReplicator = class extends Resource {
       });
       invariant2(data instanceof Uint8Array, void 0, {
         F: __dxlog_file5,
-        L: 224,
+        L: 227,
         S: this,
         A: [
           "data instanceof Uint8Array",
@@ -1107,7 +1138,7 @@ var EdgeFeedReplicator = class extends Resource {
       blocks: blocks.length
     }, {
       F: __dxlog_file5,
-      L: 245,
+      L: 248,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1129,7 +1160,7 @@ var EdgeFeedReplicator = class extends Resource {
       if (!this._remoteLength.has(feed.key)) {
         log3("blocks not pushed because remote length is unknown", void 0, {
           F: __dxlog_file5,
-          L: 266,
+          L: 269,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1145,7 +1176,34 @@ var EdgeFeedReplicator = class extends Resource {
       _usingCtx.d();
     }
   }
+  _createConnectionContext() {
+    const connectionCtx = new Context3({
+      onError: async (err) => {
+        if (connectionCtx !== this._connectionCtx) {
+          return;
+        }
+        if (err instanceof EdgeIdentityChangedError || err instanceof EdgeConnectionClosedError) {
+          log3("resetting on reconnect", void 0, {
+            F: __dxlog_file5,
+            L: 286,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          await this._resetConnection();
+        } else {
+          this._ctx.raise(err);
+        }
+      }
+    }, {
+      F: __dxlog_file5,
+      L: 280
+    });
+    return connectionCtx;
+  }
 };
+_ts_decorate([
+  logInfo
+], EdgeFeedReplicator.prototype, "_spaceId", void 0);
 var bufferizeBlock = (block) => ({
   index: block.index,
   data: arrayToBuffer(block.data),
@@ -1160,7 +1218,7 @@ var bufferizeBlock = (block) => ({
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
 import { Event as Event7, Mutex as Mutex2, scheduleTask as scheduleTask4, sleep as sleep3, synchronized as synchronized2, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { AUTH_TIMEOUT as AUTH_TIMEOUT2 } from "@dxos/client-protocol";
-import { Context as Context6, ContextDisposedError, cancelWithContext as cancelWithContext2 } from "@dxos/context";
+import { Context as Context5, ContextDisposedError, cancelWithContext as cancelWithContext2 } from "@dxos/context";
 import { timed, warnAfterTimeout } from "@dxos/debug";
 import { createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { SpaceDocVersion as SpaceDocVersion3 } from "@dxos/echo-protocol";
@@ -1395,53 +1453,67 @@ var runEpochMigration = async (ctx, context) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts
-import { DeferredTask, Event as Event3, scheduleTask as scheduleTask2, sleep, TimeoutError, Trigger as Trigger2 } from "@dxos/async";
-import { Context as Context4, rejectOnDispose } from "@dxos/context";
+import { DeferredTask, Event as Event3, scheduleTask as scheduleTask2, sleep, TimeoutError, Trigger as Trigger2, scheduleMicroTask as scheduleMicroTask2 } from "@dxos/async";
+import { rejectOnDispose, Resource as Resource3 } from "@dxos/context";
+import { verifyCredential as verifyCredential2 } from "@dxos/credentials";
 import { invariant as invariant4 } from "@dxos/invariant";
 import { PublicKey as PublicKey4 } from "@dxos/keys";
-import { log as log5 } from "@dxos/log";
+import { logInfo as logInfo2, log as log5 } from "@dxos/log";
+import { EdgeCallFailedError } from "@dxos/protocols";
 import { schema as schema2 } from "@dxos/protocols/proto";
 import { RpcExtension } from "@dxos/teleport";
 import { ComplexMap as ComplexMap3, ComplexSet, entry } from "@dxos/util";
+function _ts_decorate2(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
 var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
 var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
+var MAX_EDGE_RETRIES = 2;
 var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
-var NotarizationPlugin = class {
-  constructor() {
-    this._ctx = new Context4(void 0, {
-      F: __dxlog_file7,
-      L: 62
-    });
+var credentialCodec = schema2.getCodecForType("dxos.halo.credentials.Credential");
+var NotarizationPlugin = class extends Resource3 {
+  constructor(params) {
+    super();
     this._extensionOpened = new Event3();
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new ComplexSet(PublicKey4.hash);
     this._processCredentialsTriggers = new ComplexMap3(PublicKey4.hash);
+    this._spaceId = params.spaceId;
+    if (params.edgeClient && params.edgeFeatures?.feedReplicator) {
+      this._edgeClient = params.edgeClient;
+    }
   }
   get hasWriter() {
     return !!this._writer;
   }
-  async open() {
+  async _open() {
+    if (this._edgeClient && this._writer) {
+      this._notarizePendingEdgeCredentials(this._edgeClient, this._writer);
+    }
   }
-  async close() {
+  async _close() {
     await this._ctx.dispose();
   }
   /**
   * Request credentials to be notarized.
   */
-  async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
+  async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY, edgeRetryJitter }) {
     log5("notarize", {
       credentials
     }, {
       F: __dxlog_file7,
-      L: 90,
+      L: 126,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant4(credentials.every((credential) => credential.id), "Credentials must have an id", {
       F: __dxlog_file7,
-      L: 91,
+      L: 127,
       S: this,
       A: [
         "credentials.every((credential) => credential.id)",
@@ -1455,7 +1527,7 @@ var NotarizationPlugin = class {
           err
         }, {
           F: __dxlog_file7,
-          L: 99,
+          L: 135,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1465,21 +1537,37 @@ var NotarizationPlugin = class {
     });
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      scheduleTask2(ctx, () => {
-        log5.warn("Notarization timeout", {
-          timeout,
-          peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
-        }, {
-          F: __dxlog_file7,
-          L: 111,
-          S: this,
-          C: (f, a) => f(...a)
-        });
-        void ctx.dispose();
-        errors.throw(new TimeoutError(timeout, "Notarization timed out"));
-      }, timeout);
+      this._scheduleTimeout(ctx, errors, timeout);
     }
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
+    this._tryNotarizeCredentialsWithPeers(ctx, credentials, {
+      retryTimeout,
+      successDelay
+    });
+    if (this._edgeClient) {
+      this._tryNotarizeCredentialsWithEdge(ctx, this._edgeClient, credentials, {
+        retryTimeout,
+        successDelay,
+        jitter: edgeRetryJitter
+      });
+    }
+    try {
+      await Promise.race([
+        rejectOnDispose(ctx),
+        allNotarized,
+        errors.wait()
+      ]);
+      log5("done", void 0, {
+        F: __dxlog_file7,
+        L: 160,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    } finally {
+      await ctx.dispose();
+    }
+  }
+  _tryNotarizeCredentialsWithPeers(ctx, credentials, { retryTimeout, successDelay }) {
     const peersTried = /* @__PURE__ */ new Set();
     const notarizeTask = new DeferredTask(ctx, async () => {
       try {
@@ -1494,7 +1582,7 @@ var NotarizationPlugin = class {
             retryIn: retryTimeout
           }, {
             F: __dxlog_file7,
-            L: 136,
+            L: 183,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1508,7 +1596,7 @@ var NotarizationPlugin = class {
           credentialId: credentials.map((credential) => credential.id)
         }, {
           F: __dxlog_file7,
-          L: 143,
+          L: 190,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1517,7 +1605,7 @@ var NotarizationPlugin = class {
         });
         log5("success", void 0, {
           F: __dxlog_file7,
-          L: 147,
+          L: 194,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1526,7 +1614,7 @@ var NotarizationPlugin = class {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           log5.info("error notarizing (recoverable)", err, {
             F: __dxlog_file7,
-            L: 151,
+            L: 199,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1536,21 +1624,33 @@ var NotarizationPlugin = class {
     });
     notarizeTask.schedule();
     this._extensionOpened.on(ctx, () => notarizeTask.schedule());
-    try {
-      await Promise.race([
-        rejectOnDispose(ctx),
-        allNotarized,
-        errors.wait()
-      ]);
-      log5("done", void 0, {
-        F: __dxlog_file7,
-        L: 162,
-        S: this,
-        C: (f, a) => f(...a)
-      });
-    } finally {
-      await ctx.dispose();
-    }
+  }
+  _tryNotarizeCredentialsWithEdge(ctx, client, credentials, timeouts) {
+    const encodedCredentials = credentials.map((credential) => {
+      const binary = credentialCodec.encode(credential);
+      return Buffer.from(binary).toString("base64");
+    });
+    scheduleTask2(ctx, async () => {
+      try {
+        await client.notarizeCredentials(this._spaceId, {
+          credentials: encodedCredentials
+        }, {
+          retry: {
+            count: MAX_EDGE_RETRIES,
+            timeout: timeouts.retryTimeout,
+            jitter: timeouts.jitter
+          }
+        });
+        log5("edge notarization success", void 0, {
+          F: __dxlog_file7,
+          L: 227,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      } catch (error) {
+        handleEdgeError(error);
+      }
+    });
   }
   /**
   * Called with credentials arriving from the control pipeline.
@@ -1566,7 +1666,7 @@ var NotarizationPlugin = class {
   setWriter(writer) {
     invariant4(!this._writer, "Writer already set.", {
       F: __dxlog_file7,
-      L: 181,
+      L: 247,
       S: this,
       A: [
         "!this._writer",
@@ -1574,6 +1674,59 @@ var NotarizationPlugin = class {
       ]
     });
     this._writer = writer;
+    if (this._edgeClient) {
+      this._notarizePendingEdgeCredentials(this._edgeClient, writer);
+    }
+  }
+  /**
+  * The method is used only for adding agent feeds to spaces.
+  * When an agent is created we can admit them into all the existing spaces. In case the operation fails
+  * this method will fix it on the next space open.
+  * Given how rarely this happens there's no need to poll the endpoint.
+  */
+  _notarizePendingEdgeCredentials(client, writer) {
+    scheduleMicroTask2(this._ctx, async () => {
+      try {
+        const response = await client.getCredentialsForNotarization(this._spaceId, {
+          retry: {
+            count: MAX_EDGE_RETRIES
+          }
+        });
+        const credentials = response.awaitingNotarization.credentials;
+        if (!credentials.length) {
+          log5("edge did not return credentials for notarization", void 0, {
+            F: __dxlog_file7,
+            L: 269,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return;
+        }
+        log5("got edge credentials for notarization", {
+          count: credentials.length
+        }, {
+          F: __dxlog_file7,
+          L: 273,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        const decodedCredentials = credentials.map((credential) => {
+          const binary = Buffer.from(credential, "base64");
+          return credentialCodec.decode(binary);
+        });
+        await this._notarizeCredentials(writer, decodedCredentials);
+        log5.info("notarized edge credentials", {
+          count: decodedCredentials.length
+        }, {
+          F: __dxlog_file7,
+          L: 282,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      } catch (error) {
+        handleEdgeError(error);
+      }
+    });
   }
   async _waitUntilProcessed(id) {
     if (this._processedCredentials.has(id)) {
@@ -1588,10 +1741,13 @@ var NotarizationPlugin = class {
     if (!this._writer) {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
-    for (const credential of request.credentials ?? []) {
+    await this._notarizeCredentials(this._writer, request.credentials ?? []);
+  }
+  async _notarizeCredentials(writer, credentials) {
+    for (const credential of credentials) {
       invariant4(credential.id, "Credential must have an id", {
         F: __dxlog_file7,
-        L: 200,
+        L: 308,
         S: this,
         A: [
           "credential.id",
@@ -1601,7 +1757,11 @@ var NotarizationPlugin = class {
       if (this._processedCredentials.has(credential.id)) {
         continue;
       }
-      await this._writer.write(credential);
+      const verificationResult = await verifyCredential2(credential);
+      if (verificationResult.kind === "fail") {
+        throw new Error(`Credential verification failed: ${verificationResult.errors.join("\n")}.`);
+      }
+      await writer.write(credential);
     }
   }
   createExtension() {
@@ -1611,7 +1771,7 @@ var NotarizationPlugin = class {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file7,
-          L: 211,
+          L: 323,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1623,7 +1783,7 @@ var NotarizationPlugin = class {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file7,
-          L: 216,
+          L: 328,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1633,6 +1793,43 @@ var NotarizationPlugin = class {
     });
     return extension;
   }
+  _scheduleTimeout(ctx, errors, timeout) {
+    scheduleTask2(ctx, () => {
+      log5.warn("Notarization timeout", {
+        timeout,
+        peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
+      }, {
+        F: __dxlog_file7,
+        L: 340,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      void ctx.dispose();
+      errors.throw(new TimeoutError(timeout, "Notarization timed out"));
+    }, timeout);
+  }
+};
+_ts_decorate2([
+  logInfo2
+], NotarizationPlugin.prototype, "_spaceId", void 0);
+var handleEdgeError = (error) => {
+  if (!(error instanceof EdgeCallFailedError) || error.errorData) {
+    log5.catch(error, void 0, {
+      F: __dxlog_file7,
+      L: 354,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  } else {
+    log5.info("Edge notarization failure", {
+      reason: error.reason
+    }, {
+      F: __dxlog_file7,
+      L: 356,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+  }
 };
 var NotarizationTeleportExtension = class extends RpcExtension {
   constructor(_params) {
@@ -1727,7 +1924,7 @@ var DefaultSpaceStateMachine = class {
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
 import { Event as Event4, synchronized, trackLeaks } from "@dxos/async";
 import { PropertiesType } from "@dxos/client-protocol";
-import { LifecycleState, Resource as Resource3, cancelWithContext } from "@dxos/context";
+import { LifecycleState, Resource as Resource4, cancelWithContext } from "@dxos/context";
 import { createAdmissionCredentials, getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
 import { convertLegacyReferences as convertLegacyReferences2, findInlineObjectOfType as findInlineObjectOfType2, AuthStatus, CredentialServerExtension } from "@dxos/echo-pipeline";
 import { LEGACY_TYPE_PROPERTIES, SpaceDocVersion as SpaceDocVersion2, encodeReference } from "@dxos/echo-protocol";
@@ -1738,6 +1935,7 @@ import { PublicKey as PublicKey5 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
 import { AlreadyJoinedError, trace as Trace } from "@dxos/protocols";
 import { Invitation, SpaceState } from "@dxos/protocols/proto/dxos/client/services";
+import { EdgeReplicationSetting } from "@dxos/protocols/proto/dxos/echo/metadata";
 import { SpaceMember as SpaceMember3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { Gossip, Presence } from "@dxos/teleport-extension-gossip";
 import { trace } from "@dxos/tracing";
@@ -1814,7 +2012,7 @@ var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts
-function _ts_decorate(decorators, target, key, desc) {
+function _ts_decorate3(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -1824,13 +2022,14 @@ var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/sr
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DEFAULT_SPACE_KEY = "__DEFAULT__";
-var DataSpaceManager = class extends Resource3 {
+var DataSpaceManager = class extends Resource4 {
   constructor(params) {
     super();
     this.updated = new Event4();
     this._spaces = new ComplexMap4(PublicKey5.hash);
     this._instanceId = PublicKey5.random().toHex();
     this._edgeConnection = void 0;
+    this._edgeHttpClient = void 0;
     this._edgeFeatures = void 0;
     this._meshReplicator = void 0;
     this._echoEdgeReplicator = void 0;
@@ -1846,6 +2045,7 @@ var DataSpaceManager = class extends Resource3 {
     this._edgeConnection = params.edgeConnection;
     this._edgeFeatures = params.edgeFeatures;
     this._echoEdgeReplicator = params.echoEdgeReplicator;
+    this._edgeHttpClient = params.edgeHttpClient;
     this._runtimeParams = params.runtimeParams;
     trace.diagnostic({
       id: "spaces",
@@ -1877,7 +2077,7 @@ var DataSpaceManager = class extends Resource3 {
   async _open() {
     log7("open", void 0, {
       F: __dxlog_file9,
-      L: 195,
+      L: 198,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1885,7 +2085,7 @@ var DataSpaceManager = class extends Resource3 {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 196,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1893,7 +2093,7 @@ var DataSpaceManager = class extends Resource3 {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file9,
-      L: 197,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1903,7 +2103,7 @@ var DataSpaceManager = class extends Resource3 {
           spaceMetadata
         }, {
           F: __dxlog_file9,
-          L: 201,
+          L: 204,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1914,7 +2114,7 @@ var DataSpaceManager = class extends Resource3 {
           err
         }, {
           F: __dxlog_file9,
-          L: 204,
+          L: 207,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1925,7 +2125,7 @@ var DataSpaceManager = class extends Resource3 {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 210,
+      L: 213,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1933,7 +2133,7 @@ var DataSpaceManager = class extends Resource3 {
   async _close() {
     log7("close", void 0, {
       F: __dxlog_file9,
-      L: 215,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1948,7 +2148,7 @@ var DataSpaceManager = class extends Resource3 {
   async createSpace() {
     invariant5(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file9,
-      L: 227,
+      L: 230,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -1969,7 +2169,7 @@ var DataSpaceManager = class extends Resource3 {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 239,
+      L: 242,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1981,7 +2181,7 @@ var DataSpaceManager = class extends Resource3 {
     const memberCredential = credentials[1];
     invariant5(getCredentialAssertion2(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 249,
+      L: 252,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2013,7 +2213,7 @@ var DataSpaceManager = class extends Resource3 {
           spaceId: space.id
         }, {
           F: __dxlog_file9,
-          L: 274,
+          L: 277,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2048,7 +2248,7 @@ var DataSpaceManager = class extends Resource3 {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     invariant5(automergeIndex, void 0, {
       F: __dxlog_file9,
-      L: 307,
+      L: 310,
       S: this,
       A: [
         "automergeIndex",
@@ -2065,13 +2265,13 @@ var DataSpaceManager = class extends Resource3 {
       opts
     }, {
       F: __dxlog_file9,
-      L: 316,
+      L: 319,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant5(this._lifecycleState === LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file9,
-      L: 317,
+      L: 320,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2080,7 +2280,7 @@ var DataSpaceManager = class extends Resource3 {
     });
     invariant5(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file9,
-      L: 318,
+      L: 321,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -2104,7 +2304,7 @@ var DataSpaceManager = class extends Resource3 {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     invariant5(space, void 0, {
       F: __dxlog_file9,
-      L: 338,
+      L: 341,
       S: this,
       A: [
         "space",
@@ -2117,7 +2317,7 @@ var DataSpaceManager = class extends Resource3 {
     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: 357,
+      L: 360,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2127,7 +2327,7 @@ var DataSpaceManager = class extends Resource3 {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant5(getCredentialAssertion2(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 359,
+      L: 362,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2161,12 +2361,35 @@ var DataSpaceManager = class extends Resource3 {
       }
     });
   }
+  async setSpaceEdgeReplicationSetting(spaceKey, setting) {
+    const space = this._spaces.get(spaceKey);
+    invariant5(space, "Space not found.", {
+      F: __dxlog_file9,
+      L: 399,
+      S: this,
+      A: [
+        "space",
+        "'Space not found.'"
+      ]
+    });
+    await this._metadataStore.setSpaceEdgeReplicationSetting(spaceKey, setting);
+    if (space.isOpen) {
+      switch (setting) {
+        case EdgeReplicationSetting.DISABLED:
+          await this._echoEdgeReplicator?.disconnectFromSpace(space.id);
+          break;
+        case EdgeReplicationSetting.ENABLED:
+          await this._echoEdgeReplicator?.connectToSpace(space.id);
+          break;
+      }
+    }
+  }
   async _constructSpace(metadata) {
     log7("construct space", {
       metadata
     }, {
       F: __dxlog_file9,
-      L: 395,
+      L: 416,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2210,7 +2433,7 @@ var DataSpaceManager = class extends Resource3 {
             err
           }, {
             F: __dxlog_file9,
-            L: 437,
+            L: 458,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2220,7 +2443,7 @@ var DataSpaceManager = class extends Resource3 {
       onAuthFailure: () => {
         log7.warn("auth failure", void 0, {
           F: __dxlog_file9,
-          L: 442,
+          L: 463,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2253,7 +2476,7 @@ var DataSpaceManager = class extends Resource3 {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 469,
+            L: 490,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2264,7 +2487,7 @@ var DataSpaceManager = class extends Resource3 {
             open: this._lifecycleState === LifecycleState.OPEN
           }, {
             F: __dxlog_file9,
-            L: 472,
+            L: 493,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2283,7 +2506,7 @@ var DataSpaceManager = class extends Resource3 {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 480,
+            L: 501,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2291,13 +2514,20 @@ var DataSpaceManager = class extends Resource3 {
       },
       cache: metadata.cache,
       edgeConnection: this._edgeConnection,
+      edgeHttpClient: this._edgeHttpClient,
       edgeFeatures: this._edgeFeatures
     });
     dataSpace.postOpen.append(async () => {
-      await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
+      const setting = dataSpace.getEdgeReplicationSetting();
+      if (setting === EdgeReplicationSetting.ENABLED) {
+        await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
+      }
     });
     dataSpace.preClose.append(async () => {
-      await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
+      const setting = dataSpace.getEdgeReplicationSetting();
+      if (setting === EdgeReplicationSetting.ENABLED) {
+        await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
+      }
     });
     presence.newPeer.on((peerState) => {
       if (dataSpace.state === SpaceState.SPACE_READY) {
@@ -2317,7 +2547,7 @@ var DataSpaceManager = class extends Resource3 {
         space: space.key
       }, {
         F: __dxlog_file9,
-        L: 511,
+        L: 539,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2350,7 +2580,7 @@ var DataSpaceManager = class extends Resource3 {
       closedSessions
     }, {
       F: __dxlog_file9,
-      L: 537,
+      L: 565,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2365,7 +2595,7 @@ var DataSpaceManager = class extends Resource3 {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file9,
-          L: 551,
+          L: 579,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2409,19 +2639,19 @@ var DataSpaceManager = class extends Resource3 {
     await Promise.all(tasks);
   }
 };
-_ts_decorate([
+_ts_decorate3([
   synchronized
 ], DataSpaceManager.prototype, "_open", null);
-_ts_decorate([
+_ts_decorate3([
   synchronized
 ], DataSpaceManager.prototype, "_close", null);
-_ts_decorate([
+_ts_decorate3([
   synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
-_ts_decorate([
+_ts_decorate3([
   synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
-DataSpaceManager = _ts_decorate([
+DataSpaceManager = _ts_decorate3([
   trackLeaks("open", "close")
 ], DataSpaceManager);
 
@@ -2450,7 +2680,7 @@ var SpacesServiceImpl = class {
     await this._updateMetrics();
     return this._serializeSpace(space);
   }
-  async updateSpace({ spaceKey, state }) {
+  async updateSpace({ spaceKey, state, edgeReplication }) {
     const dataSpaceManager = await this._getDataSpaceManager();
     const space = dataSpaceManager.spaces.get(spaceKey) ?? raise(new SpaceNotFoundError(spaceKey));
     if (state) {
@@ -2465,6 +2695,9 @@ var SpacesServiceImpl = class {
           throw new ApiError("Invalid space state");
       }
     }
+    if (edgeReplication !== void 0) {
+      await dataSpaceManager.setSpaceEdgeReplicationSetting(spaceKey, edgeReplication);
+    }
   }
   async updateMemberRole(request) {
     const identity = this._requireIdentity();
@@ -2481,7 +2714,7 @@ var SpacesServiceImpl = class {
     const credentials = await createAdmissionCredentials2(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     invariant6(credentials[0].credential, void 0, {
       F: __dxlog_file10,
-      L: 102,
+      L: 106,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2491,7 +2724,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant6(getCredentialAssertion3(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file10,
-      L: 104,
+      L: 108,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2509,7 +2742,7 @@ var SpacesServiceImpl = class {
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file10,
-          L: 115,
+          L: 119,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2601,7 +2834,7 @@ var SpacesServiceImpl = class {
       } else {
         invariant6(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file10,
-          L: 213,
+          L: 217,
           S: this,
           A: [
             "!credential.id",
@@ -2610,7 +2843,7 @@ var SpacesServiceImpl = class {
         });
         invariant6(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file10,
-          L: 214,
+          L: 218,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -2620,7 +2853,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant6(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file10,
-          L: 216,
+          L: 220,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -2670,7 +2903,7 @@ var SpacesServiceImpl = class {
     const assertion = getCredentialAssertion3(credential);
     invariant6(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file10,
-      L: 250,
+      L: 254,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2680,7 +2913,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     invariant6(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
       F: __dxlog_file10,
-      L: 252,
+      L: 256,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -2742,7 +2975,8 @@ var SpacesServiceImpl = class {
       }),
       creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
-      metrics: space.metrics
+      metrics: space.metrics,
+      edgeReplication: space.getEdgeReplicationSetting()
     };
   }
   _requireIdentity() {
@@ -2766,7 +3000,7 @@ var SpacesServiceImpl = class {
 var getChannelId = (channel) => `user-channel/${channel}`;
 
 // packages/sdk/client-services/src/packlets/identity/identity.ts
-function _ts_decorate2(decorators, target, key, desc) {
+function _ts_decorate4(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -2875,6 +3109,9 @@ var Identity = class {
   get presence() {
     return this._presence;
   }
+  get signer() {
+    return this._signer;
+  }
   /**
   * Issues credentials as identity.
   * Requires identity to be ready.
@@ -2882,7 +3119,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     invariant7(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file11,
-      L: 185,
+      L: 189,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -2926,7 +3163,7 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file11,
-      L: 210,
+      L: 214,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2967,20 +3204,20 @@ var Identity = class {
     })));
   }
 };
-_ts_decorate2([
+_ts_decorate4([
   trace3.span()
 ], Identity.prototype, "open", null);
-_ts_decorate2([
+_ts_decorate4([
   trace3.span()
 ], Identity.prototype, "close", null);
-Identity = _ts_decorate2([
+Identity = _ts_decorate4([
   trace3.resource()
 ], Identity);
 
 // packages/sdk/client-services/src/packlets/identity/identity-manager.ts
 import platform from "platform";
 import { Event as Event6 } from "@dxos/async";
-import { Context as Context5 } from "@dxos/context";
+import { Context as Context4 } from "@dxos/context";
 import { createCredentialSignerWithKey as createCredentialSignerWithKey2, CredentialGenerator } from "@dxos/credentials";
 import { invariant as invariant8 } from "@dxos/invariant";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
@@ -2992,7 +3229,7 @@ import { Gossip as Gossip2, Presence as Presence2 } from "@dxos/teleport-extensi
 import { Timeframe as Timeframe3 } from "@dxos/timeframe";
 import { trace as Trace2 } from "@dxos/tracing";
 import { isNode, deferFunction as deferFunction2 } from "@dxos/util";
-function _ts_decorate3(decorators, target, key, desc) {
+function _ts_decorate5(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -3062,7 +3299,7 @@ var IdentityManager = class {
     });
   }
   async close() {
-    await this._identity?.close(new Context5(void 0, {
+    await this._identity?.close(new Context4(void 0, {
       F: __dxlog_file12,
       L: 140
     }));
@@ -3095,7 +3332,7 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open(new Context5(void 0, {
+    await identity.open(new Context4(void 0, {
       F: __dxlog_file12,
       L: 161
     }));
@@ -3224,7 +3461,7 @@ var IdentityManager = class {
       }
     };
     const identity = await this._constructIdentity(identityRecord);
-    await identity.open(new Context5(void 0, {
+    await identity.open(new Context4(void 0, {
       F: __dxlog_file12,
       L: 268
     }));
@@ -3443,19 +3680,19 @@ var IdentityManager = class {
     });
   }
 };
-_ts_decorate3([
+_ts_decorate5([
   Trace2.span({
     showInBrowserTimeline: true
   })
 ], IdentityManager.prototype, "open", null);
-IdentityManager = _ts_decorate3([
+IdentityManager = _ts_decorate5([
   Trace2.resource()
 ], IdentityManager);
 
 // packages/sdk/client-services/src/packlets/identity/identity-service.ts
 import { Trigger as Trigger3, sleep as sleep2 } from "@dxos/async";
 import { Stream as Stream8 } from "@dxos/codec-protobuf";
-import { Resource as Resource4 } from "@dxos/context";
+import { Resource as Resource5 } from "@dxos/context";
 import { signPresentation } from "@dxos/credentials";
 import { todo } from "@dxos/debug";
 import { invariant as invariant9 } from "@dxos/invariant";
@@ -3464,7 +3701,7 @@ import { SpaceState as SpaceState3 } from "@dxos/protocols/proto/dxos/client/ser
 import { safeAwaitAll } from "@dxos/util";
 var __dxlog_file13 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/identity-service.ts";
 var DEFAULT_SPACE_SEARCH_TIMEOUT = 1e4;
-var IdentityServiceImpl = class extends Resource4 {
+var IdentityServiceImpl = class extends Resource5 {
   constructor(_identityManager, _keyring, _dataSpaceManagerProvider, _createIdentity, _onProfileUpdate) {
     super();
     this._identityManager = _identityManager;
@@ -3608,7 +3845,7 @@ var IdentityServiceImpl = class extends Resource4 {
 };
 
 // packages/sdk/client-services/src/packlets/spaces/data-space.ts
-function _ts_decorate4(decorators, target, key, desc) {
+function _ts_decorate6(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -3679,11 +3916,10 @@ function _using_ctx2() {
 var __dxlog_file14 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
-    this._ctx = new Context6(void 0, {
+    this._ctx = new Context5(void 0, {
       F: __dxlog_file14,
-      L: 94
+      L: 95
     });
-    this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
     this._edgeFeedReplicator = void 0;
     // TODO(dmaretskyi): Move into Space?
@@ -3712,6 +3948,11 @@ var DataSpace = class {
     this._signingContext = params.signingContext;
     this._callbacks = params.callbacks ?? {};
     this._echoHost = params.echoHost;
+    this._notarizationPlugin = new NotarizationPlugin({
+      spaceId: this._inner.id,
+      edgeClient: params.edgeHttpClient,
+      edgeFeatures: params.edgeFeatures
+    });
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => new ComplexSet3(PublicKey8.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== SpaceMember5.Role.REMOVED).map((member) => member.key)),
       update: this._inner.stateUpdate,
@@ -3729,7 +3970,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file14,
-      L: 164,
+      L: 170,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3786,9 +4027,9 @@ var DataSpace = class {
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.append(this._onFeedAdded);
     }
-    await this._inner.open(new Context6(void 0, {
+    await this._inner.open(new Context5(void 0, {
       F: __dxlog_file14,
-      L: 238
+      L: 244
     }));
     await this._edgeFeedReplicator?.open();
     this._state = SpaceState4.SPACE_CONTROL_ONLY;
@@ -3796,7 +4037,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file14,
-      L: 243,
+      L: 249,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3816,14 +4057,14 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file14,
-      L: 262,
+      L: 268,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
-    this._ctx = new Context6(void 0, {
+    this._ctx = new Context5(void 0, {
       F: __dxlog_file14,
-      L: 264
+      L: 270
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -3856,7 +4097,7 @@ var DataSpace = class {
         if (err instanceof CancelledError || err instanceof ContextDisposedError) {
           log12("data pipeline initialization cancelled", err, {
             F: __dxlog_file14,
-            L: 302,
+            L: 308,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3864,7 +4105,7 @@ var DataSpace = class {
         }
         log12.error("Error initializing data pipeline", err, {
           F: __dxlog_file14,
-          L: 306,
+          L: 312,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3873,7 +4114,7 @@ var DataSpace = class {
           state: SpaceState4[this._state]
         }, {
           F: __dxlog_file14,
-          L: 308,
+          L: 314,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3893,15 +4134,39 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file14,
-      L: 324,
+      L: 330,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    log12("initializing control pipeline", void 0, {
+      F: __dxlog_file14,
+      L: 332,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
     await sleep3(1);
     const ready = this.stateUpdate.waitForCondition(() => this._state === SpaceState4.SPACE_READY);
+    log12("initializing automerge root", void 0, {
+      F: __dxlog_file14,
+      L: 340,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     this._automergeSpaceState.startProcessingRootDocs();
+    log12("waiting for space to be ready", void 0, {
+      F: __dxlog_file14,
+      L: 344,
+      S: this,
+      C: (f, a) => f(...a)
+    });
     await ready;
+    log12("space is ready", void 0, {
+      F: __dxlog_file14,
+      L: 346,
+      S: this,
+      C: (f, a) => f(...a)
+    });
   }
   async _enterReadyState() {
     await this._callbacks.beforeReady?.();
@@ -3910,7 +4175,7 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file14,
-      L: 343,
+      L: 353,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3920,13 +4185,14 @@ var DataSpace = class {
   async _initializeAndReadControlPipeline() {
     await this._inner.controlPipeline.state.waitUntilReachedTargetTimeframe({
       ctx: this._ctx,
+      timeout: 1e4,
       breakOnStall: false
     });
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
     log12("writable feeds created", void 0, {
       F: __dxlog_file14,
-      L: 359,
+      L: 370,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3975,11 +4241,35 @@ var DataSpace = class {
       }));
     }
     if (credentials.length > 0) {
-      await this.notarizationPlugin.notarize({
-        ctx: this._ctx,
-        credentials,
-        timeout: 0
-      });
+      try {
+        log12("will notarize credentials for feed admission", {
+          count: credentials.length
+        }, {
+          F: __dxlog_file14,
+          L: 428,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        await this.notarizationPlugin.notarize({
+          ctx: this._ctx,
+          credentials,
+          timeout: 0
+        });
+        log12("credentials notarized", void 0, {
+          F: __dxlog_file14,
+          L: 432,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      } catch (err) {
+        log12.error("error notarizing credentials for feed admission", err, {
+          F: __dxlog_file14,
+          L: 434,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        throw err;
+      }
       await this._metadataStore.setWritableFeedKeys(this.key, this.inner.controlFeedKey, this.inner.dataFeedKey);
     }
   }
@@ -3989,7 +4279,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file14,
-      L: 425,
+      L: 444,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4041,7 +4331,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file14,
-          L: 468,
+          L: 487,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4131,58 +4421,61 @@ var DataSpace = class {
       state: SpaceState4[this._state]
     }, {
       F: __dxlog_file14,
-      L: 550,
+      L: 569,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
   }
+  getEdgeReplicationSetting() {
+    return this._metadataStore.getSpaceEdgeReplicationSetting(this.key);
+  }
 };
-_ts_decorate4([
+_ts_decorate6([
   trace5.info()
 ], DataSpace.prototype, "_inner", void 0);
-_ts_decorate4([
+_ts_decorate6([
   trace5.info()
 ], DataSpace.prototype, "id", null);
-_ts_decorate4([
+_ts_decorate6([
   trace5.info()
 ], DataSpace.prototype, "key", null);
-_ts_decorate4([
+_ts_decorate6([
   trace5.info({
     enum: SpaceState4
   })
 ], DataSpace.prototype, "state", null);
-_ts_decorate4([
+_ts_decorate6([
   trace5.info({
     depth: null
   })
 ], DataSpace.prototype, "_automergeInfo", null);
-_ts_decorate4([
+_ts_decorate6([
   synchronized2
 ], DataSpace.prototype, "open", null);
-_ts_decorate4([
+_ts_decorate6([
   synchronized2
 ], DataSpace.prototype, "close", null);
-_ts_decorate4([
+_ts_decorate6([
   trace5.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "initializeDataPipeline", null);
-_ts_decorate4([
+_ts_decorate6([
   trace5.span({
     showInBrowserTimeline: true
   })
 ], DataSpace.prototype, "_initializeAndReadControlPipeline", null);
-_ts_decorate4([
+_ts_decorate6([
   timed(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
-_ts_decorate4([
+_ts_decorate6([
   synchronized2
 ], DataSpace.prototype, "activate", null);
-_ts_decorate4([
+_ts_decorate6([
   synchronized2
 ], DataSpace.prototype, "deactivate", null);
-DataSpace = _ts_decorate4([
+DataSpace = _ts_decorate6([
   trackLeaks2("open", "close"),
   trace5.resource()
 ], DataSpace);
@@ -4316,7 +4609,7 @@ import { ComplexSet as ComplexSet5 } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-guest-extenstion.ts
 import { Trigger as Trigger4 } from "@dxos/async";
-import { cancelWithContext as cancelWithContext4, Context as Context7 } from "@dxos/context";
+import { cancelWithContext as cancelWithContext4, Context as Context6 } from "@dxos/context";
 import { invariant as invariant11 } from "@dxos/invariant";
 import { log as log13 } from "@dxos/log";
 import { InvalidInvitationExtensionRoleError } from "@dxos/protocols";
@@ -4358,7 +4651,7 @@ var InvitationGuestExtension = class extends RpcExtension2 {
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
-    this._ctx = new Context7(void 0, {
+    this._ctx = new Context6(void 0, {
       F: __dxlog_file16,
       L: 34
     });
@@ -4470,7 +4763,7 @@ var InvitationGuestExtension = class extends RpcExtension2 {
 
 // packages/sdk/client-services/src/packlets/invitations/invitation-host-extension.ts
 import { Trigger as Trigger5, scheduleTask as scheduleTask5 } from "@dxos/async";
-import { cancelWithContext as cancelWithContext5, Context as Context8 } from "@dxos/context";
+import { cancelWithContext as cancelWithContext5, Context as Context7 } from "@dxos/context";
 import { randomBytes, verify } from "@dxos/crypto";
 import { invariant as invariant12, InvariantViolation } from "@dxos/invariant";
 import { PublicKey as PublicKey9 } from "@dxos/keys";
@@ -4495,7 +4788,7 @@ var InvitationHostExtension = class extends RpcExtension3 {
     });
     this._invitationFlowMutex = _invitationFlowMutex;
     this._callbacks = _callbacks;
-    this._ctx = new Context8(void 0, {
+    this._ctx = new Context7(void 0, {
       F: __dxlog_file17,
       L: 53
     });
@@ -5870,7 +6163,7 @@ var SpaceInvitationProtocol = class {
 // packages/sdk/client-services/src/packlets/invitations/invitations-manager.ts
 import { Event as Event8, PushStream, TimeoutError as TimeoutError3, Trigger as Trigger6 } from "@dxos/async";
 import { AuthenticatingInvitation, AUTHENTICATION_CODE_LENGTH, CancellableInvitation, INVITATION_TIMEOUT as INVITATION_TIMEOUT2 } from "@dxos/client-protocol";
-import { Context as Context9 } from "@dxos/context";
+import { Context as Context8 } from "@dxos/context";
 import { generatePasscode } from "@dxos/credentials";
 import { hasInvitationExpired } from "@dxos/echo-pipeline";
 import { invariant as invariant16 } from "@dxos/invariant";
@@ -6102,7 +6395,7 @@ var InvitationsManager = class {
   }
   _createObservableInvitation(handler, invitation) {
     const stream = new PushStream();
-    const ctx = new Context9({
+    const ctx = new Context8({
       onError: (err) => {
         stream.error(err);
         void ctx.dispose();
@@ -6142,7 +6435,7 @@ var InvitationsManager = class {
   _createObservableAcceptingInvitation(handler, initialState) {
     const otpEnteredTrigger = new Trigger6();
     const stream = new PushStream();
-    const ctx = new Context9({
+    const ctx = new Context8({
       onError: (err) => {
         if (err instanceof TimeoutError3) {
           log18("timeout", {
@@ -6241,8 +6534,8 @@ var InvitationsManager = class {
 // packages/sdk/client-services/src/packlets/locks/node.ts
 import { invariant as invariant17 } from "@dxos/invariant";
 import { LockFile } from "@dxos/lock-file";
-import { log as log19, logInfo } from "@dxos/log";
-function _ts_decorate5(decorators, target, key, desc) {
+import { log as log19, logInfo as logInfo3 } from "@dxos/log";
+function _ts_decorate7(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -6288,8 +6581,8 @@ var Lock = class {
     await LockFile.release(this._fileHandle);
   }
 };
-_ts_decorate5([
-  logInfo
+_ts_decorate7([
+  logInfo3
 ], Lock.prototype, "lockKey", null);
 var isLocked = (lockPath) => LockFile.isLocked(lockPath);
 
@@ -6298,7 +6591,7 @@ import { Stream as Stream10 } from "@dxos/codec-protobuf";
 import { raise as raise2 } from "@dxos/debug";
 import { parseMethodName, RpcPeer } from "@dxos/rpc";
 import { MapCounter, trace as trace8 } from "@dxos/tracing";
-function _ts_decorate6(decorators, target, key, desc) {
+function _ts_decorate8(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -6360,22 +6653,23 @@ var ClientRpcServer = class {
     return this._handlerCache.get(serviceName);
   }
 };
-_ts_decorate6([
+_ts_decorate8([
   trace8.metricsCounter()
 ], ClientRpcServer.prototype, "_callMetrics", void 0);
-_ts_decorate6([
+_ts_decorate8([
   trace8.info()
 ], ClientRpcServer.prototype, "_services", null);
-ClientRpcServer = _ts_decorate6([
+ClientRpcServer = _ts_decorate8([
   trace8.resource()
 ], ClientRpcServer);
 
 // packages/sdk/client-services/src/packlets/services/service-context.ts
-import { Trigger as Trigger7 } from "@dxos/async";
-import { Context as Context10, Resource as Resource5 } from "@dxos/context";
+import { Mutex as Mutex4, scheduleMicroTask as scheduleMicroTask3, Trigger as Trigger7 } from "@dxos/async";
+import { Context as Context9, Resource as Resource6 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion5 } from "@dxos/credentials";
-import { failUndefined as failUndefined2 } from "@dxos/debug";
+import { failUndefined as failUndefined2, warnAfterTimeout as warnAfterTimeout2 } from "@dxos/debug";
 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 invariant18 } from "@dxos/invariant";
 import { Keyring } from "@dxos/keyring";
@@ -6386,23 +6680,87 @@ import { Invitation as Invitation8 } from "@dxos/protocols/proto/dxos/client/ser
 import { BlobStore } from "@dxos/teleport-extension-object-sync";
 import { trace as Trace3 } from "@dxos/tracing";
 import { safeInstanceof } from "@dxos/util";
-function _ts_decorate7(decorators, target, key, desc) {
+function _ts_decorate9(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
+function _using_ctx3() {
+  var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
+    var err = new Error();
+    err.name = "SuppressedError";
+    err.suppressed = suppressed;
+    err.error = error;
+    return err;
+  }, empty = {}, stack = [];
+  function using(isAwait, value) {
+    if (value != null) {
+      if (Object(value) !== value) {
+        throw new TypeError("using declarations can only be used with objects, functions, null, or undefined.");
+      }
+      if (isAwait) {
+        var dispose = value[Symbol.asyncDispose || Symbol.for("Symbol.asyncDispose")];
+      }
+      if (dispose == null) {
+        dispose = value[Symbol.dispose || Symbol.for("Symbol.dispose")];
+      }
+      if (typeof dispose !== "function") {
+        throw new TypeError(`Property [Symbol.dispose] is not a function.`);
+      }
+      stack.push({
+        v: value,
+        d: dispose,
+        a: isAwait
+      });
+    } else if (isAwait) {
+      stack.push({
+        d: value,
+        a: isAwait
+      });
+    }
+    return value;
+  }
+  return {
+    e: empty,
+    u: using.bind(null, false),
+    a: using.bind(null, true),
+    d: function() {
+      var error = this.e;
+      function next() {
+        while (resource = stack.pop()) {
+          try {
+            var resource, disposalResult = resource.d && resource.d.call(resource.v);
+            if (resource.a) {
+              return Promise.resolve(disposalResult).then(next, err);
+            }
+          } catch (e) {
+            return err(e);
+          }
+        }
+        if (error !== empty) throw error;
+      }
+      function err(e) {
+        error = error !== empty ? new _disposeSuppressedError(error, e) : e;
+        return next();
+      }
+      return next();
+    }
+  };
+}
 var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class extends Resource5 {
-  constructor(storage, level, networkManager, signalManager, _edgeConnection, _runtimeParams, _edgeFeatures) {
+var ServiceContext = class extends Resource6 {
+  constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtimeParams, _edgeFeatures) {
     super();
     this.storage = storage;
     this.level = level;
     this.networkManager = networkManager;
     this.signalManager = signalManager;
     this._edgeConnection = _edgeConnection;
+    this._edgeHttpClient = _edgeHttpClient;
     this._runtimeParams = _runtimeParams;
     this._edgeFeatures = _edgeFeatures;
+    this._edgeIdentityUpdateMutex = new Mutex4();
     this.initialized = new Trigger7();
     this._meshReplicator = void 0;
     this._echoEdgeReplicator = void 0;
@@ -6440,23 +6798,42 @@ var ServiceContext = class extends Resource5 {
       callbacks: {
         onIdentityConstruction: (identity) => {
           if (this._edgeConnection) {
-            log20.info("Setting identity on edge connection", {
-              identity: identity.identityKey.toHex(),
-              oldIdentity: this._edgeConnection.identityKey,
-              swarms: this.networkManager.topics
-            }, {
-              F: __dxlog_file23,
-              L: 140,
-              S: this,
-              C: (f, a) => f(...a)
-            });
-            this._edgeConnection.setIdentity({
-              peerKey: identity.deviceKey.toHex(),
-              identityKey: identity.identityKey.toHex()
-            });
-            this.networkManager.setPeerInfo({
-              identityKey: identity.identityKey.toHex(),
-              peerKey: identity.deviceKey.toHex()
+            scheduleMicroTask3(this._ctx, async () => {
+              try {
+                var _usingCtx = _using_ctx3();
+                const _ = _usingCtx.u(await this._edgeIdentityUpdateMutex.acquire());
+                log20.info("Setting identity on edge connection", {
+                  identity: identity.identityKey.toHex(),
+                  oldIdentity: this._edgeConnection.identityKey,
+                  swarms: this.networkManager.topics
+                }, {
+                  F: __dxlog_file23,
+                  L: 147,
+                  S: this,
+                  C: (f, a) => f(...a)
+                });
+                await warnAfterTimeout2(1e4, "Waiting for identity to be ready for edge connection", async () => {
+                  await identity.ready();
+                });
+                invariant18(identity.deviceCredentialChain, void 0, {
+                  F: __dxlog_file23,
+                  L: 157,
+                  S: this,
+                  A: [
+                    "identity.deviceCredentialChain",
+                    ""
+                  ]
+                });
+                this._edgeConnection.setIdentity(await createChainEdgeIdentity(identity.signer, identity.identityKey, identity.deviceKey, identity.deviceCredentialChain, []));
+                this.networkManager.setPeerInfo({
+                  identityKey: identity.identityKey.toHex(),
+                  peerKey: identity.deviceKey.toHex()
+                });
+              } catch (_) {
+                _usingCtx.e = _;
+              } finally {
+                _usingCtx.d();
+              }
             });
           }
         }
@@ -6482,7 +6859,7 @@ var ServiceContext = class extends Resource5 {
     await this._checkStorageVersion();
     log20("opening...", void 0, {
       F: __dxlog_file23,
-      L: 198,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6490,11 +6867,14 @@ var ServiceContext = class extends Resource5 {
       id: this._instanceId
     }), {
       F: __dxlog_file23,
-      L: 199,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
-    await this._edgeConnection?.open();
+    if (this._edgeConnection) {
+      this._edgeConnection.setIdentity(await createEphemeralEdgeIdentity());
+      await this._edgeConnection.open();
+    }
     await this.signalManager.open();
     await this.networkManager.open();
     await this.echoHost.open(ctx);
@@ -6515,7 +6895,7 @@ var ServiceContext = class extends Resource5 {
       count: loadedInvitations.invitations?.length
     }, {
       F: __dxlog_file23,
-      L: 222,
+      L: 245,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6523,13 +6903,13 @@ var ServiceContext = class extends Resource5 {
       id: this._instanceId
     }), {
       F: __dxlog_file23,
-      L: 224,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
     log20("opened", void 0, {
       F: __dxlog_file23,
-      L: 225,
+      L: 248,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6537,7 +6917,7 @@ var ServiceContext = class extends Resource5 {
   async _close(ctx) {
     log20("closing...", void 0, {
       F: __dxlog_file23,
-      L: 229,
+      L: 252,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6555,16 +6935,16 @@ var ServiceContext = class extends Resource5 {
     await this._edgeConnection?.close();
     log20("closed", void 0, {
       F: __dxlog_file23,
-      L: 244,
+      L: 267,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize(new Context10(void 0, {
+    await this._initialize(new Context9(void 0, {
       F: __dxlog_file23,
-      L: 249
+      L: 272
     }));
     return identity;
   }
@@ -6572,7 +6952,7 @@ var ServiceContext = class extends Resource5 {
     const factory = this._handlerFactories.get(invitation.kind);
     invariant18(factory, `Unknown invitation kind: ${invitation.kind}`, {
       F: __dxlog_file23,
-      L: 255,
+      L: 278,
       S: this,
       A: [
         "factory",
@@ -6591,9 +6971,9 @@ var ServiceContext = class extends Resource5 {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new Context10(void 0, {
+    await this._initialize(new Context9(void 0, {
       F: __dxlog_file23,
-      L: 271
+      L: 294
     }));
     return identity;
   }
@@ -6607,7 +6987,7 @@ var ServiceContext = class extends Resource5 {
   async _initialize(ctx) {
     log20("initializing spaces...", void 0, {
       F: __dxlog_file23,
-      L: 286,
+      L: 309,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6634,6 +7014,7 @@ var ServiceContext = class extends Resource5 {
       echoHost: this.echoHost,
       invitationsManager: this.invitationsManager,
       edgeConnection: this._edgeConnection,
+      edgeHttpClient: this._edgeHttpClient,
       echoEdgeReplicator: this._echoEdgeReplicator,
       meshReplicator: this._meshReplicator,
       runtimeParams: this._runtimeParams,
@@ -6643,7 +7024,7 @@ var ServiceContext = class extends Resource5 {
     this._handlerFactories.set(Invitation8.Kind.SPACE, (invitation) => {
       invariant18(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
         F: __dxlog_file23,
-        L: 315,
+        L: 339,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -6667,7 +7048,7 @@ var ServiceContext = class extends Resource5 {
             details: assertion
           }, {
             F: __dxlog_file23,
-            L: 331,
+            L: 355,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6678,7 +7059,7 @@ var ServiceContext = class extends Resource5 {
             details: assertion
           }, {
             F: __dxlog_file23,
-            L: 335,
+            L: 359,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6689,7 +7070,7 @@ var ServiceContext = class extends Resource5 {
             details: assertion
           }, {
             F: __dxlog_file23,
-            L: 340,
+            L: 364,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6700,7 +7081,7 @@ var ServiceContext = class extends Resource5 {
         } catch (err) {
           log20.catch(err, void 0, {
             F: __dxlog_file23,
-            L: 346,
+            L: 370,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6710,13 +7091,13 @@ var ServiceContext = class extends Resource5 {
     await identity.space.spaceState.addCredentialProcessor(this._deviceSpaceSync);
   }
 };
-_ts_decorate7([
+_ts_decorate9([
   Trace3.span()
 ], ServiceContext.prototype, "_open", null);
-_ts_decorate7([
+_ts_decorate9([
   Trace3.span()
 ], ServiceContext.prototype, "_initialize", null);
-ServiceContext = _ts_decorate7([
+ServiceContext = _ts_decorate9([
   safeInstanceof("dxos.client-services.ServiceContext"),
   Trace3.resource()
 ], ServiceContext);
@@ -6981,8 +7362,8 @@ var importProfileData = async ({ storage, level }, archive) => {
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 import { Event as Event10, synchronized as synchronized3 } from "@dxos/async";
 import { clientServiceBundle } from "@dxos/client-protocol";
-import { Context as Context11 } from "@dxos/context";
-import { EdgeClient } from "@dxos/edge-client";
+import { Context as Context10 } from "@dxos/context";
+import { EdgeClient, EdgeHttpClient, createStubEdgeIdentity } from "@dxos/edge-client";
 import { invariant as invariant21 } from "@dxos/invariant";
 import { PublicKey as PublicKey17 } from "@dxos/keys";
 import { log as log23 } from "@dxos/log";
@@ -7373,7 +7754,7 @@ var SystemServiceImpl = class {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
-function _ts_decorate8(decorators, target, key, desc) {
+function _ts_decorate10(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
@@ -7395,6 +7776,7 @@ var ClientServicesHost = class {
     this._tracingService = TRACE_PROCESSOR3.createTraceSender();
     this._statusUpdate = new Event10();
     this._edgeConnection = void 0;
+    this._edgeHttpClient = void 0;
     this._opening = false;
     this._open = false;
     this._storage = storage;
@@ -7416,9 +7798,9 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new Context11(void 0, {
+            void this.open(new Context10(void 0, {
               F: __dxlog_file26,
-              L: 132
+              L: 133
             }));
           }
         },
@@ -7476,7 +7858,7 @@ var ClientServicesHost = class {
   initialize({ config, ...options }) {
     invariant21(!this._open, "service host is open", {
       F: __dxlog_file26,
-      L: 198,
+      L: 199,
       S: this,
       A: [
         "!this._open",
@@ -7485,14 +7867,14 @@ var ClientServicesHost = class {
     });
     log23("initializing...", void 0, {
       F: __dxlog_file26,
-      L: 199,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
       invariant21(!this._config, "config already set", {
         F: __dxlog_file26,
-        L: 202,
+        L: 203,
         S: this,
         A: [
           "!this._config",
@@ -7507,17 +7889,17 @@ var ClientServicesHost = class {
     if (!options.signalManager) {
       log23.warn("running signaling without telemetry metadata.", void 0, {
         F: __dxlog_file26,
-        L: 210,
+        L: 211,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     const edgeEndpoint = config?.get("runtime.services.edge.url");
     if (edgeEndpoint) {
-      const randomKey = PublicKey17.random().toHex();
-      this._edgeConnection = new EdgeClient(randomKey, randomKey, {
+      this._edgeConnection = new EdgeClient(createStubEdgeIdentity(), {
         socketEndpoint: edgeEndpoint
       });
+      this._edgeHttpClient = new EdgeHttpClient(edgeEndpoint);
     }
     const { connectionLog = true, transportFactory = createRtcTransportFactory({
       iceServers: this._config?.get("runtime.services.ice")
@@ -7527,7 +7909,7 @@ var ClientServicesHost = class {
     this._signalManager = signalManager;
     invariant21(!this._networkManager, "network manager already set", {
       F: __dxlog_file26,
-      L: 232,
+      L: 233,
       S: this,
       A: [
         "!this._networkManager",
@@ -7545,7 +7927,7 @@ var ClientServicesHost = class {
     });
     log23("initialized", void 0, {
       F: __dxlog_file26,
-      L: 245,
+      L: 246,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7559,13 +7941,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file26,
-      L: 256,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant21(this._config, "config not set", {
       F: __dxlog_file26,
-      L: 258,
+      L: 259,
       S: this,
       A: [
         "this._config",
@@ -7574,7 +7956,7 @@ var ClientServicesHost = class {
     });
     invariant21(this._storage, "storage not set", {
       F: __dxlog_file26,
-      L: 259,
+      L: 260,
       S: this,
       A: [
         "this._storage",
@@ -7583,7 +7965,7 @@ var ClientServicesHost = class {
     });
     invariant21(this._signalManager, "signal manager not set", {
       F: __dxlog_file26,
-      L: 260,
+      L: 261,
       S: this,
       A: [
         "this._signalManager",
@@ -7592,7 +7974,7 @@ var ClientServicesHost = class {
     });
     invariant21(this._networkManager, "network manager not set", {
       F: __dxlog_file26,
-      L: 261,
+      L: 262,
       S: this,
       A: [
         "this._networkManager",
@@ -7604,7 +7986,7 @@ var ClientServicesHost = class {
       lockKey: this._resourceLock?.lockKey
     }, {
       F: __dxlog_file26,
-      L: 264,
+      L: 265,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7614,7 +7996,7 @@ var ClientServicesHost = class {
     }
     await this._level.open();
     await this._loggingService.open();
-    this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._edgeConnection, this._runtimeParams, this._config.get("runtime.client.edgeFeatures"));
+    this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._edgeConnection, this._edgeHttpClient, this._runtimeParams, this._config.get("runtime.client.edgeFeatures"));
     const dataSpaceManagerProvider = async () => {
       await this._serviceContext.initialized.wait();
       return this._serviceContext.dataSpaceManager;
@@ -7660,7 +8042,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file26,
-      L: 352,
+      L: 354,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7668,7 +8050,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file26,
-      L: 353,
+      L: 355,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7682,7 +8064,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file26,
-      L: 364,
+      L: 366,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7700,7 +8082,7 @@ var ClientServicesHost = class {
       deviceKey
     }, {
       F: __dxlog_file26,
-      L: 373,
+      L: 375,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7711,13 +8093,13 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file26,
-      L: 378,
+      L: 380,
       S: this,
       C: (f, a) => f(...a)
     });
     log23.info("resetting...", void 0, {
       F: __dxlog_file26,
-      L: 380,
+      L: 382,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7725,7 +8107,7 @@ var ClientServicesHost = class {
     await this._storage.reset();
     log23.info("reset", void 0, {
       F: __dxlog_file26,
-      L: 383,
+      L: 385,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7733,7 +8115,7 @@ var ClientServicesHost = class {
       id: traceId
     }), {
       F: __dxlog_file26,
-      L: 384,
+      L: 386,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7745,21 +8127,21 @@ var ClientServicesHost = class {
     return identity;
   }
 };
-_ts_decorate8([
+_ts_decorate10([
   Trace4.info()
 ], ClientServicesHost.prototype, "_opening", void 0);
-_ts_decorate8([
+_ts_decorate10([
   Trace4.info()
 ], ClientServicesHost.prototype, "_open", void 0);
-_ts_decorate8([
+_ts_decorate10([
   synchronized3,
   Trace4.span()
 ], ClientServicesHost.prototype, "open", null);
-_ts_decorate8([
+_ts_decorate10([
   synchronized3,
   Trace4.span()
 ], ClientServicesHost.prototype, "close", null);
-ClientServicesHost = _ts_decorate8([
+ClientServicesHost = _ts_decorate10([
   Trace4.resource()
 ], ClientServicesHost);
 
@@ -7806,4 +8188,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-3HDLTAT2.mjs.map
+//# sourceMappingURL=chunk-EQAI46LQ.mjs.map