@dxos/client-services 0.6.5 → 0.6.6-main.e1a6e1f

package/dist/lib/node/{chunk-NDXK2NIM.cjs → chunk-DRNEKKQP.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_NDXK2NIM_exports = {};
-__export(chunk_NDXK2NIM_exports, {
+var chunk_DRNEKKQP_exports = {};
+__export(chunk_DRNEKKQP_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -36,6 +36,7 @@ __export(chunk_NDXK2NIM_exports, {
   DevtoolsHostEvents: () => DevtoolsHostEvents,
   DevtoolsServiceImpl: () => DevtoolsServiceImpl,
   DiagnosticsCollector: () => DiagnosticsCollector,
+  EdgeFeedReplicator: () => EdgeFeedReplicator,
   Identity: () => Identity,
   IdentityManager: () => IdentityManager,
   IdentityServiceImpl: () => IdentityServiceImpl,
@@ -69,7 +70,7 @@ __export(chunk_NDXK2NIM_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_NDXK2NIM_exports);
+module.exports = __toCommonJS(chunk_DRNEKKQP_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -206,131 +207,141 @@ var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_debug2 = require("@dxos/debug");
 var import_rpc = require("@dxos/rpc");
 var import_tracing6 = require("@dxos/tracing");
+var import_cbor_x = require("cbor-x");
 var import_async13 = require("@dxos/async");
-var import_client_protocol5 = require("@dxos/client-protocol");
 var import_context10 = require("@dxos/context");
-var import_debug3 = require("@dxos/debug");
-var import_echo_pipeline2 = require("@dxos/echo-pipeline");
-var import_echo_protocol = require("@dxos/echo-protocol");
 var import_invariant13 = require("@dxos/invariant");
 var import_keys10 = require("@dxos/keys");
 var import_log13 = require("@dxos/log");
 var import_protocols9 = require("@dxos/protocols");
+var import_buf = require("@dxos/protocols/buf");
+var import_messenger_pb = require("@dxos/protocols/buf/dxos/edge/messenger_pb");
+var import_util8 = require("@dxos/util");
+var import_async14 = require("@dxos/async");
+var import_client_protocol5 = require("@dxos/client-protocol");
+var import_context11 = require("@dxos/context");
+var import_debug3 = require("@dxos/debug");
+var import_echo_pipeline2 = require("@dxos/echo-pipeline");
+var import_echo_protocol = require("@dxos/echo-protocol");
+var import_invariant14 = require("@dxos/invariant");
+var import_keys11 = require("@dxos/keys");
+var import_log14 = require("@dxos/log");
+var import_protocols10 = require("@dxos/protocols");
 var import_services13 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials13 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe3 = require("@dxos/timeframe");
 var import_tracing7 = require("@dxos/tracing");
-var import_util8 = require("@dxos/util");
-var import_async14 = require("@dxos/async");
-var import_context11 = require("@dxos/context");
+var import_util9 = require("@dxos/util");
+var import_async15 = require("@dxos/async");
+var import_context12 = require("@dxos/context");
 var import_credentials14 = require("@dxos/credentials");
 var import_echo_db = require("@dxos/echo-db");
 var import_echo_protocol2 = require("@dxos/echo-protocol");
 var import_echo_schema = require("@dxos/echo-schema");
-var import_invariant14 = require("@dxos/invariant");
-var import_log14 = require("@dxos/log");
-var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
-var import_async15 = require("@dxos/async");
-var import_context12 = require("@dxos/context");
 var import_invariant15 = require("@dxos/invariant");
-var import_keys11 = require("@dxos/keys");
 var import_log15 = require("@dxos/log");
-var import_protocols10 = require("@dxos/protocols");
-var import_teleport3 = require("@dxos/teleport");
-var import_util9 = require("@dxos/util");
+var import_services14 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async16 = require("@dxos/async");
-var import_client_protocol6 = require("@dxos/client-protocol");
 var import_context13 = require("@dxos/context");
+var import_invariant16 = require("@dxos/invariant");
+var import_keys12 = require("@dxos/keys");
+var import_log16 = require("@dxos/log");
+var import_protocols11 = require("@dxos/protocols");
+var import_teleport3 = require("@dxos/teleport");
+var import_util10 = require("@dxos/util");
+var import_async17 = require("@dxos/async");
+var import_client_protocol6 = require("@dxos/client-protocol");
+var import_context14 = require("@dxos/context");
 var import_credentials15 = require("@dxos/credentials");
 var import_echo_db2 = require("@dxos/echo-db");
 var import_echo_pipeline3 = require("@dxos/echo-pipeline");
-var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var import_echo_protocol3 = require("@dxos/echo-protocol");
 var import_echo_schema2 = require("@dxos/echo-schema");
 var import_feed_store4 = require("@dxos/feed-store");
-var import_invariant16 = require("@dxos/invariant");
-var import_keys12 = require("@dxos/keys");
-var import_log16 = require("@dxos/log");
-var import_protocols11 = require("@dxos/protocols");
+var import_invariant17 = require("@dxos/invariant");
+var import_keys13 = require("@dxos/keys");
+var import_log17 = require("@dxos/log");
+var import_protocols12 = require("@dxos/protocols");
 var import_services15 = require("@dxos/protocols/proto/dxos/client/services");
 var import_credentials16 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_teleport_extension_gossip2 = require("@dxos/teleport-extension-gossip");
 var import_tracing8 = require("@dxos/tracing");
-var import_util10 = require("@dxos/util");
+var import_util11 = require("@dxos/util");
 var import_credentials17 = require("@dxos/credentials");
 var import_debug4 = require("@dxos/debug");
 var import_credentials18 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_timeframe4 = require("@dxos/timeframe");
-var import_async17 = require("@dxos/async");
+var import_async18 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_credentials19 = require("@dxos/credentials");
 var import_debug5 = require("@dxos/debug");
 var import_feed_store5 = require("@dxos/feed-store");
-var import_invariant17 = require("@dxos/invariant");
-var import_log17 = require("@dxos/log");
-var import_protocols12 = require("@dxos/protocols");
+var import_invariant18 = require("@dxos/invariant");
+var import_log18 = require("@dxos/log");
+var import_protocols13 = require("@dxos/protocols");
 var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing9 = require("@dxos/tracing");
-var import_async18 = require("@dxos/async");
-var import_context14 = require("@dxos/context");
+var import_async19 = require("@dxos/async");
+var import_context15 = require("@dxos/context");
 var import_credentials20 = require("@dxos/credentials");
 var import_debug6 = require("@dxos/debug");
 var import_echo_db3 = require("@dxos/echo-db");
-var import_echo_pipeline5 = require("@dxos/echo-pipeline");
+var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var import_feed_store6 = require("@dxos/feed-store");
-var import_invariant18 = require("@dxos/invariant");
+var import_invariant19 = require("@dxos/invariant");
 var import_keyring = require("@dxos/keyring");
-var import_keys13 = require("@dxos/keys");
-var import_log18 = require("@dxos/log");
-var import_protocols13 = require("@dxos/protocols");
+var import_keys14 = require("@dxos/keys");
+var import_log19 = require("@dxos/log");
+var import_protocols14 = require("@dxos/protocols");
 var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
 var import_teleport_extension_object_sync = require("@dxos/teleport-extension-object-sync");
 var import_tracing10 = require("@dxos/tracing");
-var import_util11 = require("@dxos/util");
-var import_protocols14 = require("@dxos/protocols");
+var import_util12 = require("@dxos/util");
+var import_protocols15 = require("@dxos/protocols");
 var import_config2 = require("@dxos/protocols/proto/dxos/config");
 var import_random_access_storage = require("@dxos/random-access-storage");
 var import_client_protocol7 = require("@dxos/client-protocol");
 var import_config3 = require("@dxos/protocols/proto/dxos/config");
-var import_util12 = require("@dxos/util");
+var import_util13 = require("@dxos/util");
 var import_node_path = __toESM(require("node:path"));
-var import_keys14 = require("@dxos/keys");
+var import_keys15 = require("@dxos/keys");
 var import_kv_store = require("@dxos/kv-store");
 var import_automerge_repo = require("@dxos/automerge/automerge-repo");
-var import_invariant19 = require("@dxos/invariant");
-var import_log19 = require("@dxos/log");
-var import_protocols15 = require("@dxos/protocols");
-var import_util13 = require("@dxos/util");
-var import_async19 = require("@dxos/async");
-var import_client_protocol8 = require("@dxos/client-protocol");
-var import_context15 = require("@dxos/context");
 var import_invariant20 = require("@dxos/invariant");
-var import_keys15 = require("@dxos/keys");
 var import_log20 = require("@dxos/log");
+var import_protocols16 = require("@dxos/protocols");
+var import_util14 = require("@dxos/util");
+var import_async20 = require("@dxos/async");
+var import_client_protocol8 = require("@dxos/client-protocol");
+var import_context16 = require("@dxos/context");
+var import_edge_client = require("@dxos/edge-client");
+var import_invariant21 = require("@dxos/invariant");
+var import_keys16 = require("@dxos/keys");
+var import_log21 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols16 = require("@dxos/protocols");
+var import_protocols17 = require("@dxos/protocols");
 var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing11 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
-var import_async20 = require("@dxos/async");
+var import_async21 = require("@dxos/async");
 var import_codec_protobuf12 = require("@dxos/codec-protobuf");
-var import_invariant21 = require("@dxos/invariant");
+var import_invariant22 = require("@dxos/invariant");
 var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
-var import_async21 = require("@dxos/async");
-var import_codec_protobuf13 = require("@dxos/codec-protobuf");
-var import_keys16 = require("@dxos/keys");
-var import_util14 = require("@dxos/util");
 var import_async22 = require("@dxos/async");
-var import_codec_protobuf14 = require("@dxos/codec-protobuf");
+var import_codec_protobuf13 = require("@dxos/codec-protobuf");
 var import_keys17 = require("@dxos/keys");
-var import_log21 = require("@dxos/log");
-var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util15 = require("@dxos/util");
+var import_async23 = require("@dxos/async");
+var import_codec_protobuf14 = require("@dxos/codec-protobuf");
+var import_keys18 = require("@dxos/keys");
+var import_log22 = require("@dxos/log");
+var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util16 = require("@dxos/util");
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
 var import_codec_protobuf16 = require("@dxos/codec-protobuf");
 var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util16 = require("@dxos/util");
+var import_util17 = require("@dxos/util");
 var subscribeToFeeds = ({ feedStore }, { feedKeys }) => {
   return new import_codec_protobuf.Stream(({ next }) => {
     const subscriptions = new import_async.EventSubscriptions();
@@ -645,7 +656,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.6.5";
+var DXOS_VERSION = "0.6.6-main.e1a6e1f";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -2855,6 +2866,14 @@ var InvitationsHandler = class {
             ""
           ]
         });
+        const timeoutInactive = () => {
+          if (guardedState.mutex.isLocked()) {
+            (0, import_async9.scheduleTask)(ctx, timeoutInactive, timeout);
+          } else {
+            guardedState.set(null, import_services7.Invitation.State.TIMEOUT);
+          }
+        };
+        (0, import_async9.scheduleTask)(ctx, timeoutInactive, timeout);
         await this._joinSwarm(ctx, invitation, import_invitations2.InvitationOptions.Role.GUEST, createExtension);
         guardedState.set(null, import_services7.Invitation.State.CONNECTING);
       }
@@ -2948,7 +2967,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file12,
-        L: 449,
+        L: 461,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2959,7 +2978,7 @@ var InvitationsHandler = class {
         oldState: stateToString(invitation.state)
       }, {
         F: __dxlog_file12,
-        L: 455,
+        L: 467,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2978,7 +2997,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       (0, import_log6.log)("guest waiting for authentication code...", void 0, {
         F: __dxlog_file12,
-        L: 480,
+        L: 492,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2986,7 +3005,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       (0, import_log6.log)("sending authentication request", void 0, {
         F: __dxlog_file12,
-        L: 484,
+        L: 496,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3005,7 +3024,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file12,
-            L: 495,
+            L: 507,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3023,7 +3042,7 @@ var InvitationsHandler = class {
     }
     (0, import_log6.log)("sending authentication request", void 0, {
       F: __dxlog_file12,
-      L: 514,
+      L: 526,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3877,89 +3896,442 @@ _ts_decorate4([
 ClientRpcServer = _ts_decorate4([
   import_tracing6.trace.resource()
 ], ClientRpcServer);
-var AutomergeSpaceState = class extends import_context11.Resource {
-  constructor(_onNewRoot) {
-    super();
-    this._onNewRoot = _onNewRoot;
-    this.rootUrl = void 0;
-    this.lastEpoch = void 0;
-    this.onNewEpoch = new import_async14.Event();
-    this._isProcessingRootDocs = false;
-  }
-  async _open(ctx) {
-  }
-  async _close(ctx) {
-    this._isProcessingRootDocs = false;
-  }
-  async processCredential(credential) {
-    if (!(0, import_credentials14.checkCredentialType)(credential, "dxos.halo.credentials.Epoch")) {
-      return;
-    }
-    this.lastEpoch = credential;
-    if (credential.subject.assertion.automergeRoot) {
-      this.rootUrl = credential.subject.assertion.automergeRoot;
-      if (this._isProcessingRootDocs) {
-        this._onNewRoot(this.rootUrl);
+function _using_ctx() {
+  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
+      });
     }
-    this.onNewEpoch.emit(credential);
+    return value;
   }
-  startProcessingRootDocs() {
-    if (this._isProcessingRootDocs) {
-      return;
-    }
-    if (this.rootUrl) {
-      this._onNewRoot(this.rootUrl);
+  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();
     }
-    this._isProcessingRootDocs = true;
-  }
-  async ensureEpochInitialized() {
-    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
+  };
+}
+var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/edge-feed-replicator.ts";
+var EdgeFeedReplicator = class extends import_context10.Resource {
+  constructor({ messenger, spaceId }) {
+    super();
+    this._feeds = new import_util8.ComplexMap(import_keys10.PublicKey.hash);
+    this._connectionCtx = void 0;
+    this._connected = false;
+    this._remoteLength = new import_util8.ComplexMap(import_keys10.PublicKey.hash);
+    this._pushMutex = new import_util8.ComplexMap(import_keys10.PublicKey.hash);
+    this._messenger = messenger;
+    this._spaceId = spaceId;
   }
-};
-var __dxlog_file16 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
-var LOAD_DOC_TIMEOUT = 1e4;
-var runEpochMigration = async (ctx, context) => {
-  switch (context.migration) {
-    case import_services14.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
-      const document = context.echoHost.createDoc();
-      await context.echoHost.flush();
-      return {
-        newRoot: document.url
-      };
-    }
-    case import_services14.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY: {
-      if (!context.currentRoot) {
-        throw new Error("Space does not have an automerge root");
+  async _open() {
+    this._ctx.onDispose(this._messenger.addListener(async (message) => {
+      if (!message.serviceId) {
+        return;
       }
-      const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
-        timeout: LOAD_DOC_TIMEOUT
-      });
-      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
-      await context.echoHost.flush();
-      return {
-        newRoot: newRoot.url
-      };
-    }
-    case import_services14.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
-      import_log14.log.info("Fragmenting", void 0, {
+      const [service, ...rest] = message.serviceId.split(":");
+      if (service !== "hypercore-replicator") {
+        return;
+      }
+      const [spaceId] = rest;
+      if (spaceId !== this._spaceId) {
+        (0, import_log13.log)("spaceID mismatch", {
+          spaceId,
+          _spaceId: this._spaceId
+        }, {
+          F: __dxlog_file16,
+          L: 62,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        return;
+      }
+      const payload = (0, import_cbor_x.decode)(message.payload.value);
+      import_log13.log.info("recv", {
+        from: message.source,
+        payload
+      }, {
         F: __dxlog_file16,
-        L: 64,
-        S: void 0,
+        L: 67,
+        S: this,
         C: (f, a) => f(...a)
       });
-      const currentRootUrl = context.currentRoot;
-      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
-        timeout: LOAD_DOC_TIMEOUT
-      });
-      const objects = Object.entries(rootHandle.docSync().objects);
-      const properties = (0, import_echo_db.findInlineObjectOfType)(rootHandle.docSync(), import_echo_schema.TYPE_PROPERTIES);
-      const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
-      (0, import_invariant14.invariant)(properties, "Properties not found", {
-        F: __dxlog_file16,
-        L: 75,
-        S: void 0,
-        A: [
+      this._onMessage(payload);
+    }));
+    this._connected = true;
+    this._connectionCtx = this._ctx.derive();
+    for (const feed of this._feeds.values()) {
+      await this._replicateFeed(feed);
+    }
+  }
+  async _close() {
+    this._connected = false;
+    this._connected = false;
+    await this._connectionCtx?.dispose();
+    this._connectionCtx = void 0;
+    this._remoteLength.clear();
+  }
+  async addFeed(feed) {
+    import_log13.log.info("addFeed", {
+      key: feed.key
+    }, {
+      F: __dxlog_file16,
+      L: 89,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._feeds.set(feed.key, feed);
+    if (this._connected) {
+      await this._replicateFeed(feed);
+    }
+  }
+  _getPushMutex(key) {
+    return (0, import_util8.defaultMap)(this._pushMutex, key, () => new import_async13.Mutex());
+  }
+  async _replicateFeed(feed) {
+    (0, import_invariant13.invariant)(this._connectionCtx, void 0, {
+      F: __dxlog_file16,
+      L: 102,
+      S: this,
+      A: [
+        "this._connectionCtx",
+        ""
+      ]
+    });
+    await this._sendMessage({
+      type: "get-metadata",
+      feedKey: feed.key.toHex()
+    });
+    import_async13.Event.wrap(feed.core, "append").on(this._connectionCtx, async () => {
+      await this._pushBlocksIfNeeded(feed);
+    });
+  }
+  async _sendMessage(message) {
+    import_log13.log.info("sending message", {
+      message
+    }, {
+      F: __dxlog_file16,
+      L: 115,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    (0, import_invariant13.invariant)(message.feedKey, void 0, {
+      F: __dxlog_file16,
+      L: 117,
+      S: this,
+      A: [
+        "message.feedKey",
+        ""
+      ]
+    });
+    const payloadValue = (0, import_util8.bufferToArray)((0, import_cbor_x.encode)(message));
+    await this._messenger.send(import_buf.buf.create(import_messenger_pb.MessageSchema, {
+      source: {
+        identityKey: this._messenger.identityKey.toHex(),
+        peerKey: this._messenger.deviceKey.toHex()
+      },
+      serviceId: `${import_protocols9.EdgeService.FEED_REPLICATOR}:${this._spaceId}`,
+      payload: {
+        value: payloadValue
+      }
+    }));
+  }
+  _onMessage(message) {
+    import_log13.log.info("received message", {
+      message
+    }, {
+      F: __dxlog_file16,
+      L: 133,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    (0, import_async13.scheduleMicroTask)(this._ctx, async () => {
+      switch (message.type) {
+        case "metadata": {
+          try {
+            var _usingCtx = _using_ctx();
+            const feedKey = import_keys10.PublicKey.fromHex(message.feedKey);
+            const feed = this._feeds.get(feedKey);
+            if (!feed) {
+              import_log13.log.warn("Feed not found", {
+                feedKey
+              }, {
+                F: __dxlog_file16,
+                L: 141,
+                S: this,
+                C: (f, a) => f(...a)
+              });
+              return;
+            }
+            const _guard = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
+            this._remoteLength.set(feedKey, message.length);
+            if (message.length > feed.length) {
+              await this._sendMessage({
+                type: "request",
+                feedKey: feedKey.toHex(),
+                range: {
+                  from: feed.length,
+                  to: message.length
+                }
+              });
+            } else if (message.length < feed.length) {
+              await this._pushBlocks(feed, message.length, feed.length);
+            }
+            break;
+          } catch (_) {
+            _usingCtx.e = _;
+          } finally {
+            _usingCtx.d();
+          }
+        }
+        case "data": {
+          const feedKey = import_keys10.PublicKey.fromHex(message.feedKey);
+          const feed = this._feeds.get(feedKey);
+          if (!feed) {
+            import_log13.log.warn("Feed not found", {
+              feedKey
+            }, {
+              F: __dxlog_file16,
+              L: 166,
+              S: this,
+              C: (f, a) => f(...a)
+            });
+            return;
+          }
+          await this._integrateBlocks(feed, message.blocks);
+          break;
+        }
+        default: {
+          import_log13.log.warn("Unknown message", {
+            ...message
+          }, {
+            F: __dxlog_file16,
+            L: 175,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+        }
+      }
+    });
+  }
+  async _pushBlocks(feed, from, to) {
+    import_log13.log.info("pushing blocks", {
+      feed: feed.key.toHex(),
+      from,
+      to
+    }, {
+      F: __dxlog_file16,
+      L: 182,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    const blocks = await Promise.all((0, import_util8.rangeFromTo)(from, to).map(async (index) => {
+      const data = await feed.get(index, {
+        valueEncoding: "binary"
+      });
+      (0, import_invariant13.invariant)(data instanceof Uint8Array, void 0, {
+        F: __dxlog_file16,
+        L: 187,
+        S: this,
+        A: [
+          "data instanceof Uint8Array",
+          ""
+        ]
+      });
+      const proof = await feed.proof(index);
+      return {
+        index,
+        data,
+        nodes: proof.nodes,
+        signature: proof.signature
+      };
+    }));
+    await this._sendMessage({
+      type: "data",
+      feedKey: feed.key.toHex(),
+      blocks
+    });
+    this._remoteLength.set(feed.key, to);
+  }
+  async _integrateBlocks(feed, blocks) {
+    import_log13.log.info("integrating blocks", {
+      feed: feed.key.toHex(),
+      blocks: blocks.length
+    }, {
+      F: __dxlog_file16,
+      L: 208,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    for (const block of blocks) {
+      if (feed.has(block.index)) {
+        continue;
+      }
+      const blockBuffer = bufferizeBlock(block);
+      await feed.putBuffer(block.index, blockBuffer.data, {
+        nodes: blockBuffer.nodes,
+        signature: blockBuffer.signature
+      }, null);
+    }
+  }
+  async _pushBlocksIfNeeded(feed) {
+    try {
+      var _usingCtx = _using_ctx();
+      const _guard = _usingCtx.u(await this._getPushMutex(feed.key).acquire());
+      if (!this._remoteLength.has(feed.key)) {
+        return;
+      }
+      const remoteLength = this._remoteLength.get(feed.key);
+      if (remoteLength < feed.length) {
+        await this._pushBlocks(feed, remoteLength, feed.length);
+      }
+    } catch (_) {
+      _usingCtx.e = _;
+    } finally {
+      _usingCtx.d();
+    }
+  }
+};
+var bufferizeBlock = (block) => ({
+  index: block.index,
+  data: (0, import_util8.arrayToBuffer)(block.data),
+  nodes: block.nodes.map((node) => ({
+    index: node.index,
+    hash: (0, import_util8.arrayToBuffer)(node.hash),
+    size: node.size
+  })),
+  signature: (0, import_util8.arrayToBuffer)(block.signature)
+});
+var AutomergeSpaceState = class extends import_context12.Resource {
+  constructor(_onNewRoot) {
+    super();
+    this._onNewRoot = _onNewRoot;
+    this.rootUrl = void 0;
+    this.lastEpoch = void 0;
+    this.onNewEpoch = new import_async15.Event();
+    this._isProcessingRootDocs = false;
+  }
+  async _open(ctx) {
+  }
+  async _close(ctx) {
+    this._isProcessingRootDocs = false;
+  }
+  async processCredential(credential) {
+    if (!(0, import_credentials14.checkCredentialType)(credential, "dxos.halo.credentials.Epoch")) {
+      return;
+    }
+    this.lastEpoch = credential;
+    if (credential.subject.assertion.automergeRoot) {
+      this.rootUrl = credential.subject.assertion.automergeRoot;
+      if (this._isProcessingRootDocs) {
+        this._onNewRoot(this.rootUrl);
+      }
+    }
+    this.onNewEpoch.emit(credential);
+  }
+  startProcessingRootDocs() {
+    if (this._isProcessingRootDocs) {
+      return;
+    }
+    if (this.rootUrl) {
+      this._onNewRoot(this.rootUrl);
+    }
+    this._isProcessingRootDocs = true;
+  }
+  async ensureEpochInitialized() {
+    await this.onNewEpoch.waitForCondition(() => !!this.lastEpoch);
+  }
+};
+var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/epoch-migrations.ts";
+var LOAD_DOC_TIMEOUT = 1e4;
+var runEpochMigration = async (ctx, context) => {
+  switch (context.migration) {
+    case import_services14.CreateEpochRequest.Migration.INIT_AUTOMERGE: {
+      const document = context.echoHost.createDoc();
+      await context.echoHost.flush();
+      return {
+        newRoot: document.url
+      };
+    }
+    case import_services14.CreateEpochRequest.Migration.PRUNE_AUTOMERGE_ROOT_HISTORY: {
+      if (!context.currentRoot) {
+        throw new Error("Space does not have an automerge root");
+      }
+      const rootHandle = await context.echoHost.loadDoc(ctx, context.currentRoot, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
+      const newRoot = context.echoHost.createDoc(rootHandle.docSync());
+      await context.echoHost.flush();
+      return {
+        newRoot: newRoot.url
+      };
+    }
+    case import_services14.CreateEpochRequest.Migration.FRAGMENT_AUTOMERGE_ROOT: {
+      import_log15.log.info("Fragmenting", void 0, {
+        F: __dxlog_file17,
+        L: 64,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      const currentRootUrl = context.currentRoot;
+      const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
+        timeout: LOAD_DOC_TIMEOUT
+      });
+      const objects = Object.entries(rootHandle.docSync().objects);
+      const properties = (0, import_echo_db.findInlineObjectOfType)(rootHandle.docSync(), import_echo_schema.TYPE_PROPERTIES);
+      const otherObjects = objects.filter(([key]) => key !== properties?.[0]);
+      (0, import_invariant15.invariant)(properties, "Properties not found", {
+        F: __dxlog_file17,
+        L: 75,
+        S: void 0,
+        A: [
           "properties",
           "'Properties not found'"
         ]
@@ -3970,8 +4342,8 @@ var runEpochMigration = async (ctx, context) => {
           properties
         ])
       });
-      (0, import_invariant14.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
-        F: __dxlog_file16,
+      (0, import_invariant15.invariant)(typeof newRoot.url === "string" && newRoot.url.length > 0, void 0, {
+        F: __dxlog_file17,
         L: 82,
         S: void 0,
         A: [
@@ -4011,8 +4383,8 @@ var runEpochMigration = async (ctx, context) => {
       const rootHandle = await context.echoHost.loadDoc(ctx, currentRootUrl, {
         timeout: LOAD_DOC_TIMEOUT
       });
-      (0, import_invariant14.invariant)(rootHandle.docSync(), "Root doc not found", {
-        F: __dxlog_file16,
+      (0, import_invariant15.invariant)(rootHandle.docSync(), "Root doc not found", {
+        F: __dxlog_file17,
         L: 115,
         S: void 0,
         A: [
@@ -4026,8 +4398,8 @@ var runEpochMigration = async (ctx, context) => {
           const handle = await context.echoHost.loadDoc(ctx, url, {
             timeout: LOAD_DOC_TIMEOUT
           });
-          (0, import_invariant14.invariant)(handle.docSync(), void 0, {
-            F: __dxlog_file16,
+          (0, import_invariant15.invariant)(handle.docSync(), void 0, {
+            F: __dxlog_file17,
             L: 122,
             S: void 0,
             A: [
@@ -4042,12 +4414,12 @@ var runEpochMigration = async (ctx, context) => {
           });
           newRootContent.links[id] = newHandle.url;
         } catch (err) {
-          import_log14.log.warn("Failed to migrate reference", {
+          import_log15.log.warn("Failed to migrate reference", {
             id,
             url,
             error: err
           }, {
-            F: __dxlog_file16,
+            F: __dxlog_file17,
             L: 128,
             S: void 0,
             C: (f, a) => f(...a)
@@ -4065,8 +4437,8 @@ var runEpochMigration = async (ctx, context) => {
       };
     }
     case import_services14.CreateEpochRequest.Migration.REPLACE_AUTOMERGE_ROOT: {
-      (0, import_invariant14.invariant)(context.newAutomergeRoot, void 0, {
-        F: __dxlog_file16,
+      (0, import_invariant15.invariant)(context.newAutomergeRoot, void 0, {
+        F: __dxlog_file17,
         L: 143,
         S: void 0,
         A: [
@@ -4082,21 +4454,21 @@ var runEpochMigration = async (ctx, context) => {
   }
   return {};
 };
-var __dxlog_file17 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/notarization-plugin.ts";
+var __dxlog_file18 = "/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 WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var NotarizationPlugin = class {
   constructor() {
-    this._ctx = new import_context12.Context(void 0, {
-      F: __dxlog_file17,
+    this._ctx = new import_context13.Context(void 0, {
+      F: __dxlog_file18,
       L: 62
     });
-    this._extensionOpened = new import_async15.Event();
+    this._extensionOpened = new import_async16.Event();
     this._extensions = /* @__PURE__ */ new Set();
-    this._processedCredentials = new import_util9.ComplexSet(import_keys11.PublicKey.hash);
-    this._processCredentialsTriggers = new import_util9.ComplexMap(import_keys11.PublicKey.hash);
+    this._processedCredentials = new import_util10.ComplexSet(import_keys12.PublicKey.hash);
+    this._processCredentialsTriggers = new import_util10.ComplexMap(import_keys12.PublicKey.hash);
   }
   get hasWriter() {
     return !!this._writer;
@@ -4110,16 +4482,16 @@ var NotarizationPlugin = class {
   * Request credentials to be notarized.
   */
   async notarize({ ctx: opCtx, credentials, timeout = DEFAULT_NOTARIZE_TIMEOUT, retryTimeout = DEFAULT_RETRY_TIMEOUT, successDelay = DEFAULT_SUCCESS_DELAY }) {
-    (0, import_log15.log)("notarize", {
+    (0, import_log16.log)("notarize", {
       credentials
     }, {
-      F: __dxlog_file17,
+      F: __dxlog_file18,
       L: 90,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant15.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
-      F: __dxlog_file17,
+    (0, import_invariant16.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
+      F: __dxlog_file18,
       L: 91,
       S: this,
       A: [
@@ -4127,13 +4499,13 @@ var NotarizationPlugin = class {
         "'Credentials must have an id'"
       ]
     });
-    const errors = new import_async15.Trigger();
+    const errors = new import_async16.Trigger();
     const ctx = this._ctx.derive({
       onError: (err) => {
-        import_log15.log.warn("Notarization error", {
+        import_log16.log.warn("Notarization error", {
           err
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 99,
           S: this,
           C: (f, a) => f(...a)
@@ -4144,23 +4516,23 @@ var NotarizationPlugin = class {
     });
     opCtx?.onDispose(() => ctx.dispose());
     if (timeout !== 0) {
-      (0, import_async15.scheduleTask)(ctx, () => {
-        import_log15.log.warn("Notarization timeout", {
+      (0, import_async16.scheduleTask)(ctx, () => {
+        import_log16.log.warn("Notarization timeout", {
           timeout,
           peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 111,
           S: this,
           C: (f, a) => f(...a)
         });
         void ctx.dispose();
-        errors.throw(new import_async15.TimeoutError(timeout, "Notarization timed out"));
+        errors.throw(new import_async16.TimeoutError(timeout, "Notarization timed out"));
       }, timeout);
     }
     const allNotarized = Promise.all(credentials.map((credential) => this._waitUntilProcessed(credential.id)));
     const peersTried = /* @__PURE__ */ new Set();
-    const notarizeTask = new import_async15.DeferredTask(ctx, async () => {
+    const notarizeTask = new import_async16.DeferredTask(ctx, async () => {
       try {
         if (this._extensions.size === 0) {
           return;
@@ -4169,24 +4541,24 @@ var NotarizationPlugin = class {
           ...this._extensions
         ].find((peer2) => !peersTried.has(peer2));
         if (!peer) {
-          import_log15.log.info("Exhausted all peers to notarize with", {
+          import_log16.log.info("Exhausted all peers to notarize with", {
             retryIn: retryTimeout
           }, {
-            F: __dxlog_file17,
+            F: __dxlog_file18,
             L: 136,
             S: this,
             C: (f, a) => f(...a)
           });
           peersTried.clear();
-          (0, import_async15.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
+          (0, import_async16.scheduleTask)(ctx, () => notarizeTask.schedule(), retryTimeout);
           return;
         }
         peersTried.add(peer);
-        (0, import_log15.log)("try notarizing", {
+        (0, import_log16.log)("try notarizing", {
           peer: peer.localPeerId,
           credentialId: credentials.map((credential) => credential.id)
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 143,
           S: this,
           C: (f, a) => f(...a)
@@ -4194,17 +4566,17 @@ var NotarizationPlugin = class {
         await peer.rpc.NotarizationService.notarize({
           credentials: credentials.filter((credential) => !this._processedCredentials.has(credential.id))
         });
-        (0, import_log15.log)("success", void 0, {
-          F: __dxlog_file17,
+        (0, import_log16.log)("success", void 0, {
+          F: __dxlog_file18,
           L: 147,
           S: this,
           C: (f, a) => f(...a)
         });
-        await (0, import_async15.sleep)(successDelay);
+        await (0, import_async16.sleep)(successDelay);
       } catch (err) {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
-          import_log15.log.info("error notarizing (recoverable)", err, {
-            F: __dxlog_file17,
+          import_log16.log.info("error notarizing (recoverable)", err, {
+            F: __dxlog_file18,
             L: 151,
             S: this,
             C: (f, a) => f(...a)
@@ -4217,12 +4589,12 @@ var NotarizationPlugin = class {
     this._extensionOpened.on(ctx, () => notarizeTask.schedule());
     try {
       await Promise.race([
-        (0, import_context12.rejectOnDispose)(ctx),
+        (0, import_context13.rejectOnDispose)(ctx),
         allNotarized,
         errors.wait()
       ]);
-      (0, import_log15.log)("done", void 0, {
-        F: __dxlog_file17,
+      (0, import_log16.log)("done", void 0, {
+        F: __dxlog_file18,
         L: 162,
         S: this,
         C: (f, a) => f(...a)
@@ -4243,8 +4615,8 @@ var NotarizationPlugin = class {
     this._processCredentialsTriggers.delete(credential.id);
   }
   setWriter(writer) {
-    (0, import_invariant15.invariant)(!this._writer, "Writer already set.", {
-      F: __dxlog_file17,
+    (0, import_invariant16.invariant)(!this._writer, "Writer already set.", {
+      F: __dxlog_file18,
       L: 181,
       S: this,
       A: [
@@ -4258,7 +4630,7 @@ var NotarizationPlugin = class {
     if (this._processedCredentials.has(id)) {
       return;
     }
-    await (0, import_util9.entry)(this._processCredentialsTriggers, id).orInsert(new import_async15.Trigger()).value.wait();
+    await (0, import_util10.entry)(this._processCredentialsTriggers, id).orInsert(new import_async16.Trigger()).value.wait();
   }
   /**
   * Requests from other peers to notarize credentials.
@@ -4268,8 +4640,8 @@ var NotarizationPlugin = class {
       throw new Error(WRITER_NOT_SET_ERROR_CODE);
     }
     for (const credential of request.credentials ?? []) {
-      (0, import_invariant15.invariant)(credential.id, "Credential must have an id", {
-        F: __dxlog_file17,
+      (0, import_invariant16.invariant)(credential.id, "Credential must have an id", {
+        F: __dxlog_file18,
         L: 200,
         S: this,
         A: [
@@ -4286,10 +4658,10 @@ var NotarizationPlugin = class {
   createExtension() {
     const extension = new NotarizationTeleportExtension({
       onOpen: async () => {
-        (0, import_log15.log)("extension opened", {
+        (0, import_log16.log)("extension opened", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 211,
           S: this,
           C: (f, a) => f(...a)
@@ -4298,10 +4670,10 @@ var NotarizationPlugin = class {
         this._extensionOpened.emit();
       },
       onClose: async () => {
-        (0, import_log15.log)("extension closed", {
+        (0, import_log16.log)("extension closed", {
           peer: extension.localPeerId
         }, {
-          F: __dxlog_file17,
+          F: __dxlog_file18,
           L: 216,
           S: this,
           C: (f, a) => f(...a)
@@ -4317,10 +4689,10 @@ var NotarizationTeleportExtension = class extends import_teleport3.RpcExtension
   constructor(_params) {
     super({
       requested: {
-        NotarizationService: import_protocols10.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols11.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       },
       exposed: {
-        NotarizationService: import_protocols10.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
+        NotarizationService: import_protocols11.schema.getService("dxos.mesh.teleport.notarization.NotarizationService")
       }
     });
     this._params = _params;
@@ -4353,7 +4725,7 @@ function _ts_decorate5(decorators, target, key, desc) {
         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() {
+function _using_ctx2() {
   var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
     var err = new Error();
     err.name = "SuppressedError";
@@ -4416,22 +4788,28 @@ function _using_ctx() {
     }
   };
 }
-var __dxlog_file18 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
+var __dxlog_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space.ts";
 var DataSpace = class {
   constructor(params) {
-    this._ctx = new import_context10.Context(void 0, {
-      F: __dxlog_file18,
-      L: 84
+    this._ctx = new import_context11.Context(void 0, {
+      F: __dxlog_file19,
+      L: 87
     });
     this._notarizationPlugin = new NotarizationPlugin();
     this._cache = void 0;
+    this._edgeFeedReplicator = void 0;
     this._automergeSpaceState = new AutomergeSpaceState((rootUrl) => this._onNewAutomergeRoot(rootUrl));
-    this._epochProcessingMutex = new import_async13.Mutex();
+    this._epochProcessingMutex = new import_async14.Mutex();
     this._state = import_services13.SpaceState.SPACE_CLOSED;
     this._databaseRoot = null;
     this.error = void 0;
-    this.stateUpdate = new import_async13.Event();
+    this.stateUpdate = new import_async14.Event();
+    this.postOpen = new import_util9.CallbackCollection();
+    this.preClose = new import_util9.CallbackCollection();
     this.metrics = {};
+    this._onFeedAdded = async (feed) => {
+      await this._edgeFeedReplicator.addFeed(feed);
+    };
     this._inner = params.inner;
     this._inner.stateUpdate.on(this._ctx, () => this.stateUpdate.emit());
     this._gossip = params.gossip;
@@ -4443,17 +4821,23 @@ var DataSpace = class {
     this._callbacks = params.callbacks ?? {};
     this._echoHost = params.echoHost;
     this.authVerifier = new TrustedKeySetAuthVerifier({
-      trustedKeysProvider: () => new import_util8.ComplexSet(import_keys10.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== import_credentials13.SpaceMember.Role.REMOVED).map((member) => member.key)),
+      trustedKeysProvider: () => new import_util9.ComplexSet(import_keys11.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== import_credentials13.SpaceMember.Role.REMOVED).map((member) => member.key)),
       update: this._inner.stateUpdate,
       authTimeout: import_client_protocol5.AUTH_TIMEOUT
     });
     this._cache = params.cache;
+    if (params.edgeConnection) {
+      this._edgeFeedReplicator = new EdgeFeedReplicator({
+        messenger: params.edgeConnection,
+        spaceId: this.id
+      });
+    }
     this._state = params.initialState;
-    (0, import_log13.log)("new state", {
+    (0, import_log14.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file18,
-      L: 146,
+      F: __dxlog_file19,
+      L: 157,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4507,42 +4891,52 @@ var DataSpace = class {
     await this._inner.spaceState.addCredentialProcessor(this._notarizationPlugin);
     await this._automergeSpaceState.open();
     await this._inner.spaceState.addCredentialProcessor(this._automergeSpaceState);
-    await this._inner.open(new import_context10.Context(void 0, {
-      F: __dxlog_file18,
-      L: 215
+    if (this._edgeFeedReplicator) {
+      this.inner.protocol.feedAdded.append(this._onFeedAdded);
+    }
+    await this._inner.open(new import_context11.Context(void 0, {
+      F: __dxlog_file19,
+      L: 231
     }));
+    await this._edgeFeedReplicator?.open();
     this._state = import_services13.SpaceState.SPACE_CONTROL_ONLY;
-    (0, import_log13.log)("new state", {
+    (0, import_log14.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file18,
-      L: 217,
+      F: __dxlog_file19,
+      L: 236,
       S: this,
       C: (f, a) => f(...a)
     });
     this.stateUpdate.emit();
     this.metrics = {};
     this.metrics.open = /* @__PURE__ */ new Date();
+    await this.postOpen.callSerial();
   }
   async close() {
     await this._close();
   }
   async _close() {
     await this._callbacks.beforeClose?.();
+    await this.preClose.callSerial();
     this._state = import_services13.SpaceState.SPACE_CLOSED;
-    (0, import_log13.log)("new state", {
+    (0, import_log14.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file18,
-      L: 231,
+      F: __dxlog_file19,
+      L: 255,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
-    this._ctx = new import_context10.Context(void 0, {
-      F: __dxlog_file18,
-      L: 233
+    this._ctx = new import_context11.Context(void 0, {
+      F: __dxlog_file19,
+      L: 257
     });
+    if (this._edgeFeedReplicator) {
+      this.inner.protocol.feedAdded.remove(this._onFeedAdded);
+    }
+    await this._edgeFeedReplicator?.close();
     await this.authVerifier.close();
     await this._inner.close();
     await this._inner.spaceState.removeCredentialProcessor(this._automergeSpaceState);
@@ -4562,32 +4956,32 @@ var DataSpace = class {
   * Initialize the data pipeline in a separate task.
   */
   initializeDataPipelineAsync() {
-    (0, import_async13.scheduleTask)(this._ctx, async () => {
+    (0, import_async14.scheduleTask)(this._ctx, async () => {
       try {
         this.metrics.pipelineInitBegin = /* @__PURE__ */ new Date();
         await this.initializeDataPipeline();
       } catch (err) {
-        if (err instanceof import_protocols9.CancelledError || err instanceof import_context10.ContextDisposedError) {
-          (0, import_log13.log)("data pipeline initialization cancelled", err, {
-            F: __dxlog_file18,
-            L: 265,
+        if (err instanceof import_protocols10.CancelledError || err instanceof import_context11.ContextDisposedError) {
+          (0, import_log14.log)("data pipeline initialization cancelled", err, {
+            F: __dxlog_file19,
+            L: 295,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
-        import_log13.log.error("Error initializing data pipeline", err, {
-          F: __dxlog_file18,
-          L: 269,
+        import_log14.log.error("Error initializing data pipeline", err, {
+          F: __dxlog_file19,
+          L: 299,
           S: this,
           C: (f, a) => f(...a)
         });
         this._state = import_services13.SpaceState.SPACE_ERROR;
-        (0, import_log13.log)("new state", {
+        (0, import_log14.log)("new state", {
           state: import_services13.SpaceState[this._state]
         }, {
-          F: __dxlog_file18,
-          L: 271,
+          F: __dxlog_file19,
+          L: 301,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4600,19 +4994,19 @@ var DataSpace = class {
   }
   async initializeDataPipeline() {
     if (this._state !== import_services13.SpaceState.SPACE_CONTROL_ONLY) {
-      throw new import_protocols9.SystemError("Invalid operation");
+      throw new import_protocols10.SystemError("Invalid operation");
     }
     this._state = import_services13.SpaceState.SPACE_INITIALIZING;
-    (0, import_log13.log)("new state", {
+    (0, import_log14.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file18,
-      L: 287,
+      F: __dxlog_file19,
+      L: 317,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._initializeAndReadControlPipeline();
-    await (0, import_async13.sleep)(1);
+    await (0, import_async14.sleep)(1);
     const ready = this.stateUpdate.waitForCondition(() => this._state === import_services13.SpaceState.SPACE_READY);
     this._automergeSpaceState.startProcessingRootDocs();
     await ready;
@@ -4620,11 +5014,11 @@ var DataSpace = class {
   async _enterReadyState() {
     await this._callbacks.beforeReady?.();
     this._state = import_services13.SpaceState.SPACE_READY;
-    (0, import_log13.log)("new state", {
+    (0, import_log14.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file18,
-      L: 306,
+      F: __dxlog_file19,
+      L: 336,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4638,9 +5032,9 @@ var DataSpace = class {
     });
     this.metrics.controlPipelineReady = /* @__PURE__ */ new Date();
     await this._createWritableFeeds();
-    (0, import_log13.log)("writable feeds created", void 0, {
-      F: __dxlog_file18,
-      L: 322,
+    (0, import_log14.log)("writable feeds created", void 0, {
+      F: __dxlog_file19,
+      L: 352,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4698,12 +5092,12 @@ var DataSpace = class {
     }
   }
   _onNewAutomergeRoot(rootUrl) {
-    (0, import_log13.log)("loading automerge root doc for space", {
+    (0, import_log14.log)("loading automerge root doc for space", {
       space: this.key,
       rootUrl
     }, {
-      F: __dxlog_file18,
-      L: 388,
+      F: __dxlog_file19,
+      L: 418,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4711,9 +5105,9 @@ var DataSpace = class {
     queueMicrotask(async () => {
       try {
         try {
-          var _usingCtx = _using_ctx();
+          var _usingCtx = _using_ctx2();
           await (0, import_debug3.warnAfterTimeout)(5e3, "Automerge root doc load timeout (DataSpace)", async () => {
-            await (0, import_context10.cancelWithContext)(this._ctx, handle.whenReady());
+            await (0, import_context11.cancelWithContext)(this._ctx, handle.whenReady());
           });
           if (this._ctx.disposed) {
             return;
@@ -4722,7 +5116,7 @@ var DataSpace = class {
             // Ensure only one root is processed at a time.
             _usingCtx.u(await this._epochProcessingMutex.acquire())
           );
-          const doc = handle.docSync() ?? (0, import_invariant13.failedInvariant)();
+          const doc = handle.docSync() ?? (0, import_invariant14.failedInvariant)();
           if (!doc.access?.spaceKey) {
             handle.change((doc2) => {
               doc2.access = {
@@ -4746,16 +5140,16 @@ var DataSpace = class {
           _usingCtx.d();
         }
       } catch (err) {
-        if (err instanceof import_context10.ContextDisposedError) {
+        if (err instanceof import_context11.ContextDisposedError) {
           return;
         }
-        import_log13.log.warn("error loading automerge root doc", {
+        import_log14.log.warn("error loading automerge root doc", {
           space: this.key,
           rootUrl,
           err
         }, {
-          F: __dxlog_file18,
-          L: 431,
+          F: __dxlog_file19,
+          L: 461,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4841,11 +5235,11 @@ var DataSpace = class {
       await this._close();
     }
     this._state = import_services13.SpaceState.SPACE_INACTIVE;
-    (0, import_log13.log)("new state", {
+    (0, import_log14.log)("new state", {
       state: import_services13.SpaceState[this._state]
     }, {
-      F: __dxlog_file18,
-      L: 513,
+      F: __dxlog_file19,
+      L: 543,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4872,10 +5266,10 @@ _ts_decorate5([
   })
 ], DataSpace.prototype, "_automergeInfo", null);
 _ts_decorate5([
-  import_async13.synchronized
+  import_async14.synchronized
 ], DataSpace.prototype, "open", null);
 _ts_decorate5([
-  import_async13.synchronized
+  import_async14.synchronized
 ], DataSpace.prototype, "close", null);
 _ts_decorate5([
   import_tracing7.trace.span({
@@ -4891,13 +5285,13 @@ _ts_decorate5([
   (0, import_debug3.timed)(1e4)
 ], DataSpace.prototype, "_createWritableFeeds", null);
 _ts_decorate5([
-  import_async13.synchronized
+  import_async14.synchronized
 ], DataSpace.prototype, "activate", null);
 _ts_decorate5([
-  import_async13.synchronized
+  import_async14.synchronized
 ], DataSpace.prototype, "deactivate", null);
 DataSpace = _ts_decorate5([
-  (0, import_async13.trackLeaks)("open", "close"),
+  (0, import_async14.trackLeaks)("open", "close"),
   import_tracing7.trace.resource()
 ], DataSpace);
 var spaceGenesis = async (keyring, signingContext, space, automergeRoot) => {
@@ -4974,28 +5368,31 @@ function _ts_decorate6(decorators, target, key, desc) {
         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_file19 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
+var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/data-space-manager.ts";
 var PRESENCE_ANNOUNCE_INTERVAL = 1e4;
 var PRESENCE_OFFLINE_TIMEOUT = 2e4;
 var DEFAULT_SPACE_KEY = "__DEFAULT__";
-var DataSpaceManager = class {
-  constructor(_spaceManager, _metadataStore, _keyring, _signingContext, _feedStore, _echoHost, _invitationsManager, _params) {
-    this._spaceManager = _spaceManager;
-    this._metadataStore = _metadataStore;
-    this._keyring = _keyring;
-    this._signingContext = _signingContext;
-    this._feedStore = _feedStore;
-    this._echoHost = _echoHost;
-    this._invitationsManager = _invitationsManager;
-    this._params = _params;
-    this._ctx = new import_context13.Context(void 0, {
-      F: __dxlog_file19,
-      L: 104
-    });
-    this.updated = new import_async16.Event();
-    this._spaces = new import_util10.ComplexMap(import_keys12.PublicKey.hash);
-    this._isOpen = false;
-    this._instanceId = import_keys12.PublicKey.random().toHex();
+var DataSpaceManager = class extends import_context14.Resource {
+  constructor(params) {
+    super();
+    this.updated = new import_async17.Event();
+    this._spaces = new import_util11.ComplexMap(import_keys13.PublicKey.hash);
+    this._instanceId = import_keys13.PublicKey.random().toHex();
+    this._edgeConnection = void 0;
+    this._meshReplicator = void 0;
+    this._echoEdgeReplicator = void 0;
+    this._runtimeParams = void 0;
+    this._spaceManager = params.spaceManager;
+    this._metadataStore = params.metadataStore;
+    this._keyring = params.keyring;
+    this._signingContext = params.signingContext;
+    this._feedStore = params.feedStore;
+    this._echoHost = params.echoHost;
+    this._meshReplicator = params.meshReplicator;
+    this._invitationsManager = params.invitationsManager;
+    this._edgeConnection = params.edgeConnection;
+    this._echoEdgeReplicator = params.echoEdgeReplicator;
+    this._runtimeParams = params.runtimeParams;
     import_tracing8.trace.diagnostic({
       id: "spaces",
       name: "Spaces",
@@ -5023,72 +5420,69 @@ var DataSpaceManager = class {
   get spaces() {
     return this._spaces;
   }
-  async open() {
-    (0, import_log16.log)("open", void 0, {
-      F: __dxlog_file19,
-      L: 156,
+  async _open() {
+    (0, import_log17.log)("open", void 0, {
+      F: __dxlog_file20,
+      L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log16.log.trace("dxos.echo.data-space-manager.open", import_protocols11.trace.begin({
+    import_log17.log.trace("dxos.echo.data-space-manager.open", import_protocols12.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file19,
-      L: 157,
+      F: __dxlog_file20,
+      L: 188,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log16.log)("metadata loaded", {
+    (0, import_log17.log)("metadata loaded", {
       spaces: this._metadataStore.spaces.length
     }, {
-      F: __dxlog_file19,
-      L: 158,
+      F: __dxlog_file20,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
-    await (0, import_util10.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
+    await (0, import_util11.forEachAsync)(this._metadataStore.spaces, async (spaceMetadata) => {
       try {
-        (0, import_log16.log)("load space", {
+        (0, import_log17.log)("load space", {
           spaceMetadata
         }, {
-          F: __dxlog_file19,
-          L: 162,
+          F: __dxlog_file20,
+          L: 193,
           S: this,
           C: (f, a) => f(...a)
         });
         await this._constructSpace(spaceMetadata);
       } catch (err) {
-        import_log16.log.error("Error loading space", {
+        import_log17.log.error("Error loading space", {
           spaceMetadata,
           err
         }, {
-          F: __dxlog_file19,
-          L: 165,
+          F: __dxlog_file20,
+          L: 196,
           S: this,
           C: (f, a) => f(...a)
         });
       }
     });
-    this._isOpen = true;
     this.updated.emit();
-    import_log16.log.trace("dxos.echo.data-space-manager.open", import_protocols11.trace.end({
+    import_log17.log.trace("dxos.echo.data-space-manager.open", import_protocols12.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file19,
-      L: 172,
+      F: __dxlog_file20,
+      L: 202,
       S: this,
       C: (f, a) => f(...a)
     });
   }
-  async close() {
-    (0, import_log16.log)("close", void 0, {
-      F: __dxlog_file19,
-      L: 177,
+  async _close() {
+    (0, import_log17.log)("close", void 0, {
+      F: __dxlog_file20,
+      L: 207,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._isOpen = false;
-    await this._ctx.dispose();
     for (const space of this._spaces.values()) {
       await space.close();
     }
@@ -5098,12 +5492,12 @@ var DataSpaceManager = class {
   * Creates a new space writing the genesis credentials to the control feed.
   */
   async createSpace() {
-    (0, import_invariant16.invariant)(this._isOpen, "Not open.", {
-      F: __dxlog_file19,
-      L: 191,
+    (0, import_invariant17.invariant)(this._lifecycleState === import_context14.LifecycleState.OPEN, "Not open.", {
+      F: __dxlog_file20,
+      L: 219,
       S: this,
       A: [
-        "this._isOpen",
+        "this._lifecycleState === LifecycleState.OPEN",
         "'Not open.'"
       ]
     });
@@ -5117,11 +5511,11 @@ var DataSpaceManager = class {
       dataFeedKey,
       state: import_services15.SpaceState.SPACE_ACTIVE
     };
-    (0, import_log16.log)("creating space...", {
+    (0, import_log17.log)("creating space...", {
       spaceKey
     }, {
-      F: __dxlog_file19,
-      L: 203,
+      F: __dxlog_file20,
+      L: 231,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5131,9 +5525,9 @@ var DataSpaceManager = class {
     const credentials = await spaceGenesis(this._keyring, this._signingContext, space.inner, root.url);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
-    (0, import_invariant16.invariant)((0, import_credentials15.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file19,
-      L: 213,
+    (0, import_invariant17.invariant)((0, import_credentials15.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file20,
+      L: 241,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -5160,12 +5554,12 @@ var DataSpaceManager = class {
         return properties?.data?.[DEFAULT_SPACE_KEY] === this._signingContext.identityKey.toHex();
       }
       default:
-        import_log16.log.warn("unknown space version", {
+        import_log17.log.warn("unknown space version", {
           version: space.databaseRoot.getVersion(),
           spaceId: space.id
         }, {
-          F: __dxlog_file19,
-          L: 238,
+          F: __dxlog_file20,
+          L: 266,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5188,7 +5582,7 @@ var DataSpaceManager = class {
     };
     const propertiesId = (0, import_echo_schema2.generateEchoId)();
     document.change((doc) => {
-      (0, import_util10.assignDeep)(doc, [
+      (0, import_util11.assignDeep)(doc, [
         "objects",
         propertiesId
       ], properties);
@@ -5198,9 +5592,9 @@ var DataSpaceManager = class {
   }
   async _getSpaceRootDocument(space) {
     const automergeIndex = space.automergeSpaceState.rootUrl;
-    (0, import_invariant16.invariant)(automergeIndex, void 0, {
-      F: __dxlog_file19,
-      L: 271,
+    (0, import_invariant17.invariant)(automergeIndex, void 0, {
+      F: __dxlog_file20,
+      L: 299,
       S: this,
       A: [
         "automergeIndex",
@@ -5213,26 +5607,26 @@ var DataSpaceManager = class {
   }
   // TODO(burdon): Rename join space.
   async acceptSpace(opts) {
-    (0, import_log16.log)("accept space", {
+    (0, import_log17.log)("accept space", {
       opts
     }, {
-      F: __dxlog_file19,
-      L: 280,
+      F: __dxlog_file20,
+      L: 308,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant16.invariant)(this._isOpen, "Not open.", {
-      F: __dxlog_file19,
-      L: 281,
+    (0, import_invariant17.invariant)(this._lifecycleState === import_context14.LifecycleState.OPEN, "Not open.", {
+      F: __dxlog_file20,
+      L: 309,
       S: this,
       A: [
-        "this._isOpen",
+        "this._lifecycleState === LifecycleState.OPEN",
         "'Not open.'"
       ]
     });
-    (0, import_invariant16.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
-      F: __dxlog_file19,
-      L: 282,
+    (0, import_invariant17.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
+      F: __dxlog_file20,
+      L: 310,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -5254,9 +5648,9 @@ var DataSpaceManager = class {
   }
   async admitMember(options) {
     const space = this._spaceManager.spaces.get(options.spaceKey);
-    (0, import_invariant16.invariant)(space, void 0, {
-      F: __dxlog_file19,
-      L: 302,
+    (0, import_invariant17.invariant)(space, void 0, {
+      F: __dxlog_file20,
+      L: 330,
       S: this,
       A: [
         "space",
@@ -5264,12 +5658,12 @@ var DataSpaceManager = class {
       ]
     });
     if (space.spaceState.getMemberRole(options.identityKey) !== import_credentials16.SpaceMember.Role.REMOVED) {
-      throw new import_protocols11.AlreadyJoinedError();
+      throw new import_protocols12.AlreadyJoinedError();
     }
     const credentials = await (0, import_credentials15.createAdmissionCredentials)(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
-    (0, import_invariant16.invariant)(credentials[0].credential, void 0, {
-      F: __dxlog_file19,
-      L: 321,
+    (0, import_invariant17.invariant)(credentials[0].credential, void 0, {
+      F: __dxlog_file20,
+      L: 349,
       S: this,
       A: [
         "credentials[0].credential",
@@ -5277,9 +5671,9 @@ var DataSpaceManager = class {
       ]
     });
     const spaceMemberCredential = credentials[0].credential.credential;
-    (0, import_invariant16.invariant)((0, import_credentials15.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file19,
-      L: 323,
+    (0, import_invariant17.invariant)((0, import_credentials15.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file20,
+      L: 351,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -5295,7 +5689,7 @@ var DataSpaceManager = class {
   * TODO(dmaretskyi): Consider removing.
   */
   async waitUntilSpaceReady(spaceKey) {
-    await (0, import_context13.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
+    await (0, import_context14.cancelWithContext)(this._ctx, this.updated.waitForCondition(() => {
       const space = this._spaces.get(spaceKey);
       return !!space && space.state === import_services15.SpaceState.SPACE_READY;
     }));
@@ -5313,11 +5707,11 @@ var DataSpaceManager = class {
     });
   }
   async _constructSpace(metadata) {
-    (0, import_log16.log)("construct space", {
+    (0, import_log17.log)("construct space", {
       metadata
     }, {
-      F: __dxlog_file19,
-      L: 358,
+      F: __dxlog_file20,
+      L: 386,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5325,8 +5719,8 @@ var DataSpaceManager = class {
       localPeerId: this._signingContext.deviceKey
     });
     const presence = new import_teleport_extension_gossip2.Presence({
-      announceInterval: this._params?.spaceMemberPresenceAnnounceInterval ?? PRESENCE_ANNOUNCE_INTERVAL,
-      offlineTimeout: this._params?.spaceMemberPresenceOfflineTimeout ?? PRESENCE_OFFLINE_TIMEOUT,
+      announceInterval: this._runtimeParams?.spaceMemberPresenceAnnounceInterval ?? PRESENCE_ANNOUNCE_INTERVAL,
+      offlineTimeout: this._runtimeParams?.spaceMemberPresenceOfflineTimeout ?? PRESENCE_OFFLINE_TIMEOUT,
       identityKey: this._signingContext.identityKey,
       gossip
     });
@@ -5342,29 +5736,25 @@ var DataSpaceManager = class {
       swarmIdentity: {
         peerKey: this._signingContext.deviceKey,
         credentialProvider: createAuthProvider(this._signingContext.credentialSigner),
-        credentialAuthenticator: (0, import_util10.deferFunction)(() => dataSpace.authVerifier.verifier)
+        credentialAuthenticator: (0, import_util11.deferFunction)(() => dataSpace.authVerifier.verifier)
       },
       onAuthorizedConnection: (session) => queueMicrotask(async () => {
         try {
           if (!session.isOpen) {
             return;
           }
-          session.addExtension("dxos.mesh.teleport.admission-discovery", new import_echo_pipeline4.CredentialServerExtension(space));
+          session.addExtension("dxos.mesh.teleport.admission-discovery", new import_echo_pipeline3.CredentialServerExtension(space));
           session.addExtension("dxos.mesh.teleport.gossip", gossip.createExtension({
             remotePeerId: session.remotePeerId
           }));
           session.addExtension("dxos.mesh.teleport.notarization", dataSpace.notarizationPlugin.createExtension());
-          await this._echoHost.authorizeDevice(space.key, session.remotePeerId);
-          if (!session.isOpen) {
-            return;
-          }
-          session.addExtension("dxos.mesh.teleport.automerge", this._echoHost.createReplicationExtension());
+          await this._connectEchoMeshReplicator(space, session);
         } catch (err) {
-          import_log16.log.warn("error on authorized connection", {
+          import_log17.log.warn("error on authorized connection", {
             err
           }, {
-            F: __dxlog_file19,
-            L: 403,
+            F: __dxlog_file20,
+            L: 427,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -5372,9 +5762,9 @@ var DataSpaceManager = class {
         }
       }),
       onAuthFailure: () => {
-        import_log16.log.warn("auth failure", void 0, {
-          F: __dxlog_file19,
-          L: 408,
+        import_log17.log.warn("auth failure", void 0, {
+          F: __dxlog_file20,
+          L: 432,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5403,26 +5793,26 @@ var DataSpaceManager = class {
       signingContext: this._signingContext,
       callbacks: {
         beforeReady: async () => {
-          (0, import_log16.log)("before space ready", {
+          (0, import_log17.log)("before space ready", {
             space: space.key
           }, {
-            F: __dxlog_file19,
-            L: 435,
+            F: __dxlog_file20,
+            L: 459,
             S: this,
             C: (f, a) => f(...a)
           });
         },
         afterReady: async () => {
-          (0, import_log16.log)("after space ready", {
+          (0, import_log17.log)("after space ready", {
             space: space.key,
-            open: this._isOpen
+            open: this._lifecycleState === import_context14.LifecycleState.OPEN
           }, {
-            F: __dxlog_file19,
-            L: 438,
+            F: __dxlog_file20,
+            L: 462,
             S: this,
             C: (f, a) => f(...a)
           });
-          if (this._isOpen) {
+          if (this._lifecycleState === import_context14.LifecycleState.OPEN) {
             await this._createDelegatedInvitations(dataSpace, [
               ...space.spaceState.invitations.entries()
             ]);
@@ -5433,17 +5823,24 @@ var DataSpaceManager = class {
           }
         },
         beforeClose: async () => {
-          (0, import_log16.log)("before space close", {
+          (0, import_log17.log)("before space close", {
             space: space.key
           }, {
-            F: __dxlog_file19,
-            L: 446,
+            F: __dxlog_file20,
+            L: 470,
             S: this,
             C: (f, a) => f(...a)
           });
         }
       },
-      cache: metadata.cache
+      cache: metadata.cache,
+      edgeConnection: this._edgeConnection
+    });
+    dataSpace.postOpen.append(async () => {
+      await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
+    });
+    dataSpace.preClose.append(async () => {
+      await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
     });
     presence.newPeer.on((peerState) => {
       if (dataSpace.state === import_services15.SpaceState.SPACE_READY) {
@@ -5456,6 +5853,24 @@ var DataSpaceManager = class {
     this._spaces.set(metadata.key, dataSpace);
     return dataSpace;
   }
+  async _connectEchoMeshReplicator(space, session) {
+    const replicator = this._meshReplicator;
+    if (!replicator) {
+      import_log17.log.warn("p2p automerge replication disabled", {
+        space: space.key
+      }, {
+        F: __dxlog_file20,
+        L: 500,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      return;
+    }
+    await replicator.authorizeDevice(space.key, session.remotePeerId);
+    if (session.isOpen) {
+      session.addExtension("dxos.mesh.teleport.automerge", replicator.createExtension());
+    }
+  }
   _handleMemberRoleChanges(presence, spaceProtocol, memberInfo) {
     let closedSessions = 0;
     for (const member of memberInfo) {
@@ -5468,17 +5883,17 @@ var DataSpaceManager = class {
         return (s && member.role === import_credentials16.SpaceMember.Role.REMOVED !== (s.authStatus === import_echo_pipeline3.AuthStatus.FAILURE)) ?? false;
       });
       sessionsToClose.forEach((session) => {
-        void session.close().catch(import_log16.log.error);
+        void session.close().catch(import_log17.log.error);
       });
       closedSessions += sessionsToClose.length;
     }
-    (0, import_log16.log)("processed member role changes", {
+    (0, import_log17.log)("processed member role changes", {
       roleChangeCount: memberInfo.length,
       peersOnline: presence.getPeersOnline().length,
       closedSessions
     }, {
-      F: __dxlog_file19,
-      L: 482,
+      F: __dxlog_file20,
+      L: 526,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5489,15 +5904,15 @@ var DataSpaceManager = class {
     if (role === import_credentials16.SpaceMember.Role.REMOVED) {
       const session = peerState.peerId && space.protocol.sessions.get(peerState.peerId);
       if (session != null) {
-        (0, import_log16.log)("closing a session with a removed peer", {
+        (0, import_log17.log)("closing a session with a removed peer", {
           peerId: peerState.peerId
         }, {
-          F: __dxlog_file19,
-          L: 496,
+          F: __dxlog_file20,
+          L: 540,
           S: this,
           C: (f, a) => f(...a)
         });
-        void session.close().catch(import_log16.log.error);
+        void session.close().catch(import_log17.log.error);
       }
     }
   }
@@ -5538,21 +5953,21 @@ var DataSpaceManager = class {
   }
 };
 _ts_decorate6([
-  import_async16.synchronized
-], DataSpaceManager.prototype, "open", null);
+  import_async17.synchronized
+], DataSpaceManager.prototype, "_open", null);
 _ts_decorate6([
-  import_async16.synchronized
-], DataSpaceManager.prototype, "close", null);
+  import_async17.synchronized
+], DataSpaceManager.prototype, "_close", null);
 _ts_decorate6([
-  import_async16.synchronized
+  import_async17.synchronized
 ], DataSpaceManager.prototype, "createSpace", null);
 _ts_decorate6([
-  import_async16.synchronized
+  import_async17.synchronized
 ], DataSpaceManager.prototype, "acceptSpace", null);
 DataSpaceManager = _ts_decorate6([
-  (0, import_async16.trackLeaks)("open", "close")
+  (0, import_async17.trackLeaks)("open", "close")
 ], DataSpaceManager);
-var __dxlog_file20 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
+var __dxlog_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/spaces/spaces-service.ts";
 var SpacesServiceImpl = class {
   constructor(_identityManager, _spaceManager, _getDataSpaceManager) {
     this._identityManager = _identityManager;
@@ -5568,7 +5983,7 @@ var SpacesServiceImpl = class {
   }
   async updateSpace({ spaceKey, state }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
     if (state) {
       switch (state) {
         case import_services16.SpaceState.SPACE_ACTIVE:
@@ -5578,7 +5993,7 @@ var SpacesServiceImpl = class {
           await space.deactivate();
           break;
         default:
-          throw new import_protocols12.ApiError("Invalid space state");
+          throw new import_protocols13.ApiError("Invalid space state");
       }
     }
   }
@@ -5586,17 +6001,17 @@ var SpacesServiceImpl = class {
     const identity = this._requireIdentity();
     const space = this._spaceManager.spaces.get(request.spaceKey);
     if (space == null) {
-      throw new import_protocols12.SpaceNotFoundError(request.spaceKey);
+      throw new import_protocols13.SpaceNotFoundError(request.spaceKey);
     }
     if (!space.spaceState.hasMembershipManagementPermission(identity.identityKey)) {
-      throw new import_protocols12.AuthorizationError("No member management permission.", {
+      throw new import_protocols13.AuthorizationError("No member management permission.", {
         spaceKey: space.key,
         role: space.spaceState.getMemberRole(identity.identityKey)
       });
     }
     const credentials = await (0, import_credentials19.createAdmissionCredentials)(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
-    (0, import_invariant17.invariant)(credentials[0].credential, void 0, {
-      F: __dxlog_file20,
+    (0, import_invariant18.invariant)(credentials[0].credential, void 0, {
+      F: __dxlog_file21,
       L: 102,
       S: this,
       A: [
@@ -5605,8 +6020,8 @@ var SpacesServiceImpl = class {
       ]
     });
     const spaceMemberCredential = credentials[0].credential.credential;
-    (0, import_invariant17.invariant)((0, import_credentials19.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
-      F: __dxlog_file20,
+    (0, import_invariant18.invariant)((0, import_credentials19.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
+      F: __dxlog_file21,
       L: 104,
       S: this,
       A: [
@@ -5618,13 +6033,13 @@ var SpacesServiceImpl = class {
   }
   querySpaces() {
     return new import_codec_protobuf11.Stream(({ next, ctx }) => {
-      const scheduler = new import_async17.UpdateScheduler(ctx, async () => {
+      const scheduler = new import_async18.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
         const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
-        (0, import_log17.log)("update", () => ({
+        (0, import_log18.log)("update", () => ({
           ids: spaces.map((space) => space.id)
         }), {
-          F: __dxlog_file20,
+          F: __dxlog_file21,
           L: 115,
           S: this,
           C: (f, a) => f(...a)
@@ -5636,9 +6051,9 @@ var SpacesServiceImpl = class {
       }, {
         maxFrequency: process.env.NODE_ENV === "test" ? void 0 : 2
       });
-      (0, import_async17.scheduleTask)(ctx, async () => {
+      (0, import_async18.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const subscriptions = new import_async17.EventSubscriptions();
+        const subscriptions = new import_async18.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeSpaces = () => {
           subscriptions.clear();
@@ -5673,14 +6088,14 @@ var SpacesServiceImpl = class {
   }
   async postMessage({ spaceKey, channel, message }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
     await space.postMessage(getChannelId(channel), message);
   }
   subscribeMessages({ spaceKey, channel }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
-      (0, import_async17.scheduleTask)(ctx, async () => {
+      (0, import_async18.scheduleTask)(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
+        const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
         const handle = space.listen(getChannelId(channel), (message) => {
           next(message);
         });
@@ -5690,14 +6105,14 @@ var SpacesServiceImpl = class {
   }
   queryCredentials({ spaceKey, noTail }) {
     return new import_codec_protobuf11.Stream(({ ctx, next, close }) => {
-      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
+      const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
       const processor = {
         processCredential: async (credential) => {
           next(credential);
         }
       };
       ctx.onDispose(() => space.spaceState.removeCredentialProcessor(processor));
-      (0, import_async17.scheduleTask)(ctx, async () => {
+      (0, import_async18.scheduleTask)(ctx, async () => {
         await space.spaceState.addCredentialProcessor(processor);
         if (noTail) {
           close();
@@ -5706,7 +6121,7 @@ var SpacesServiceImpl = class {
     });
   }
   async writeCredentials({ spaceKey, credentials }) {
-    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
+    const space = this._spaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
     for (const credential of credentials ?? []) {
       if (credential.proof) {
         await space.controlPipeline.writer.write({
@@ -5715,8 +6130,8 @@ var SpacesServiceImpl = class {
           }
         });
       } else {
-        (0, import_invariant17.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
-          F: __dxlog_file20,
+        (0, import_invariant18.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
+          F: __dxlog_file21,
           L: 213,
           S: this,
           A: [
@@ -5724,8 +6139,8 @@ var SpacesServiceImpl = class {
             "'Id on unsigned credentials is not allowed'"
           ]
         });
-        (0, import_invariant17.invariant)(this._identityManager.identity, "Identity is not available", {
-          F: __dxlog_file20,
+        (0, import_invariant18.invariant)(this._identityManager.identity, "Identity is not available", {
+          F: __dxlog_file21,
           L: 214,
           S: this,
           A: [
@@ -5734,8 +6149,8 @@ var SpacesServiceImpl = class {
           ]
         });
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
-        (0, import_invariant17.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
-          F: __dxlog_file20,
+        (0, import_invariant18.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
+          F: __dxlog_file21,
           L: 216,
           S: this,
           A: [
@@ -5757,7 +6172,7 @@ var SpacesServiceImpl = class {
   }
   async createEpoch({ spaceKey, migration, automergeRootUrl }) {
     const dataSpaceManager = await this._getDataSpaceManager();
-    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols12.SpaceNotFoundError(spaceKey));
+    const space = dataSpaceManager.spaces.get(spaceKey) ?? (0, import_debug5.raise)(new import_protocols13.SpaceNotFoundError(spaceKey));
     const result = await space.createEpoch({
       migration,
       newAutomergeRoot: automergeRootUrl
@@ -5784,8 +6199,8 @@ var SpacesServiceImpl = class {
   }
   async _joinByAdmission({ credential }) {
     const assertion = (0, import_credentials19.getCredentialAssertion)(credential);
-    (0, import_invariant17.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
-      F: __dxlog_file20,
+    (0, import_invariant18.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
+      F: __dxlog_file21,
       L: 250,
       S: this,
       A: [
@@ -5794,8 +6209,8 @@ var SpacesServiceImpl = class {
       ]
     });
     const myIdentity = this._identityManager.identity;
-    (0, import_invariant17.invariant)(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
-      F: __dxlog_file20,
+    (0, import_invariant18.invariant)(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
+      F: __dxlog_file21,
       L: 252,
       S: this,
       A: [
@@ -5825,7 +6240,7 @@ var SpacesServiceImpl = class {
       id: space.id,
       spaceKey: space.key,
       state: space.state,
-      error: space.error ? (0, import_protocols12.encodeError)(space.error) : void 0,
+      error: space.error ? (0, import_protocols13.encodeError)(space.error) : void 0,
       pipeline: {
         currentEpoch: space.automergeSpaceState.lastEpoch,
         appliedEpoch: space.automergeSpaceState.lastEpoch,
@@ -5863,7 +6278,7 @@ var SpacesServiceImpl = class {
   }
   _requireIdentity() {
     if (!this._identityManager.identity) {
-      throw new import_protocols12.IdentityNotInitializedError("This device has no HALO identity available. See https://docs.dxos.org/guide/platform/halo");
+      throw new import_protocols13.IdentityNotInitializedError("This device has no HALO identity available. See https://docs.dxos.org/guide/platform/halo");
     }
     return this._identityManager.identity;
   }
@@ -5890,20 +6305,23 @@ function _ts_decorate7(decorators, target, key, desc) {
         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_file21 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class extends import_context14.Resource {
-  constructor(storage, level, networkManager, signalManager, _runtimeParams) {
+var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var ServiceContext = class extends import_context15.Resource {
+  constructor(storage, level, networkManager, signalManager, _edgeConnection, _runtimeParams) {
     super();
     this.storage = storage;
     this.level = level;
     this.networkManager = networkManager;
     this.signalManager = signalManager;
+    this._edgeConnection = _edgeConnection;
     this._runtimeParams = _runtimeParams;
-    this.initialized = new import_async18.Trigger();
+    this.initialized = new import_async19.Trigger();
+    this._meshReplicator = void 0;
+    this._echoEdgeReplicator = void 0;
     this._handlerFactories = /* @__PURE__ */ new Map();
-    this._instanceId = import_keys13.PublicKey.random().toHex();
-    this.metadataStore = new import_echo_pipeline5.MetadataStore(storage.createDirectory("metadata"));
-    this.snapshotStore = new import_echo_pipeline5.SnapshotStore(storage.createDirectory("snapshots"));
+    this._instanceId = import_keys14.PublicKey.random().toHex();
+    this.metadataStore = new import_echo_pipeline4.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_pipeline4.SnapshotStore(storage.createDirectory("snapshots"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
     this.feedStore = new import_feed_store6.FeedStore({
@@ -5911,17 +6329,18 @@ var ServiceContext = class extends import_context14.Resource {
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline5.valueEncoding,
+          valueEncoding: import_echo_pipeline4.valueEncoding,
           stats: true
         }
       })
     });
-    this.spaceManager = new import_echo_pipeline5.SpaceManager({
+    this.spaceManager = new import_echo_pipeline4.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager,
       blobStore: this.blobStore,
       metadataStore: this.metadataStore,
-      snapshotStore: this.snapshotStore
+      snapshotStore: this.snapshotStore,
+      disableP2pReplication: this._runtimeParams?.disableP2pReplication
     });
     this.identityManager = new IdentityManager(this.metadataStore, this.keyring, this.feedStore, this.spaceManager, this._runtimeParams);
     this.echoHost = new import_echo_db3.EchoHost({
@@ -5930,26 +6349,41 @@ var ServiceContext = class extends import_context14.Resource {
     this.invitations = new InvitationsHandler(this.networkManager, _runtimeParams?.invitationConnectionDefaultParams);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
     this._handlerFactories.set(import_services17.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
+    if (!this._runtimeParams?.disableP2pReplication) {
+      this._meshReplicator = new import_echo_pipeline4.MeshEchoReplicator();
+    }
+    if (this._edgeConnection) {
+      this._echoEdgeReplicator = new import_echo_db3.EchoEdgeReplicator({
+        edgeConnection: this._edgeConnection
+      });
+    }
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    (0, import_log18.log)("opening...", void 0, {
-      F: __dxlog_file21,
-      L: 149,
+    (0, import_log19.log)("opening...", void 0, {
+      F: __dxlog_file22,
+      L: 166,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log18.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.begin({
+    import_log19.log.trace("dxos.sdk.service-context.open", import_protocols14.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file21,
-      L: 150,
+      F: __dxlog_file22,
+      L: 167,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.signalManager.open();
     await this.networkManager.open();
+    await this._edgeConnection?.open();
     await this.echoHost.open(ctx);
+    if (this._meshReplicator) {
+      await this.echoHost.addReplicator(this._meshReplicator);
+    }
+    if (this._echoEdgeReplicator) {
+      await this.echoHost.addReplicator(this._echoEdgeReplicator);
+    }
     await this.metadataStore.load();
     await this.spaceManager.open();
     await this.identityManager.open(ctx);
@@ -5957,33 +6391,33 @@ var ServiceContext = class extends import_context14.Resource {
       await this._initialize(ctx);
     }
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
-    (0, import_log18.log)("loaded persistent invitations", {
+    (0, import_log19.log)("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file21,
-      L: 163,
+      F: __dxlog_file22,
+      L: 189,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log18.log.trace("dxos.sdk.service-context.open", import_protocols13.trace.end({
+    import_log19.log.trace("dxos.sdk.service-context.open", import_protocols14.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file21,
-      L: 165,
+      F: __dxlog_file22,
+      L: 191,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log18.log)("opened", void 0, {
-      F: __dxlog_file21,
-      L: 166,
+    (0, import_log19.log)("opened", void 0, {
+      F: __dxlog_file22,
+      L: 192,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    (0, import_log18.log)("closing...", void 0, {
-      F: __dxlog_file21,
-      L: 170,
+    (0, import_log19.log)("closing...", void 0, {
+      F: __dxlog_file22,
+      L: 196,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5998,26 +6432,27 @@ var ServiceContext = class extends import_context14.Resource {
     await this.echoHost.close(ctx);
     await this.networkManager.close();
     await this.signalManager.close();
-    (0, import_log18.log)("closed", void 0, {
-      F: __dxlog_file21,
-      L: 182,
+    await this._edgeConnection?.close();
+    (0, import_log19.log)("closed", void 0, {
+      F: __dxlog_file22,
+      L: 211,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize(new import_context14.Context(void 0, {
-      F: __dxlog_file21,
-      L: 187
+    await this._initialize(new import_context15.Context(void 0, {
+      F: __dxlog_file22,
+      L: 216
     }));
     return identity;
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_invariant18.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file21,
-      L: 193,
+    (0, import_invariant19.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file22,
+      L: 222,
       S: this,
       A: [
         "factory",
@@ -6036,23 +6471,23 @@ var ServiceContext = class extends import_context14.Resource {
   }
   async _acceptIdentity(params) {
     const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new import_context14.Context(void 0, {
-      F: __dxlog_file21,
-      L: 209
+    await this._initialize(new import_context15.Context(void 0, {
+      F: __dxlog_file22,
+      L: 238
     }));
     return identity;
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== import_protocols13.STORAGE_VERSION) {
-      throw new import_protocols13.InvalidStorageVersionError(import_protocols13.STORAGE_VERSION, this.metadataStore.version);
+    if (this.metadataStore.version !== import_protocols14.STORAGE_VERSION) {
+      throw new import_protocols14.InvalidStorageVersionError(import_protocols14.STORAGE_VERSION, this.metadataStore.version);
     }
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    (0, import_log18.log)("initializing spaces...", void 0, {
-      F: __dxlog_file21,
-      L: 224,
+    (0, import_log19.log)("initializing spaces...", void 0, {
+      F: __dxlog_file22,
+      L: 253,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6070,12 +6505,24 @@ var ServiceContext = class extends import_context14.Resource {
         });
       }
     };
-    this.dataSpaceManager = new DataSpaceManager(this.spaceManager, this.metadataStore, this.keyring, signingContext, this.feedStore, this.echoHost, this.invitationsManager, this._runtimeParams);
+    this.dataSpaceManager = new DataSpaceManager({
+      spaceManager: this.spaceManager,
+      metadataStore: this.metadataStore,
+      keyring: this.keyring,
+      signingContext,
+      feedStore: this.feedStore,
+      echoHost: this.echoHost,
+      invitationsManager: this.invitationsManager,
+      edgeConnection: this._edgeConnection,
+      echoEdgeReplicator: this._echoEdgeReplicator,
+      meshReplicator: this._meshReplicator,
+      runtimeParams: this._runtimeParams
+    });
     await this.dataSpaceManager.open();
     this._handlerFactories.set(import_services17.Invitation.Kind.SPACE, (invitation) => {
-      (0, import_invariant18.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file21,
-        L: 249,
+      (0, import_invariant19.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file22,
+        L: 281,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -6095,33 +6542,33 @@ var ServiceContext = class extends import_context14.Resource {
           return;
         }
         if (!this.dataSpaceManager) {
-          (0, import_log18.log)("dataSpaceManager not initialized yet, ignoring space admission", {
+          (0, import_log19.log)("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file21,
-            L: 265,
+            F: __dxlog_file22,
+            L: 297,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          (0, import_log18.log)("space already exists, ignoring space admission", {
+          (0, import_log19.log)("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file21,
-            L: 269,
+            F: __dxlog_file22,
+            L: 301,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         try {
-          (0, import_log18.log)("accepting space recorded in halo", {
+          (0, import_log19.log)("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file21,
-            L: 274,
+            F: __dxlog_file22,
+            L: 306,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6130,9 +6577,9 @@ var ServiceContext = class extends import_context14.Resource {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          import_log18.log.catch(err, void 0, {
-            F: __dxlog_file21,
-            L: 280,
+          import_log19.log.catch(err, void 0, {
+            F: __dxlog_file22,
+            L: 312,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6149,7 +6596,7 @@ _ts_decorate7([
   import_tracing10.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
 ServiceContext = _ts_decorate7([
-  (0, import_util11.safeInstanceof)("dxos.client-services.ServiceContext"),
+  (0, import_util12.safeInstanceof)("dxos.client-services.ServiceContext"),
   import_tracing10.trace.resource()
 ], ServiceContext);
 var ServiceRegistry = class {
@@ -6175,7 +6622,7 @@ var ServiceRegistry = class {
   }
 };
 var getRootPath = (config) => {
-  const { dataRoot = (0, import_util12.isNode)() ? import_client_protocol7.DX_DATA : "dxos/storage" } = config ?? {};
+  const { dataRoot = (0, import_util13.isNode)() ? import_client_protocol7.DX_DATA : "dxos/storage" } = config ?? {};
   return `${dataRoot}/`;
 };
 var isPersistent = (config) => {
@@ -6186,16 +6633,16 @@ var StorageDriver = import_config2.Runtime.Client.Storage.StorageDriver;
 var createStorageObjects = (config) => {
   const { persistent = false, keyStore, dataStore } = config ?? {};
   if (persistent && dataStore === StorageDriver.RAM) {
-    throw new import_protocols14.InvalidConfigError("RAM storage cannot be used in persistent mode.");
+    throw new import_protocols15.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
   if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new import_protocols14.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+    throw new import_protocols15.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
   }
   if (persistent && keyStore === StorageDriver.RAM) {
-    throw new import_protocols14.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+    throw new import_protocols15.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
   }
   if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new import_protocols14.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+    throw new import_protocols15.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
   }
   return {
     storage: (0, import_random_access_storage.createStorage)({
@@ -6226,12 +6673,12 @@ var toStorageType = (type) => {
 };
 var createLevel = async (config) => {
   const persistent = isPersistent(config);
-  const storagePath = persistent ? import_node_path.default.join(getRootPath(config), "level") : `/tmp/dxos-${import_keys14.PublicKey.random().toHex()}`;
+  const storagePath = persistent ? import_node_path.default.join(getRootPath(config), "level") : `/tmp/dxos-${import_keys15.PublicKey.random().toHex()}`;
   const level = (0, import_kv_store.createLevel)(storagePath);
   await level.open();
   return level;
 };
-var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
+var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
 var encodeProfileArchive = (profile) => import_automerge_repo.cbor.encode(profile);
 var decodeProfileArchive = (data) => import_automerge_repo.cbor.decode(data);
 var exportProfileData = async ({ storage, level }) => {
@@ -6244,10 +6691,10 @@ var exportProfileData = async ({ storage, level }) => {
   {
     const directory = await storage.createDirectory();
     const files = await directory.list();
-    import_log19.log.info("begin exporting files", {
+    import_log20.log.info("begin exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 30,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6257,23 +6704,23 @@ var exportProfileData = async ({ storage, level }) => {
       const { size } = await file.stat();
       const data = await file.read(0, size);
       archive.storage.push({
-        type: import_protocols15.ProfileArchiveEntryType.FILE,
+        type: import_protocols16.ProfileArchiveEntryType.FILE,
         key: filename,
         value: data
       });
     }
-    import_log19.log.info("done exporting files", {
+    import_log20.log.info("done exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
   }
   {
-    import_log19.log.info("begin exporting kv pairs", void 0, {
-      F: __dxlog_file22,
+    import_log20.log.info("begin exporting kv pairs", void 0, {
+      F: __dxlog_file23,
       L: 45,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6285,16 +6732,16 @@ var exportProfileData = async ({ storage, level }) => {
     let count = 0;
     for await (const [key, value] of iter) {
       archive.storage.push({
-        type: import_protocols15.ProfileArchiveEntryType.KEY_VALUE,
+        type: import_protocols16.ProfileArchiveEntryType.KEY_VALUE,
         key,
         value
       });
       count++;
     }
-    import_log19.log.info("done exporting kv pairs", {
+    import_log20.log.info("done exporting kv pairs", {
       count
     }, {
-      F: __dxlog_file22,
+      F: __dxlog_file23,
       L: 56,
       S: void 0,
       C: (f, a) => f(...a)
@@ -6307,10 +6754,10 @@ var importProfileData = async ({ storage, level }, archive) => {
   let count = 0;
   for (const entry2 of archive.storage) {
     switch (entry2.type) {
-      case import_protocols15.ProfileArchiveEntryType.FILE: {
+      case import_protocols16.ProfileArchiveEntryType.FILE: {
         const directory = await storage.createDirectory();
-        (0, import_invariant19.invariant)(typeof entry2.key === "string", "Invalid key type", {
-          F: __dxlog_file22,
+        (0, import_invariant20.invariant)(typeof entry2.key === "string", "Invalid key type", {
+          F: __dxlog_file23,
           L: 79,
           S: void 0,
           A: [
@@ -6319,8 +6766,8 @@ var importProfileData = async ({ storage, level }, archive) => {
           ]
         });
         const file = await directory.getOrCreateFile(entry2.key);
-        (0, import_invariant19.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file22,
+        (0, import_invariant20.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file23,
           L: 81,
           S: void 0,
           A: [
@@ -6328,13 +6775,13 @@ var importProfileData = async ({ storage, level }, archive) => {
             "'Invalid value type'"
           ]
         });
-        await file.write(0, (0, import_util13.arrayToBuffer)(entry2.value));
+        await file.write(0, (0, import_util14.arrayToBuffer)(entry2.value));
         await file.close();
         break;
       }
-      case import_protocols15.ProfileArchiveEntryType.KEY_VALUE: {
-        (0, import_invariant19.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
-          F: __dxlog_file22,
+      case import_protocols16.ProfileArchiveEntryType.KEY_VALUE: {
+        (0, import_invariant20.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
+          F: __dxlog_file23,
           L: 87,
           S: void 0,
           A: [
@@ -6342,8 +6789,8 @@ var importProfileData = async ({ storage, level }, archive) => {
             "'Invalid key type'"
           ]
         });
-        (0, import_invariant19.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file22,
+        (0, import_invariant20.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file23,
           L: 88,
           S: void 0,
           A: [
@@ -6363,27 +6810,27 @@ var importProfileData = async ({ storage, level }, archive) => {
     if (++count % 1e3 === 0) {
       await batch.write();
       batch = level.batch();
-      import_log19.log.info("importing", {
+      import_log20.log.info("importing", {
         count,
         total: archive.storage.length,
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
-        F: __dxlog_file22,
+        F: __dxlog_file23,
         L: 101,
         S: void 0,
         C: (f, a) => f(...a)
       });
     }
   }
-  import_log19.log.info("committing changes..", void 0, {
-    F: __dxlog_file22,
+  import_log20.log.info("committing changes..", void 0, {
+    F: __dxlog_file23,
     L: 109,
     S: void 0,
     C: (f, a) => f(...a)
   });
   await batch.write();
 };
-var __dxlog_file23 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -6400,8 +6847,8 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
-          (0, import_invariant21.invariant)(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file23,
+          (0, import_invariant22.invariant)(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file24,
             L: 32,
             S: this,
             A: [
@@ -6442,7 +6889,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async20.EventSubscriptions();
+      const subscriptions = new import_async21.EventSubscriptions();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -6498,7 +6945,7 @@ var ContactsServiceImpl = class {
         });
       }
       return acc;
-    }, new import_util14.ComplexMap(import_keys16.PublicKey.hash));
+    }, new import_util15.ComplexMap(import_keys17.PublicKey.hash));
     return {
       contacts: [
         ...contacts.values()
@@ -6506,16 +6953,16 @@ var ContactsServiceImpl = class {
     };
   }
   queryContacts() {
-    const subscribedSpaceKeySet = new import_util14.ComplexSet(import_keys16.PublicKey.hash);
+    const subscribedSpaceKeySet = new import_util15.ComplexSet(import_keys17.PublicKey.hash);
     return new import_codec_protobuf13.Stream(({ next, ctx }) => {
-      const pushUpdateTask = new import_async21.UpdateScheduler(ctx, async () => {
+      const pushUpdateTask = new import_async22.UpdateScheduler(ctx, async () => {
         const contacts = await this.getContacts();
         next(contacts);
       }, {
         maxFrequency: 2
       });
-      (0, import_async21.scheduleTask)(ctx, async () => {
-        const subscriptions = new import_async21.EventSubscriptions();
+      (0, import_async22.scheduleTask)(ctx, async () => {
+        const subscriptions = new import_async22.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeToSpaceAndUpdate = () => {
           const oldSetSize = subscribedSpaceKeySet.size;
@@ -6538,31 +6985,31 @@ var ContactsServiceImpl = class {
 };
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async22.Event();
+    this._logs = new import_async23.Event();
     this._started = Date.now();
-    this._sessionId = import_keys17.PublicKey.random().toHex();
+    this._sessionId = import_keys18.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
   }
   async open() {
-    import_log21.log.runtimeConfig.processors.push(this._logProcessor);
+    import_log22.log.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = import_log21.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    import_log21.log.runtimeConfig.processors.splice(index, 1);
+    const index = import_log22.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    import_log22.log.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
-      import_util15.tracer.clear();
+      import_util16.tracer.clear();
     }
     if (record === true) {
-      import_util15.tracer.start();
+      import_util16.tracer.start();
     } else if (record === false) {
-      import_util15.tracer.stop();
+      import_util16.tracer.stop();
     }
     return {
-      recording: import_util15.tracer.recording
+      recording: import_util16.tracer.recording
     };
   }
   /**
@@ -6570,10 +7017,10 @@ var LoggingServiceImpl = class {
   */
   queryMetrics({ interval = 5e3 }) {
     const getNumericalValues = (key) => {
-      const events = import_util15.tracer.get(key) ?? [];
+      const events = import_util16.tracer.get(key) ?? [];
       return {
         key,
-        stats: (0, import_util15.numericalValues)(events, "duration")
+        stats: (0, import_util16.numericalValues)(events, "duration")
       };
     };
     return new import_codec_protobuf14.Stream(({ next }) => {
@@ -6611,7 +7058,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util15.jsonify)((0, import_log21.getContextFromEntry)(entry2)),
+          context: (0, import_util16.jsonify)((0, import_log22.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -6620,7 +7067,7 @@ var LoggingServiceImpl = class {
             scope: {
               hostSessionId: this._sessionId,
               uptimeSeconds: (Date.now() - this._started) / 1e3,
-              name: (0, import_util15.getDebugName)(entry2.meta?.S)
+              name: (0, import_util16.getDebugName)(entry2.meta?.S)
             }
           }
         };
@@ -6701,7 +7148,7 @@ var SystemServiceImpl = class {
     const diagnostics = await this._getDiagnostics();
     return {
       timestamp: /* @__PURE__ */ new Date(),
-      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util16.jsonKeyReplacer)({
+      diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util17.jsonKeyReplacer)({
         truncate: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
         humanize: keys === import_services21.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
@@ -6744,7 +7191,7 @@ function _ts_decorate8(decorators, target, key, desc) {
         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_file24 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -6758,13 +7205,17 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = import_tracing11.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async19.Event();
+    this._statusUpdate = new import_async20.Event();
+    this._edgeConnection = void 0;
     this._opening = false;
     this._open = false;
     this._storage = storage;
     this._level = level;
     this._callbacks = callbacks;
     this._runtimeParams = runtimeParams ?? {};
+    if (this._runtimeParams.disableP2pReplication === void 0) {
+      this._runtimeParams.disableP2pReplication = config?.get("runtime.client.disableP2pReplication", false);
+    }
     if (config) {
       this.initialize({
         config,
@@ -6777,9 +7228,9 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new import_context15.Context(void 0, {
-              F: __dxlog_file24,
-              L: 121
+            void this.open(new import_context16.Context(void 0, {
+              F: __dxlog_file25,
+              L: 132
             }));
           }
         },
@@ -6835,25 +7286,25 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    (0, import_invariant20.invariant)(!this._open, "service host is open", {
-      F: __dxlog_file24,
-      L: 187,
+    (0, import_invariant21.invariant)(!this._open, "service host is open", {
+      F: __dxlog_file25,
+      L: 198,
       S: this,
       A: [
         "!this._open",
         "'service host is open'"
       ]
     });
-    (0, import_log20.log)("initializing...", void 0, {
-      F: __dxlog_file24,
-      L: 188,
+    (0, import_log21.log)("initializing...", void 0, {
+      F: __dxlog_file25,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      (0, import_invariant20.invariant)(!this._config, "config already set", {
-        F: __dxlog_file24,
-        L: 191,
+      (0, import_invariant21.invariant)(!this._config, "config already set", {
+        F: __dxlog_file25,
+        L: 202,
         S: this,
         A: [
           "!this._config",
@@ -6866,20 +7317,20 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      import_log20.log.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file24,
-        L: 199,
+      import_log21.log.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file25,
+        L: 210,
         S: this,
         C: (f, a) => f(...a)
       });
     }
     const { connectionLog = true, transportFactory = (0, import_network_manager2.createSimplePeerTransportFactory)({
       iceServers: this._config?.get("runtime.services.ice")
-    }), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
+    }, this._config?.get("runtime.services.iceProviders") && (0, import_network_manager2.createIceProvider)(this._config.get("runtime.services.iceProviders"))), signalManager = new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    (0, import_invariant20.invariant)(!this._networkManager, "network manager already set", {
-      F: __dxlog_file24,
-      L: 210,
+    (0, import_invariant21.invariant)(!this._networkManager, "network manager already set", {
+      F: __dxlog_file25,
+      L: 223,
       S: this,
       A: [
         "!this._networkManager",
@@ -6891,9 +7342,15 @@ var ClientServicesHost = class {
       transportFactory,
       signalManager
     });
-    (0, import_log20.log)("initialized", void 0, {
-      F: __dxlog_file24,
-      L: 217,
+    const edgeEndpoint = config?.get("runtime.services.edge.url");
+    if (edgeEndpoint) {
+      this._edgeConnection = new import_edge_client.EdgeClient(import_keys16.PublicKey.random(), import_keys16.PublicKey.random(), {
+        socketEndpoint: edgeEndpoint
+      });
+    }
+    (0, import_log21.log)("initialized", void 0, {
+      F: __dxlog_file25,
+      L: 238,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6902,45 +7359,45 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = import_keys15.PublicKey.random().toHex();
-    import_log20.log.trace("dxos.client-services.host.open", import_protocols16.trace.begin({
+    const traceId = import_keys16.PublicKey.random().toHex();
+    import_log21.log.trace("dxos.client-services.host.open", import_protocols17.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file24,
-      L: 228,
+      F: __dxlog_file25,
+      L: 249,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant20.invariant)(this._config, "config not set", {
-      F: __dxlog_file24,
-      L: 230,
+    (0, import_invariant21.invariant)(this._config, "config not set", {
+      F: __dxlog_file25,
+      L: 251,
       S: this,
       A: [
         "this._config",
         "'config not set'"
       ]
     });
-    (0, import_invariant20.invariant)(this._storage, "storage not set", {
-      F: __dxlog_file24,
-      L: 231,
+    (0, import_invariant21.invariant)(this._storage, "storage not set", {
+      F: __dxlog_file25,
+      L: 252,
       S: this,
       A: [
         "this._storage",
         "'storage not set'"
       ]
     });
-    (0, import_invariant20.invariant)(this._signalManager, "signal manager not set", {
-      F: __dxlog_file24,
-      L: 232,
+    (0, import_invariant21.invariant)(this._signalManager, "signal manager not set", {
+      F: __dxlog_file25,
+      L: 253,
       S: this,
       A: [
         "this._signalManager",
         "'signal manager not set'"
       ]
     });
-    (0, import_invariant20.invariant)(this._networkManager, "network manager not set", {
-      F: __dxlog_file24,
-      L: 233,
+    (0, import_invariant21.invariant)(this._networkManager, "network manager not set", {
+      F: __dxlog_file25,
+      L: 254,
       S: this,
       A: [
         "this._networkManager",
@@ -6948,11 +7405,11 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    (0, import_log20.log)("opening...", {
+    (0, import_log21.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file24,
-      L: 236,
+      F: __dxlog_file25,
+      L: 257,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6962,7 +7419,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._runtimeParams);
+    this._serviceContext = new ServiceContext(this._storage, this._level, this._networkManager, this._signalManager, this._edgeConnection, this._runtimeParams);
     const dataSpaceManagerProvider = async () => {
       await this._serviceContext.initialized.wait();
       return this._serviceContext.dataSpaceManager;
@@ -7004,19 +7461,19 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log20.log)("opened", {
+    (0, import_log21.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file24,
-      L: 322,
+      F: __dxlog_file25,
+      L: 344,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log20.log.trace("dxos.client-services.host.open", import_protocols16.trace.end({
+    import_log21.log.trace("dxos.client-services.host.open", import_protocols17.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file24,
-      L: 323,
+      F: __dxlog_file25,
+      L: 345,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7026,11 +7483,11 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log20.log)("closing...", {
+    (0, import_log21.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file24,
-      L: 334,
+      F: __dxlog_file25,
+      L: 356,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7044,44 +7501,44 @@ var ClientServicesHost = class {
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log20.log)("closed", {
+    (0, import_log21.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file24,
-      L: 343,
+      F: __dxlog_file25,
+      L: 365,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = import_keys15.PublicKey.random().toHex();
-    import_log20.log.trace("dxos.sdk.client-services-host.reset", import_protocols16.trace.begin({
+    const traceId = import_keys16.PublicKey.random().toHex();
+    import_log21.log.trace("dxos.sdk.client-services-host.reset", import_protocols17.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file24,
-      L: 348,
+      F: __dxlog_file25,
+      L: 370,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log20.log.info("resetting...", void 0, {
-      F: __dxlog_file24,
-      L: 350,
+    import_log21.log.info("resetting...", void 0, {
+      F: __dxlog_file25,
+      L: 372,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    import_log20.log.info("reset", void 0, {
-      F: __dxlog_file24,
-      L: 353,
+    import_log21.log.info("reset", void 0, {
+      F: __dxlog_file25,
+      L: 375,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log20.log.trace("dxos.sdk.client-services-host.reset", import_protocols16.trace.end({
+    import_log21.log.trace("dxos.sdk.client-services-host.reset", import_protocols17.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file24,
-      L: 354,
+      F: __dxlog_file25,
+      L: 376,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7100,11 +7557,11 @@ _ts_decorate8([
   import_tracing11.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
 _ts_decorate8([
-  import_async19.synchronized,
+  import_async20.synchronized,
   import_tracing11.trace.span()
 ], ClientServicesHost.prototype, "open", null);
 _ts_decorate8([
-  import_async19.synchronized,
+  import_async20.synchronized,
   import_tracing11.trace.span()
 ], ClientServicesHost.prototype, "close", null);
 ClientServicesHost = _ts_decorate8([
@@ -7120,6 +7577,7 @@ ClientServicesHost = _ts_decorate8([
   DevtoolsHostEvents,
   DevtoolsServiceImpl,
   DiagnosticsCollector,
+  EdgeFeedReplicator,
   Identity,
   IdentityManager,
   IdentityServiceImpl,
@@ -7153,4 +7611,4 @@ ClientServicesHost = _ts_decorate8([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-NDXK2NIM.cjs.map
+//# sourceMappingURL=chunk-DRNEKKQP.cjs.map