@dxos/client-services 0.6.13-main.548ca8d → 0.6.13-main.ed424a1

package/dist/lib/node/{chunk-MA5EWTRH.cjs → chunk-DJIOUOAF.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_MA5EWTRH_exports = {};
-__export(chunk_MA5EWTRH_exports, {
+var chunk_DJIOUOAF_exports = {};
+__export(chunk_DJIOUOAF_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -36,6 +36,8 @@ __export(chunk_MA5EWTRH_exports, {
   DevtoolsHostEvents: () => DevtoolsHostEvents,
   DevtoolsServiceImpl: () => DevtoolsServiceImpl,
   DiagnosticsCollector: () => DiagnosticsCollector,
+  EdgeAgentManager: () => EdgeAgentManager,
+  EdgeAgentServiceImpl: () => EdgeAgentServiceImpl,
   EdgeFeedReplicator: () => EdgeFeedReplicator,
   Identity: () => Identity,
   IdentityManager: () => IdentityManager,
@@ -70,7 +72,7 @@ __export(chunk_MA5EWTRH_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_MA5EWTRH_exports);
+module.exports = __toCommonJS(chunk_DJIOUOAF_exports);
 var import_async = require("@dxos/async");
 var import_codec_protobuf = require("@dxos/codec-protobuf");
 var import_feed_store = require("@dxos/feed-store");
@@ -219,6 +221,7 @@ var import_invariant10 = require("@dxos/invariant");
 var import_log12 = require("@dxos/log");
 var import_services9 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util9 = require("@dxos/util");
+var import_credentials17 = require("@dxos/credentials");
 var import_invariant11 = require("@dxos/invariant");
 var import_protocols8 = require("@dxos/protocols");
 var import_services10 = require("@dxos/protocols/proto/dxos/client/services");
@@ -275,23 +278,23 @@ var import_invitations5 = require("@dxos/protocols/proto/dxos/halo/invitations")
 var import_util11 = require("@dxos/util");
 var import_codec_protobuf10 = require("@dxos/codec-protobuf");
 var import_services16 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials17 = require("@dxos/credentials");
+var import_credentials18 = require("@dxos/credentials");
 var import_feed_store5 = require("@dxos/feed-store");
 var import_invariant17 = require("@dxos/invariant");
 var import_log19 = require("@dxos/log");
 var import_protocols13 = require("@dxos/protocols");
 var import_services17 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials18 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_credentials19 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_async20 = require("@dxos/async");
 var import_client_protocol6 = require("@dxos/client-protocol");
 var import_context14 = require("@dxos/context");
-var import_credentials19 = require("@dxos/credentials");
+var import_credentials20 = require("@dxos/credentials");
 var import_echo_pipeline4 = require("@dxos/echo-pipeline");
 var import_invariant18 = require("@dxos/invariant");
 var import_keys14 = require("@dxos/keys");
 var import_log20 = require("@dxos/log");
 var import_services18 = require("@dxos/protocols/proto/dxos/client/services");
-var import_credentials20 = require("@dxos/protocols/proto/dxos/halo/credentials");
+var import_credentials21 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_invariant19 = require("@dxos/invariant");
 var import_lock_file = require("@dxos/lock-file");
 var import_log21 = require("@dxos/log");
@@ -301,64 +304,74 @@ var import_rpc = require("@dxos/rpc");
 var import_tracing9 = require("@dxos/tracing");
 var import_async21 = require("@dxos/async");
 var import_context15 = require("@dxos/context");
-var import_credentials21 = require("@dxos/credentials");
-var import_debug6 = require("@dxos/debug");
-var import_echo_pipeline5 = require("@dxos/echo-pipeline");
-var import_edge_client2 = require("@dxos/edge-client");
-var import_feed_store6 = require("@dxos/feed-store");
 var import_invariant20 = require("@dxos/invariant");
-var import_keyring = require("@dxos/keyring");
 var import_keys15 = require("@dxos/keys");
 var import_log22 = require("@dxos/log");
 var import_protocols14 = require("@dxos/protocols");
 var import_services19 = require("@dxos/protocols/proto/dxos/client/services");
+var import_codec_protobuf12 = require("@dxos/codec-protobuf");
+var import_protocols15 = require("@dxos/protocols");
+var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
+var import_async22 = require("@dxos/async");
+var import_context16 = require("@dxos/context");
+var import_credentials22 = require("@dxos/credentials");
+var import_debug6 = require("@dxos/debug");
+var import_echo_pipeline5 = require("@dxos/echo-pipeline");
+var import_edge_client2 = require("@dxos/edge-client");
+var import_feed_store6 = require("@dxos/feed-store");
+var import_invariant21 = require("@dxos/invariant");
+var import_keyring = require("@dxos/keyring");
+var import_keys16 = require("@dxos/keys");
+var import_log23 = require("@dxos/log");
+var import_protocols16 = require("@dxos/protocols");
+var import_services21 = 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_util12 = require("@dxos/util");
-var import_protocols15 = require("@dxos/protocols");
+var import_protocols17 = 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_util13 = require("@dxos/util");
 var import_node_path = __toESM(require("node:path"));
-var import_keys16 = require("@dxos/keys");
+var import_keys17 = require("@dxos/keys");
 var import_kv_store = require("@dxos/kv-store");
 var import_automerge_repo = require("@dxos/automerge/automerge-repo");
-var import_invariant21 = require("@dxos/invariant");
-var import_log23 = require("@dxos/log");
-var import_protocols16 = require("@dxos/protocols");
+var import_invariant22 = require("@dxos/invariant");
+var import_log24 = require("@dxos/log");
+var import_protocols18 = require("@dxos/protocols");
 var import_util14 = require("@dxos/util");
-var import_async22 = require("@dxos/async");
+var import_async23 = require("@dxos/async");
 var import_client_protocol8 = require("@dxos/client-protocol");
-var import_context16 = require("@dxos/context");
+var import_context17 = require("@dxos/context");
 var import_edge_client3 = require("@dxos/edge-client");
-var import_invariant22 = require("@dxos/invariant");
-var import_keys17 = require("@dxos/keys");
-var import_log24 = require("@dxos/log");
+var import_invariant23 = require("@dxos/invariant");
+var import_keys18 = require("@dxos/keys");
+var import_log25 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager2 = require("@dxos/network-manager");
-var import_protocols17 = require("@dxos/protocols");
-var import_services20 = require("@dxos/protocols/proto/dxos/client/services");
+var import_protocols19 = require("@dxos/protocols");
+var import_services22 = require("@dxos/protocols/proto/dxos/client/services");
 var import_tracing11 = require("@dxos/tracing");
 var import_websocket_rpc = require("@dxos/websocket-rpc");
-var import_async23 = require("@dxos/async");
-var import_codec_protobuf12 = require("@dxos/codec-protobuf");
-var import_invariant23 = require("@dxos/invariant");
-var import_services21 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async24 = require("@dxos/async");
 var import_codec_protobuf13 = require("@dxos/codec-protobuf");
-var import_keys18 = require("@dxos/keys");
-var import_util15 = require("@dxos/util");
+var import_invariant24 = require("@dxos/invariant");
+var import_services23 = require("@dxos/protocols/proto/dxos/client/services");
 var import_async25 = require("@dxos/async");
 var import_codec_protobuf14 = require("@dxos/codec-protobuf");
 var import_keys19 = require("@dxos/keys");
-var import_log25 = require("@dxos/log");
-var import_services22 = require("@dxos/protocols/proto/dxos/client/services");
-var import_util16 = require("@dxos/util");
+var import_util15 = require("@dxos/util");
+var import_async26 = require("@dxos/async");
 var import_codec_protobuf15 = require("@dxos/codec-protobuf");
+var import_keys20 = require("@dxos/keys");
+var import_log26 = require("@dxos/log");
+var import_services24 = require("@dxos/protocols/proto/dxos/client/services");
+var import_util16 = require("@dxos/util");
 var import_codec_protobuf16 = require("@dxos/codec-protobuf");
-var import_services23 = require("@dxos/protocols/proto/dxos/client/services");
+var import_codec_protobuf17 = require("@dxos/codec-protobuf");
+var import_services25 = require("@dxos/protocols/proto/dxos/client/services");
 var import_util17 = require("@dxos/util");
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devtools/feeds.ts";
 var subscribeToFeeds = ({ feedStore, spaceManager }, { feedKeys }) => {
@@ -718,7 +731,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.6.13-main.548ca8d";
+var DXOS_VERSION = "0.6.13-main.ed424a1";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -1711,6 +1724,7 @@ var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/sr
 var DEFAULT_RETRY_TIMEOUT = 1e3;
 var DEFAULT_SUCCESS_DELAY = 1e3;
 var DEFAULT_NOTARIZE_TIMEOUT = 1e4;
+var DEFAULT_ACTIVE_EDGE_POLLING_INTERVAL = 3e3;
 var MAX_EDGE_RETRIES = 2;
 var WRITER_NOT_SET_ERROR_CODE = "WRITER_NOT_SET";
 var credentialCodec = import_proto2.schema.getCodecForType("dxos.halo.credentials.Credential");
@@ -1721,11 +1735,44 @@ var NotarizationPlugin = class extends import_context6.Resource {
     this._extensions = /* @__PURE__ */ new Set();
     this._processedCredentials = new import_util5.ComplexSet(import_keys5.PublicKey.hash);
     this._processCredentialsTriggers = new import_util5.ComplexMap(import_keys5.PublicKey.hash);
+    this._activeEdgePollingIntervalHandle = void 0;
     this._spaceId = params.spaceId;
+    this._activeEdgePollingInterval = params.activeEdgePollingInterval ?? DEFAULT_ACTIVE_EDGE_POLLING_INTERVAL;
     if (params.edgeClient && params.edgeFeatures?.feedReplicator) {
       this._edgeClient = params.edgeClient;
     }
   }
+  setActiveEdgePollingEnabled(enabled) {
+    (0, import_invariant5.invariant)(this.isOpen, void 0, {
+      F: __dxlog_file7,
+      L: 109,
+      S: this,
+      A: [
+        "this.isOpen",
+        ""
+      ]
+    });
+    const client = this._edgeClient;
+    (0, import_invariant5.invariant)(client, void 0, {
+      F: __dxlog_file7,
+      L: 111,
+      S: this,
+      A: [
+        "client",
+        ""
+      ]
+    });
+    if (enabled && !this._activeEdgePollingIntervalHandle) {
+      this._activeEdgePollingIntervalHandle = setInterval(() => {
+        if (this._writer) {
+          this._notarizePendingEdgeCredentials(client, this._writer);
+        }
+      }, this._activeEdgePollingInterval);
+    } else if (!enabled && this._activeEdgePollingIntervalHandle) {
+      clearInterval(this._activeEdgePollingIntervalHandle);
+      this._activeEdgePollingIntervalHandle = void 0;
+    }
+  }
   get hasWriter() {
     return !!this._writer;
   }
@@ -1735,6 +1782,10 @@ var NotarizationPlugin = class extends import_context6.Resource {
     }
   }
   async _close() {
+    if (this._activeEdgePollingIntervalHandle) {
+      clearInterval(this._activeEdgePollingIntervalHandle);
+      this._activeEdgePollingIntervalHandle = void 0;
+    }
     await this._ctx.dispose();
   }
   /**
@@ -1745,13 +1796,13 @@ var NotarizationPlugin = class extends import_context6.Resource {
       credentials
     }, {
       F: __dxlog_file7,
-      L: 126,
+      L: 153,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant5.invariant)(credentials.every((credential) => credential.id), "Credentials must have an id", {
       F: __dxlog_file7,
-      L: 127,
+      L: 154,
       S: this,
       A: [
         "credentials.every((credential) => credential.id)",
@@ -1765,7 +1816,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           err
         }, {
           F: __dxlog_file7,
-          L: 135,
+          L: 162,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1797,7 +1848,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
       ]);
       (0, import_log6.log)("done", void 0, {
         F: __dxlog_file7,
-        L: 160,
+        L: 187,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1820,7 +1871,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
             retryIn: retryTimeout
           }, {
             F: __dxlog_file7,
-            L: 183,
+            L: 210,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1834,7 +1885,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           credentialId: credentials.map((credential) => credential.id)
         }, {
           F: __dxlog_file7,
-          L: 190,
+          L: 217,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1843,7 +1894,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
         });
         (0, import_log6.log)("success", void 0, {
           F: __dxlog_file7,
-          L: 194,
+          L: 221,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1852,7 +1903,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
         if (!ctx.disposed && !err.message.includes(WRITER_NOT_SET_ERROR_CODE)) {
           import_log6.log.info("error notarizing (recoverable)", err, {
             F: __dxlog_file7,
-            L: 199,
+            L: 226,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1881,7 +1932,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
         });
         (0, import_log6.log)("edge notarization success", void 0, {
           F: __dxlog_file7,
-          L: 227,
+          L: 254,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1904,7 +1955,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
   setWriter(writer) {
     (0, import_invariant5.invariant)(!this._writer, "Writer already set.", {
       F: __dxlog_file7,
-      L: 247,
+      L: 274,
       S: this,
       A: [
         "!this._writer",
@@ -1934,7 +1985,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
         if (!credentials.length) {
           (0, import_log6.log)("edge did not return credentials for notarization", void 0, {
             F: __dxlog_file7,
-            L: 269,
+            L: 296,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -1944,7 +1995,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           count: credentials.length
         }, {
           F: __dxlog_file7,
-          L: 273,
+          L: 300,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1957,7 +2008,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           count: decodedCredentials.length
         }, {
           F: __dxlog_file7,
-          L: 282,
+          L: 309,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -1985,7 +2036,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
     for (const credential of credentials) {
       (0, import_invariant5.invariant)(credential.id, "Credential must have an id", {
         F: __dxlog_file7,
-        L: 308,
+        L: 335,
         S: this,
         A: [
           "credential.id",
@@ -2009,7 +2060,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file7,
-          L: 323,
+          L: 350,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2021,7 +2072,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
           peer: extension.localPeerId
         }, {
           F: __dxlog_file7,
-          L: 328,
+          L: 355,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2038,7 +2089,7 @@ var NotarizationPlugin = class extends import_context6.Resource {
         peers: Array.from(this._extensions).map((extension) => extension.remotePeerId)
       }, {
         F: __dxlog_file7,
-        L: 340,
+        L: 367,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2054,7 +2105,7 @@ var handleEdgeError = (error) => {
   if (!(error instanceof import_protocols4.EdgeCallFailedError) || error.errorData) {
     import_log6.log.catch(error, void 0, {
       F: __dxlog_file7,
-      L: 354,
+      L: 381,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2063,7 +2114,7 @@ var handleEdgeError = (error) => {
       reason: error.reason
     }, {
       F: __dxlog_file7,
-      L: 356,
+      L: 383,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -2269,7 +2320,7 @@ var DataSpaceManager = class extends import_context7.Resource {
   async _open() {
     (0, import_log9.log)("open", void 0, {
       F: __dxlog_file9,
-      L: 198,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2277,7 +2328,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 199,
+      L: 200,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2285,7 +2336,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaces: this._metadataStore.spaces.length
     }, {
       F: __dxlog_file9,
-      L: 200,
+      L: 201,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2295,7 +2346,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           spaceMetadata
         }, {
           F: __dxlog_file9,
-          L: 204,
+          L: 205,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2306,7 +2357,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           err
         }, {
           F: __dxlog_file9,
-          L: 207,
+          L: 208,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2317,7 +2368,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       id: this._instanceId
     }), {
       F: __dxlog_file9,
-      L: 213,
+      L: 214,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2325,7 +2376,7 @@ var DataSpaceManager = class extends import_context7.Resource {
   async _close() {
     (0, import_log9.log)("close", void 0, {
       F: __dxlog_file9,
-      L: 218,
+      L: 219,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2340,7 +2391,7 @@ var DataSpaceManager = class extends import_context7.Resource {
   async createSpace() {
     (0, import_invariant7.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file9,
-      L: 230,
+      L: 231,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2361,7 +2412,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       spaceKey
     }, {
       F: __dxlog_file9,
-      L: 242,
+      L: 243,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2373,7 +2424,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const memberCredential = credentials[1];
     (0, import_invariant7.invariant)((0, import_credentials9.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 252,
+      L: 253,
       S: this,
       A: [
         "getCredentialAssertion(memberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2405,7 +2456,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           spaceId: space.id
         }, {
           F: __dxlog_file9,
-          L: 277,
+          L: 278,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2426,7 +2477,7 @@ var DataSpaceManager = class extends import_context7.Resource {
         keys: []
       }
     };
-    const propertiesId = (0, import_echo_schema2.generateEchoId)();
+    const propertiesId = (0, import_echo_schema2.createObjectId)();
     document.change((doc) => {
       (0, import_util7.setDeep)(doc, [
         "objects",
@@ -2440,7 +2491,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const automergeIndex = space.automergeSpaceState.rootUrl;
     (0, import_invariant7.invariant)(automergeIndex, void 0, {
       F: __dxlog_file9,
-      L: 310,
+      L: 311,
       S: this,
       A: [
         "automergeIndex",
@@ -2457,13 +2508,13 @@ var DataSpaceManager = class extends import_context7.Resource {
       opts
     }, {
       F: __dxlog_file9,
-      L: 319,
+      L: 320,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant7.invariant)(this._lifecycleState === import_context7.LifecycleState.OPEN, "Not open.", {
       F: __dxlog_file9,
-      L: 320,
+      L: 321,
       S: this,
       A: [
         "this._lifecycleState === LifecycleState.OPEN",
@@ -2472,7 +2523,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     });
     (0, import_invariant7.invariant)(!this._spaces.has(opts.spaceKey), "Space already exists.", {
       F: __dxlog_file9,
-      L: 321,
+      L: 322,
       S: this,
       A: [
         "!this._spaces.has(opts.spaceKey)",
@@ -2496,7 +2547,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const space = this._spaceManager.spaces.get(options.spaceKey);
     (0, import_invariant7.invariant)(space, void 0, {
       F: __dxlog_file9,
-      L: 341,
+      L: 342,
       S: this,
       A: [
         "space",
@@ -2509,7 +2560,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const credentials = await (0, import_credentials9.createAdmissionCredentials)(this._signingContext.credentialSigner, options.identityKey, space.key, space.genesisFeedKey, options.role, space.spaceState.membershipChainHeads, options.profile, options.delegationCredentialId);
     (0, import_invariant7.invariant)(credentials[0].credential, void 0, {
       F: __dxlog_file9,
-      L: 360,
+      L: 361,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2519,7 +2570,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant7.invariant)((0, import_credentials9.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file9,
-      L: 362,
+      L: 363,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2557,7 +2608,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     const space = this._spaces.get(spaceKey);
     (0, import_invariant7.invariant)(space, "Space not found.", {
       F: __dxlog_file9,
-      L: 399,
+      L: 400,
       S: this,
       A: [
         "space",
@@ -2582,7 +2633,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       metadata
     }, {
       F: __dxlog_file9,
-      L: 418,
+      L: 419,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2626,7 +2677,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             err
           }, {
             F: __dxlog_file9,
-            L: 460,
+            L: 461,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2636,7 +2687,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       onAuthFailure: () => {
         import_log9.log.warn("auth failure", void 0, {
           F: __dxlog_file9,
-          L: 465,
+          L: 466,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2669,7 +2720,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 492,
+            L: 493,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2680,7 +2731,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             open: this._lifecycleState === import_context7.LifecycleState.OPEN
           }, {
             F: __dxlog_file9,
-            L: 495,
+            L: 496,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2699,7 +2750,7 @@ var DataSpaceManager = class extends import_context7.Resource {
             space: space.key
           }, {
             F: __dxlog_file9,
-            L: 503,
+            L: 504,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -2708,7 +2759,8 @@ var DataSpaceManager = class extends import_context7.Resource {
       cache: metadata.cache,
       edgeConnection: this._edgeConnection,
       edgeHttpClient: this._edgeHttpClient,
-      edgeFeatures: this._edgeFeatures
+      edgeFeatures: this._edgeFeatures,
+      activeEdgeNotarizationPollingInterval: this._runtimeParams?.activeEdgeNotarizationPollingInterval
     });
     dataSpace.postOpen.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
@@ -2719,7 +2771,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           spaceId: dataSpace.id
         }, {
           F: __dxlog_file9,
-          L: 516,
+          L: 518,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2749,7 +2801,7 @@ var DataSpaceManager = class extends import_context7.Resource {
         space: space.key
       }, {
         F: __dxlog_file9,
-        L: 543,
+        L: 545,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -2782,7 +2834,7 @@ var DataSpaceManager = class extends import_context7.Resource {
       closedSessions
     }, {
       F: __dxlog_file9,
-      L: 569,
+      L: 571,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -2797,7 +2849,7 @@ var DataSpaceManager = class extends import_context7.Resource {
           peerId: peerState.peerId
         }, {
           F: __dxlog_file9,
-          L: 583,
+          L: 585,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3211,7 +3263,7 @@ var Identity = class {
       deviceKey: params.deviceKey
     }, {
       F: __dxlog_file11,
-      L: 78,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3252,10 +3304,13 @@ var Identity = class {
     await this.space.spaceState.addCredentialProcessor(this._deviceStateMachine);
     await this.space.spaceState.addCredentialProcessor(this._profileStateMachine);
     await this.space.spaceState.addCredentialProcessor(this._defaultSpaceStateMachine);
+    await this.space.open(ctx);
+  }
+  async joinNetwork() {
     if (this._edgeFeedReplicator) {
       this.space.protocol.feedAdded.append(this._onFeedAdded);
     }
-    await this.space.open(ctx);
+    await this.space.startProtocol();
     await this._edgeFeedReplicator?.open();
   }
   async close(ctx) {
@@ -3285,6 +3340,9 @@ var Identity = class {
   get controlPipeline() {
     return this.space.controlPipeline;
   }
+  get haloSpaceId() {
+    return this.space.id;
+  }
   get haloSpaceKey() {
     return this.space.key;
   }
@@ -3307,7 +3365,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     (0, import_invariant6.invariant)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file11,
-      L: 189,
+      L: 195,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -3351,20 +3409,21 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file11,
-      L: 214,
+      L: 220,
       S: this,
       C: (f, a) => f(...a)
     });
     const signer = this.getIdentityCredentialSigner();
+    const deviceCredential = await signer.createCredential({
+      subject: deviceKey,
+      assertion: {
+        "@type": "dxos.halo.credentials.AuthorizedDevice",
+        identityKey: this.identityKey,
+        deviceKey
+      }
+    });
     await (0, import_feed_store2.writeMessages)(this.controlPipeline.writer, [
-      await signer.createCredential({
-        subject: deviceKey,
-        assertion: {
-          "@type": "dxos.halo.credentials.AuthorizedDevice",
-          identityKey: this.identityKey,
-          deviceKey
-        }
-      }),
+      deviceCredential,
       await signer.createCredential({
         subject: controlFeedKey,
         assertion: {
@@ -3390,6 +3449,7 @@ var Identity = class {
         credential
       }
     })));
+    return deviceCredential;
   }
 };
 _ts_decorate4([
@@ -3422,7 +3482,6 @@ var IdentityManager = class {
     this._edgeFeatures = params.edgeFeatures;
     this._devicePresenceAnnounceInterval = params.devicePresenceAnnounceInterval ?? DEVICE_PRESENCE_ANNOUNCE_INTERVAL;
     this._devicePresenceOfflineTimeout = params.devicePresenceOfflineTimeout ?? DEVICE_PRESENCE_OFFLINE_TIMEOUT;
-    this._callbacks = params.callbacks;
   }
   get identity() {
     return this._identity;
@@ -3433,7 +3492,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file12,
-      L: 121,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3442,7 +3501,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file12,
-      L: 124,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3455,7 +3514,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file12,
-        L: 129,
+        L: 124,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3465,7 +3524,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file12,
-      L: 136,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3473,13 +3532,13 @@ var IdentityManager = class {
   async close() {
     await this._identity?.close(new import_context8.Context(void 0, {
       F: __dxlog_file12,
-      L: 140
+      L: 135
     }));
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
     (0, import_invariant9.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file12,
-      L: 145,
+      L: 140,
       S: this,
       A: [
         "!this._identity",
@@ -3488,7 +3547,7 @@ var IdentityManager = class {
     });
     (0, import_log11.log)("creating identity...", void 0, {
       F: __dxlog_file12,
-      L: 146,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3506,13 +3565,13 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new import_context8.Context(void 0, {
       F: __dxlog_file12,
-      L: 161
+      L: 156
     }));
     {
       const generator = new import_credentials14.CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       (0, import_invariant9.invariant)(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file12,
-        L: 165,
+        L: 160,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -3521,7 +3580,7 @@ var IdentityManager = class {
       });
       (0, import_invariant9.invariant)(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file12,
-        L: 166,
+        L: 161,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -3560,7 +3619,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file12,
-      L: 208,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3571,7 +3630,7 @@ var IdentityManager = class {
       profile: identity.profileDocument
     }, {
       F: __dxlog_file12,
-      L: 214,
+      L: 205,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3601,20 +3660,20 @@ var IdentityManager = class {
     };
   }
   /**
-  * Accept an existing identity. Expects its device key to be authorized (now or later).
+  * Prepare an identity object as the first step of acceptIdentity flow.
   */
-  async acceptIdentity(params) {
+  async prepareIdentity(params) {
     (0, import_log11.log)("accepting identity", {
       params
     }, {
       F: __dxlog_file12,
-      L: 252,
+      L: 244,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant9.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file12,
-      L: 253,
+      L: 245,
       S: this,
       A: [
         "!this._identity",
@@ -3635,23 +3694,32 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new import_context8.Context(void 0, {
       F: __dxlog_file12,
-      L: 268
+      L: 259
     }));
+    return {
+      identity,
+      identityRecord
+    };
+  }
+  /**
+  * Accept an existing identity. Expects its device key to be authorized (now or later).
+  */
+  async acceptIdentity(identity, identityRecord, profile) {
     this._identity = identity;
-    await this._metadataStore.setIdentityRecord(identityRecord);
     await this._identity.ready();
+    await this._metadataStore.setIdentityRecord(identityRecord);
     import_log11.log.trace("dxos.halo.identity", {
-      identityKey: identityRecord.identityKey,
+      identityKey: this._identity.identityKey,
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file12,
-      L: 272,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
     await this.updateDeviceProfile({
       ...this.createDefaultDeviceProfile(),
-      ...params.deviceProfile
+      ...profile
     });
     this.stateUpdate.emit();
     (0, import_log11.log)("accepted identity", {
@@ -3659,11 +3727,10 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file12,
-      L: 282,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
-    return identity;
   }
   /**
   * Update the profile document of an existing identity.
@@ -3671,7 +3738,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     (0, import_invariant9.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file12,
-      L: 290,
+      L: 291,
       S: this,
       A: [
         "this._identity",
@@ -3702,7 +3769,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     (0, import_invariant9.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file12,
-      L: 307,
+      L: 308,
       S: this,
       A: [
         "this._identity",
@@ -3738,7 +3805,7 @@ var IdentityManager = class {
   async _constructIdentity(identityRecord) {
     (0, import_invariant9.invariant)(!this._identity, void 0, {
       F: __dxlog_file12,
-      L: 333,
+      L: 334,
       S: this,
       A: [
         "!this._identity",
@@ -3749,7 +3816,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file12,
-      L: 334,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3764,7 +3831,7 @@ var IdentityManager = class {
     });
     (0, import_invariant9.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file12,
-      L: 347,
+      L: 348,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -3776,7 +3843,7 @@ var IdentityManager = class {
     });
     (0, import_invariant9.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file12,
-      L: 351,
+      L: 352,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -3813,11 +3880,10 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file12,
-      L: 380,
+      L: 381,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._callbacks?.onIdentityConstruction?.(identity);
     if (identityRecord.haloSpace.controlTimeframe) {
       identity.controlPipeline.state.setTargetTimeframe(identityRecord.haloSpace.controlTimeframe);
     }
@@ -4077,7 +4143,7 @@ var DataSpace = class {
   constructor(params) {
     this._ctx = new import_context4.Context(void 0, {
       F: __dxlog_file14,
-      L: 95
+      L: 96
     });
     this._cache = void 0;
     this._edgeFeedReplicator = void 0;
@@ -4106,7 +4172,8 @@ var DataSpace = class {
     this._notarizationPlugin = new NotarizationPlugin({
       spaceId: this._inner.id,
       edgeClient: params.edgeHttpClient,
-      edgeFeatures: params.edgeFeatures
+      edgeFeatures: params.edgeFeatures,
+      activeEdgePollingInterval: params.activeEdgeNotarizationPollingInterval
     });
     this.authVerifier = new TrustedKeySetAuthVerifier({
       trustedKeysProvider: () => new import_util4.ComplexSet(import_keys4.PublicKey.hash, Array.from(this._inner.spaceState.members.values()).filter((member) => member.role !== import_credentials3.SpaceMember.Role.REMOVED).map((member) => member.key)),
@@ -4125,7 +4192,7 @@ var DataSpace = class {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 170,
+      L: 172,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4184,15 +4251,16 @@ var DataSpace = class {
     }
     await this._inner.open(new import_context4.Context(void 0, {
       F: __dxlog_file14,
-      L: 244
+      L: 246
     }));
+    await this._inner.startProtocol();
     await this._edgeFeedReplicator?.open();
     this._state = import_services4.SpaceState.SPACE_CONTROL_ONLY;
     (0, import_log4.log)("new state", {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 249,
+      L: 252,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4212,14 +4280,14 @@ var DataSpace = class {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 268,
+      L: 271,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._ctx.dispose();
     this._ctx = new import_context4.Context(void 0, {
       F: __dxlog_file14,
-      L: 270
+      L: 273
     });
     if (this._edgeFeedReplicator) {
       this.inner.protocol.feedAdded.remove(this._onFeedAdded);
@@ -4252,7 +4320,7 @@ var DataSpace = class {
         if (err instanceof import_protocols3.CancelledError || err instanceof import_context4.ContextDisposedError) {
           (0, import_log4.log)("data pipeline initialization cancelled", err, {
             F: __dxlog_file14,
-            L: 308,
+            L: 311,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4260,7 +4328,7 @@ var DataSpace = class {
         }
         import_log4.log.error("Error initializing data pipeline", err, {
           F: __dxlog_file14,
-          L: 312,
+          L: 315,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4269,7 +4337,7 @@ var DataSpace = class {
           state: import_services4.SpaceState[this._state]
         }, {
           F: __dxlog_file14,
-          L: 314,
+          L: 317,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4289,13 +4357,13 @@ var DataSpace = class {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 330,
+      L: 333,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_log4.log)("initializing control pipeline", void 0, {
       F: __dxlog_file14,
-      L: 332,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4304,21 +4372,21 @@ var DataSpace = class {
     const ready = this.stateUpdate.waitForCondition(() => this._state === import_services4.SpaceState.SPACE_READY);
     (0, import_log4.log)("initializing automerge root", void 0, {
       F: __dxlog_file14,
-      L: 340,
+      L: 343,
       S: this,
       C: (f, a) => f(...a)
     });
     this._automergeSpaceState.startProcessingRootDocs();
     (0, import_log4.log)("waiting for space to be ready", void 0, {
       F: __dxlog_file14,
-      L: 344,
+      L: 347,
       S: this,
       C: (f, a) => f(...a)
     });
     await ready;
     (0, import_log4.log)("space is ready", void 0, {
       F: __dxlog_file14,
-      L: 346,
+      L: 349,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4330,7 +4398,7 @@ var DataSpace = class {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 353,
+      L: 356,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4347,7 +4415,7 @@ var DataSpace = class {
     await this._createWritableFeeds();
     (0, import_log4.log)("writable feeds created", void 0, {
       F: __dxlog_file14,
-      L: 370,
+      L: 373,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4401,7 +4469,7 @@ var DataSpace = class {
           count: credentials.length
         }, {
           F: __dxlog_file14,
-          L: 428,
+          L: 431,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4412,14 +4480,14 @@ var DataSpace = class {
         });
         (0, import_log4.log)("credentials notarized", void 0, {
           F: __dxlog_file14,
-          L: 432,
+          L: 435,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         import_log4.log.error("error notarizing credentials for feed admission", err, {
           F: __dxlog_file14,
-          L: 434,
+          L: 437,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4434,7 +4502,7 @@ var DataSpace = class {
       rootUrl
     }, {
       F: __dxlog_file14,
-      L: 444,
+      L: 447,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4486,7 +4554,7 @@ var DataSpace = class {
           err
         }, {
           F: __dxlog_file14,
-          L: 487,
+          L: 490,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -4576,7 +4644,7 @@ var DataSpace = class {
       state: import_services4.SpaceState[this._state]
     }, {
       F: __dxlog_file14,
-      L: 569,
+      L: 572,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -4661,7 +4729,7 @@ var DeviceInvitationProtocol = class {
   async admit(_, request) {
     (0, import_invariant11.invariant)(request.device, void 0, {
       F: __dxlog_file15,
-      L: 50,
+      L: 51,
       S: this,
       A: [
         "request.device",
@@ -4669,13 +4737,23 @@ var DeviceInvitationProtocol = class {
       ]
     });
     const identity = this._getIdentity();
-    await identity.admitDevice(request.device);
+    const credential = await identity.admitDevice(request.device);
+    (0, import_invariant11.invariant)((0, import_credentials17.getCredentialAssertion)(credential)["@type"] === "dxos.halo.credentials.AuthorizedDevice", void 0, {
+      F: __dxlog_file15,
+      L: 54,
+      S: this,
+      A: [
+        "getCredentialAssertion(credential)['@type'] === 'dxos.halo.credentials.AuthorizedDevice'",
+        ""
+      ]
+    });
     return {
       device: {
         identityKey: identity.identityKey,
         haloSpaceKey: identity.haloSpaceKey,
         genesisFeedKey: identity.haloGenesisFeedKey,
-        controlTimeframe: identity.controlPipeline.state.timeframe
+        controlTimeframe: identity.controlPipeline.state.timeframe,
+        credential
       }
     };
   }
@@ -4707,7 +4785,7 @@ var DeviceInvitationProtocol = class {
   async accept(response, request) {
     (0, import_invariant11.invariant)(response.device, void 0, {
       F: __dxlog_file15,
-      L: 95,
+      L: 98,
       S: this,
       A: [
         "response.device",
@@ -4717,7 +4795,7 @@ var DeviceInvitationProtocol = class {
     const { identityKey, haloSpaceKey, genesisFeedKey, controlTimeframe } = response.device;
     (0, import_invariant11.invariant)(request.device, void 0, {
       F: __dxlog_file15,
-      L: 98,
+      L: 101,
       S: this,
       A: [
         "request.device",
@@ -4733,7 +4811,8 @@ var DeviceInvitationProtocol = class {
       controlFeedKey,
       dataFeedKey,
       controlTimeframe,
-      deviceProfile: profile
+      deviceProfile: profile,
+      authorizedDeviceCredential: response.device.credential
     });
     return {
       identityKey
@@ -4884,15 +4963,16 @@ var EdgeInvitationHandler = class {
       return await this._client.joinSpaceByInvitation(spaceId, request);
     } catch (error) {
       if (error instanceof import_protocols10.EdgeAuthChallengeError) {
-        guardedState.set(this, import_services12.Invitation.State.AUTHENTICATING);
         const publicKey = guardedState.current.guestKeypair?.publicKey;
         const privateKey = guardedState.current.guestKeypair?.privateKey;
         if (!privateKey || !publicKey) {
           throw error;
         }
-        const signature = await (0, import_crypto2.ed25519Signature)(privateKey, Buffer.from(error.challenge, "base64"));
-        request.signature = Buffer.from(signature).toString("base64");
-        return this._client.joinSpaceByInvitation(spaceId, request);
+        const signature = (0, import_crypto2.sign)(Buffer.from(error.challenge, "base64"), privateKey);
+        return this._client.joinSpaceByInvitation(spaceId, {
+          ...request,
+          signature: Buffer.from(signature).toString("base64")
+        });
       } else {
         throw error;
       }
@@ -5930,7 +6010,7 @@ var InvitationsHandler = class {
     const edgeInvitationHandler = new EdgeInvitationHandler(this._connectionParams?.edgeInvitations, this._edgeClient, {
       onInvitationSuccess: async (admissionResponse, admissionRequest) => {
         const result = await protocol.accept(admissionResponse, admissionRequest);
-        (0, import_log13.log)("admitted by edge", {
+        import_log13.log.info("admitted by edge", {
           ...protocol.toJSON()
         }, {
           F: __dxlog_file21,
@@ -6047,7 +6127,6 @@ var InvitationsHandler = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    setState(import_services11.Invitation.State.AUTHENTICATING);
     const signature = (0, import_crypto.sign)(Buffer.from(introductionResponse.challenge), invitation.guestKeypair.privateKey);
     const response = await extension.rpc.InvitationHostService.authenticate({
       signedChallenge: signature
@@ -6232,7 +6311,7 @@ var SpaceInvitationProtocol = class {
     const spaceMemberCredential = await this._spaceManager.admitMember({
       spaceKey: this._spaceKey,
       identityKey: request.space.identityKey,
-      role: invitation.role ?? import_credentials18.SpaceMember.Role.ADMIN,
+      role: invitation.role ?? import_credentials19.SpaceMember.Role.ADMIN,
       profile: guestProfile,
       delegationCredentialId: invitation.delegationCredentialId
     });
@@ -6284,11 +6363,11 @@ var SpaceInvitationProtocol = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const credential = await (0, import_credentials17.createDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, {
+    const credential = await (0, import_credentials18.createDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, {
       invitationId: invitation.invitationId,
       authMethod: invitation.authMethod,
       swarmKey: invitation.swarmKey,
-      role: invitation.role ?? import_credentials18.SpaceMember.Role.ADMIN,
+      role: invitation.role ?? import_credentials19.SpaceMember.Role.ADMIN,
       expiresOn: invitation.lifetime ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime) : void 0,
       multiUse: invitation.multiUse ?? false,
       guestKey: invitation.authMethod === import_services17.Invitation.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
@@ -6345,7 +6424,7 @@ var SpaceInvitationProtocol = class {
       S: this,
       C: (f, a) => f(...a)
     });
-    const credential = await (0, import_credentials17.createCancelDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
+    const credential = await (0, import_credentials18.createCancelDelegatedSpaceInvitationCredential)(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     (0, import_invariant17.invariant)(credential.credential, void 0, {
       F: __dxlog_file22,
       L: 144,
@@ -6395,7 +6474,7 @@ var SpaceInvitationProtocol = class {
       ]
     });
     const { credential, controlTimeframe, dataTimeframe } = response.space;
-    const assertion = (0, import_credentials17.getCredentialAssertion)(credential);
+    const assertion = (0, import_credentials18.getCredentialAssertion)(credential);
     (0, import_invariant17.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file22,
       L: 182,
@@ -6631,8 +6710,8 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, options) {
-    const { invitationId = import_keys14.PublicKey.random().toHex(), type = import_services18.Invitation.Type.INTERACTIVE, authMethod = import_services18.Invitation.AuthMethod.SHARED_SECRET, state = import_services18.Invitation.State.INIT, timeout = import_client_protocol6.INVITATION_TIMEOUT, swarmKey = import_keys14.PublicKey.random(), persistent = options?.authMethod !== import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = import_credentials20.SpaceMember.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
-    const authCode = options?.authCode ?? (authMethod === import_services18.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials19.generatePasscode)(import_client_protocol6.AUTHENTICATION_CODE_LENGTH) : void 0);
+    const { invitationId = import_keys14.PublicKey.random().toHex(), type = import_services18.Invitation.Type.INTERACTIVE, authMethod = import_services18.Invitation.AuthMethod.SHARED_SECRET, state = import_services18.Invitation.State.INIT, timeout = import_client_protocol6.INVITATION_TIMEOUT, swarmKey = import_keys14.PublicKey.random(), persistent = options?.authMethod !== import_services18.Invitation.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = import_credentials21.SpaceMember.Role.ADMIN, lifetime = 86400, multiUse = false } = options ?? {};
+    const authCode = options?.authCode ?? (authMethod === import_services18.Invitation.AuthMethod.SHARED_SECRET ? (0, import_credentials20.generatePasscode)(import_client_protocol6.AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
       type,
@@ -6915,6 +6994,250 @@ function _ts_decorate9(decorators, target, key, desc) {
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
+var __dxlog_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/agents/edge-agent-manager.ts";
+var AGENT_STATUS_QUERY_RETRY_INTERVAL = 5e3;
+var AGENT_STATUS_QUERY_RETRY_JITTER = 1e3;
+var EdgeAgentManager = class extends import_context15.Resource {
+  constructor(_edgeFeatures, _edgeHttpClient, _dataSpaceManager, _identity) {
+    super();
+    this._edgeFeatures = _edgeFeatures;
+    this._edgeHttpClient = _edgeHttpClient;
+    this._dataSpaceManager = _dataSpaceManager;
+    this._identity = _identity;
+    this.agentStatusChanged = new import_async21.Event();
+    this._lastKnownDeviceCount = 0;
+  }
+  get agentStatus() {
+    return this._agentStatus;
+  }
+  get agentExists() {
+    return this._agentStatus && this._agentStatus !== import_protocols14.EdgeAgentStatus.NOT_FOUND;
+  }
+  async createAgent() {
+    (0, import_invariant20.invariant)(this.isOpen, void 0, {
+      F: __dxlog_file25,
+      L: 52,
+      S: this,
+      A: [
+        "this.isOpen",
+        ""
+      ]
+    });
+    (0, import_invariant20.invariant)(this._edgeHttpClient, void 0, {
+      F: __dxlog_file25,
+      L: 53,
+      S: this,
+      A: [
+        "this._edgeHttpClient",
+        ""
+      ]
+    });
+    (0, import_invariant20.invariant)(this._edgeFeatures?.agents, void 0, {
+      F: __dxlog_file25,
+      L: 54,
+      S: this,
+      A: [
+        "this._edgeFeatures?.agents",
+        ""
+      ]
+    });
+    const response = await this._edgeHttpClient.createAgent({
+      identityKey: this._identity.identityKey.toHex(),
+      haloSpaceId: this._identity.haloSpaceId,
+      haloSpaceKey: this._identity.haloSpaceKey.toHex()
+    });
+    const deviceKey = import_keys15.PublicKey.fromHex(response.deviceKey);
+    await this._identity.admitDevice({
+      deviceKey,
+      controlFeedKey: import_keys15.PublicKey.fromHex(response.feedKey),
+      // TODO: agents don't have data feed, should be removed
+      dataFeedKey: import_keys15.PublicKey.random()
+    });
+    (0, import_log22.log)("agent created", response, {
+      F: __dxlog_file25,
+      L: 71,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    this._updateStatus(import_protocols14.EdgeAgentStatus.ACTIVE, deviceKey);
+  }
+  async _open() {
+    const isEnabled = this._edgeHttpClient && this._edgeFeatures?.agents;
+    (0, import_log22.log)("edge agent manager open", {
+      isEnabled
+    }, {
+      F: __dxlog_file25,
+      L: 79,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+    if (!isEnabled) {
+      return;
+    }
+    this._lastKnownDeviceCount = this._identity.authorizedDeviceKeys.size;
+    this._fetchAgentStatusTask = new import_async21.DeferredTask(this._ctx, async () => {
+      await this._fetchAgentStatus();
+    });
+    this._fetchAgentStatusTask.schedule();
+    this._dataSpaceManager.updated.on(this._ctx, () => {
+      if (this._agentDeviceKey) {
+        this._ensureAgentIsInSpaces(this._agentDeviceKey);
+      }
+    });
+    this._identity.stateUpdate.on(this._ctx, () => {
+      const maybeAgentWasCreated = this._identity.authorizedDeviceKeys.size > this._lastKnownDeviceCount;
+      if (this.agentExists || !maybeAgentWasCreated) {
+        return;
+      }
+      this._lastKnownDeviceCount = this._identity.authorizedDeviceKeys.size;
+      this._fetchAgentStatusTask?.schedule();
+    });
+  }
+  async _close() {
+    this._fetchAgentStatusTask = void 0;
+    this._lastKnownDeviceCount = 0;
+  }
+  async _fetchAgentStatus() {
+    (0, import_invariant20.invariant)(this._edgeHttpClient, void 0, {
+      F: __dxlog_file25,
+      L: 113,
+      S: this,
+      A: [
+        "this._edgeHttpClient",
+        ""
+      ]
+    });
+    try {
+      (0, import_log22.log)("fetching agent status", void 0, {
+        F: __dxlog_file25,
+        L: 115,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      const { agent } = await this._edgeHttpClient.getAgentStatus({
+        ownerIdentityKey: this._identity.identityKey
+      });
+      const wasAgentCreatedDuringQuery = this._agentStatus === import_protocols14.EdgeAgentStatus.ACTIVE;
+      if (!wasAgentCreatedDuringQuery) {
+        const deviceKey = agent.deviceKey ? import_keys15.PublicKey.fromHex(agent.deviceKey) : void 0;
+        this._updateStatus(agent.status, deviceKey);
+      }
+    } catch (err) {
+      if (err instanceof import_protocols14.EdgeCallFailedError) {
+        if (!err.isRetryable) {
+          import_log22.log.warn("non retryable error on agent status fetch attempt", {
+            err
+          }, {
+            F: __dxlog_file25,
+            L: 125,
+            S: this,
+            C: (f, a) => f(...a)
+          });
+          return;
+        }
+      }
+      const retryAfterMs = AGENT_STATUS_QUERY_RETRY_INTERVAL + Math.random() * AGENT_STATUS_QUERY_RETRY_JITTER;
+      import_log22.log.info("agent status fetching failed", {
+        err,
+        retryAfterMs
+      }, {
+        F: __dxlog_file25,
+        L: 130,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      (0, import_async21.scheduleTask)(this._ctx, () => this._fetchAgentStatusTask?.schedule(), retryAfterMs);
+    }
+  }
+  /**
+  * We don't want notarization plugin to always actively poll edge looking for credentials to notarize,
+  * because most of the time we'll be getting an empty response.
+  * Instead, we stay in active polling mode while there are spaces where we don't see our agent's feed.
+  */
+  _ensureAgentIsInSpaces(agentDeviceKey) {
+    for (const space of this._dataSpaceManager.spaces.values()) {
+      if ([
+        import_services19.SpaceState.SPACE_INACTIVE,
+        import_services19.SpaceState.SPACE_CLOSED
+      ].includes(space.state)) {
+        continue;
+      }
+      const agentFeedNeedsNotarization = !space.inner.spaceState.feeds.values().some((feed) => feed.assertion.deviceKey.equals(agentDeviceKey));
+      space.notarizationPlugin.setActiveEdgePollingEnabled(agentFeedNeedsNotarization);
+      import_log22.log.info("set active edge polling", {
+        enabled: agentFeedNeedsNotarization,
+        spaceId: space.id
+      }, {
+        F: __dxlog_file25,
+        L: 150,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+    }
+  }
+  _updateStatus(status, deviceKey) {
+    this._agentStatus = status;
+    this._agentDeviceKey = deviceKey;
+    this.agentStatusChanged.emit(status);
+    if (deviceKey) {
+      this._ensureAgentIsInSpaces(deviceKey);
+    }
+    import_log22.log.info("agent status update", {
+      status
+    }, {
+      F: __dxlog_file25,
+      L: 161,
+      S: this,
+      C: (f, a) => f(...a)
+    });
+  }
+};
+_ts_decorate9([
+  import_async21.synchronized
+], EdgeAgentManager.prototype, "createAgent", null);
+var EdgeAgentServiceImpl = class {
+  constructor(_agentManagerProvider) {
+    this._agentManagerProvider = _agentManagerProvider;
+  }
+  async createAgent() {
+    return (await this._agentManagerProvider()).createAgent();
+  }
+  queryAgentStatus() {
+    return new import_codec_protobuf12.Stream(({ ctx, next }) => {
+      next({
+        status: import_services20.QueryAgentStatusResponse.AgentStatus.UNKNOWN
+      });
+      void this._agentManagerProvider().then((agentManager) => {
+        next({
+          status: mapStatus(agentManager.agentStatus)
+        });
+        agentManager.agentStatusChanged.on(ctx, (newStatus) => {
+          next({
+            status: mapStatus(newStatus)
+          });
+        });
+      });
+    });
+  }
+};
+var mapStatus = (agentStatus) => {
+  switch (agentStatus) {
+    case import_protocols15.EdgeAgentStatus.ACTIVE:
+      return import_services20.QueryAgentStatusResponse.AgentStatus.ACTIVE;
+    case import_protocols15.EdgeAgentStatus.INACTIVE:
+      return import_services20.QueryAgentStatusResponse.AgentStatus.INACTIVE;
+    case import_protocols15.EdgeAgentStatus.NOT_FOUND:
+      return import_services20.QueryAgentStatusResponse.AgentStatus.NOT_FOUND;
+    case void 0:
+      return import_services20.QueryAgentStatusResponse.AgentStatus.UNKNOWN;
+  }
+};
+function _ts_decorate10(decorators, target, key, desc) {
+  var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+  if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+  else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+}
 function _using_ctx3() {
   var _disposeSuppressedError = typeof SuppressedError === "function" ? SuppressedError : function(error, suppressed) {
     var err = new Error();
@@ -6977,8 +7300,8 @@ function _using_ctx3() {
     }
   };
 }
-var __dxlog_file25 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
-var ServiceContext = class extends import_context15.Resource {
+var __dxlog_file26 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-context.ts";
+var ServiceContext = class extends import_context16.Resource {
   constructor(storage, level, networkManager, signalManager, _edgeConnection, _edgeHttpClient, _runtimeParams, _edgeFeatures) {
     super();
     this.storage = storage;
@@ -6989,12 +7312,12 @@ var ServiceContext = class extends import_context15.Resource {
     this._edgeHttpClient = _edgeHttpClient;
     this._runtimeParams = _runtimeParams;
     this._edgeFeatures = _edgeFeatures;
-    this._edgeIdentityUpdateMutex = new import_async21.Mutex();
-    this.initialized = new import_async21.Trigger();
+    this._edgeIdentityUpdateMutex = new import_async22.Mutex();
+    this.initialized = new import_async22.Trigger();
     this._meshReplicator = void 0;
     this._echoEdgeReplicator = void 0;
     this._handlerFactories = /* @__PURE__ */ new Map();
-    this._instanceId = import_keys15.PublicKey.random().toHex();
+    this._instanceId = import_keys16.PublicKey.random().toHex();
     this.metadataStore = new import_echo_pipeline5.MetadataStore(storage.createDirectory("metadata"));
     this.blobStore = new import_teleport_extension_object_sync.BlobStore(storage.createDirectory("blobs"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
@@ -7023,50 +7346,7 @@ var ServiceContext = class extends import_context15.Resource {
       devicePresenceOfflineTimeout: this._runtimeParams?.devicePresenceOfflineTimeout,
       devicePresenceAnnounceInterval: this._runtimeParams?.devicePresenceAnnounceInterval,
       edgeConnection: this._edgeConnection,
-      edgeFeatures: this._edgeFeatures,
-      callbacks: {
-        onIdentityConstruction: (identity) => {
-          if (this._edgeConnection) {
-            (0, import_async21.scheduleMicroTask)(this._ctx, async () => {
-              try {
-                var _usingCtx = _using_ctx3();
-                const _ = _usingCtx.u(await this._edgeIdentityUpdateMutex.acquire());
-                import_log22.log.info("Setting identity on edge connection", {
-                  identity: identity.identityKey.toHex(),
-                  oldIdentity: this._edgeConnection.identityKey,
-                  swarms: this.networkManager.topics
-                }, {
-                  F: __dxlog_file25,
-                  L: 147,
-                  S: this,
-                  C: (f, a) => f(...a)
-                });
-                await (0, import_debug6.warnAfterTimeout)(1e4, "Waiting for identity to be ready for edge connection", async () => {
-                  await identity.ready();
-                });
-                (0, import_invariant20.invariant)(identity.deviceCredentialChain, void 0, {
-                  F: __dxlog_file25,
-                  L: 157,
-                  S: this,
-                  A: [
-                    "identity.deviceCredentialChain",
-                    ""
-                  ]
-                });
-                this._edgeConnection.setIdentity(await (0, import_edge_client2.createChainEdgeIdentity)(identity.signer, identity.identityKey, identity.deviceKey, identity.deviceCredentialChain, []));
-                this.networkManager.setPeerInfo({
-                  identityKey: identity.identityKey.toHex(),
-                  peerKey: identity.deviceKey.toHex()
-                });
-              } catch (_) {
-                _usingCtx.e = _;
-              } finally {
-                _usingCtx.d();
-              }
-            });
-          }
-        }
-      }
+      edgeFeatures: this._edgeFeatures
     });
     this.echoHost = new import_echo_pipeline5.EchoHost({
       kv: this.level
@@ -7074,7 +7354,7 @@ var ServiceContext = class extends import_context15.Resource {
     this._meshReplicator = new import_echo_pipeline5.MeshEchoReplicator();
     this.invitations = new InvitationsHandler(this.networkManager, this._edgeHttpClient, _runtimeParams?.invitationConnectionDefaultParams);
     this.invitationsManager = new InvitationsManager(this.invitations, (invitation) => this.getInvitationHandler(invitation), this.metadataStore);
-    this._handlerFactories.set(import_services19.Invitation.Kind.DEVICE, () => new DeviceInvitationProtocol(this.keyring, () => this.identityManager.identity ?? (0, import_debug6.failUndefined)(), this._acceptIdentity.bind(this)));
+    this._handlerFactories.set(import_services21.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_pipeline5.MeshEchoReplicator();
     }
@@ -7086,24 +7366,23 @@ var ServiceContext = class extends import_context15.Resource {
   }
   async _open(ctx) {
     await this._checkStorageVersion();
-    (0, import_log22.log)("opening...", void 0, {
-      F: __dxlog_file25,
-      L: 218,
+    (0, import_log23.log)("opening...", void 0, {
+      F: __dxlog_file26,
+      L: 186,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log22.log.trace("dxos.sdk.service-context.open", import_protocols14.trace.begin({
+    import_log23.log.trace("dxos.sdk.service-context.open", import_protocols16.trace.begin({
       id: this._instanceId
     }), {
-      F: __dxlog_file25,
-      L: 219,
+      F: __dxlog_file26,
+      L: 187,
       S: this,
       C: (f, a) => f(...a)
     });
-    if (this._edgeConnection) {
-      this._edgeConnection.setIdentity(await (0, import_edge_client2.createEphemeralEdgeIdentity)());
-      await this._edgeConnection.open();
-    }
+    await this.identityManager.open(ctx);
+    await this._setNetworkIdentity();
+    await this._edgeConnection?.open();
     await this.signalManager.open();
     await this.networkManager.open();
     await this.echoHost.open(ctx);
@@ -7115,38 +7394,38 @@ var ServiceContext = class extends import_context15.Resource {
     }
     await this.metadataStore.load();
     await this.spaceManager.open();
-    await this.identityManager.open(ctx);
     if (this.identityManager.identity) {
+      await this.identityManager.identity.joinNetwork();
       await this._initialize(ctx);
     }
     const loadedInvitations = await this.invitationsManager.loadPersistentInvitations();
-    (0, import_log22.log)("loaded persistent invitations", {
+    (0, import_log23.log)("loaded persistent invitations", {
       count: loadedInvitations.invitations?.length
     }, {
-      F: __dxlog_file25,
-      L: 246,
+      F: __dxlog_file26,
+      L: 215,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log22.log.trace("dxos.sdk.service-context.open", import_protocols14.trace.end({
+    import_log23.log.trace("dxos.sdk.service-context.open", import_protocols16.trace.end({
       id: this._instanceId
     }), {
-      F: __dxlog_file25,
-      L: 248,
+      F: __dxlog_file26,
+      L: 217,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_log22.log)("opened", void 0, {
-      F: __dxlog_file25,
-      L: 249,
+    (0, import_log23.log)("opened", void 0, {
+      F: __dxlog_file26,
+      L: 218,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async _close(ctx) {
-    (0, import_log22.log)("closing...", void 0, {
-      F: __dxlog_file25,
-      L: 253,
+    (0, import_log23.log)("closing...", void 0, {
+      F: __dxlog_file26,
+      L: 222,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7154,6 +7433,7 @@ var ServiceContext = class extends import_context15.Resource {
       await this.identityManager.identity.space.spaceState.removeCredentialProcessor(this._deviceSpaceSync);
     }
     await this.dataSpaceManager?.close();
+    await this.edgeAgentManager?.close();
     await this.identityManager.close();
     await this.spaceManager.close();
     await this.feedStore.close();
@@ -7162,26 +7442,28 @@ var ServiceContext = class extends import_context15.Resource {
     await this.networkManager.close();
     await this.signalManager.close();
     await this._edgeConnection?.close();
-    (0, import_log22.log)("closed", void 0, {
-      F: __dxlog_file25,
-      L: 268,
+    (0, import_log23.log)("closed", void 0, {
+      F: __dxlog_file26,
+      L: 238,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async createIdentity(params = {}) {
     const identity = await this.identityManager.createIdentity(params);
-    await this._initialize(new import_context15.Context(void 0, {
-      F: __dxlog_file25,
-      L: 273
+    await this._setNetworkIdentity();
+    await identity.joinNetwork();
+    await this._initialize(new import_context16.Context(void 0, {
+      F: __dxlog_file26,
+      L: 245
     }));
     return identity;
   }
   getInvitationHandler(invitation) {
     const factory = this._handlerFactories.get(invitation.kind);
-    (0, import_invariant20.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
-      F: __dxlog_file25,
-      L: 279,
+    (0, import_invariant21.invariant)(factory, `Unknown invitation kind: ${invitation.kind}`, {
+      F: __dxlog_file26,
+      L: 251,
       S: this,
       A: [
         "factory",
@@ -7199,24 +7481,29 @@ var ServiceContext = class extends import_context15.Resource {
     }
   }
   async _acceptIdentity(params) {
-    const identity = await this.identityManager.acceptIdentity(params);
-    await this._initialize(new import_context15.Context(void 0, {
-      F: __dxlog_file25,
-      L: 295
+    const { identity, identityRecord } = await this.identityManager.prepareIdentity(params);
+    await this._setNetworkIdentity({
+      deviceCredential: params.authorizedDeviceCredential
+    });
+    await identity.joinNetwork();
+    await this.identityManager.acceptIdentity(identity, identityRecord, params.deviceProfile);
+    await this._initialize(new import_context16.Context(void 0, {
+      F: __dxlog_file26,
+      L: 270
     }));
     return identity;
   }
   async _checkStorageVersion() {
     await this.metadataStore.load();
-    if (this.metadataStore.version !== import_protocols14.STORAGE_VERSION) {
-      throw new import_protocols14.InvalidStorageVersionError(import_protocols14.STORAGE_VERSION, this.metadataStore.version);
+    if (this.metadataStore.version !== import_protocols16.STORAGE_VERSION) {
+      throw new import_protocols16.InvalidStorageVersionError(import_protocols16.STORAGE_VERSION, this.metadataStore.version);
     }
   }
   // Called when identity is created.
   async _initialize(ctx) {
-    (0, import_log22.log)("initializing spaces...", void 0, {
-      F: __dxlog_file25,
-      L: 310,
+    (0, import_log23.log)("initializing spaces...", void 0, {
+      F: __dxlog_file26,
+      L: 285,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7250,10 +7537,12 @@ var ServiceContext = class extends import_context15.Resource {
       edgeFeatures: this._edgeFeatures
     });
     await this.dataSpaceManager.open();
-    this._handlerFactories.set(import_services19.Invitation.Kind.SPACE, (invitation) => {
-      (0, import_invariant20.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
-        F: __dxlog_file25,
-        L: 340,
+    this.edgeAgentManager = new EdgeAgentManager(this._edgeFeatures, this._edgeHttpClient, this.dataSpaceManager, identity);
+    await this.edgeAgentManager.open();
+    this._handlerFactories.set(import_services21.Invitation.Kind.SPACE, (invitation) => {
+      (0, import_invariant21.invariant)(this.dataSpaceManager, "dataSpaceManager not initialized yet", {
+        F: __dxlog_file26,
+        L: 323,
         S: this,
         A: [
           "this.dataSpaceManager",
@@ -7265,7 +7554,7 @@ var ServiceContext = class extends import_context15.Resource {
     this.initialized.wake();
     this._deviceSpaceSync = {
       processCredential: async (credential) => {
-        const assertion = (0, import_credentials21.getCredentialAssertion)(credential);
+        const assertion = (0, import_credentials22.getCredentialAssertion)(credential);
         if (assertion["@type"] !== "dxos.halo.credentials.SpaceMember") {
           return;
         }
@@ -7273,33 +7562,33 @@ var ServiceContext = class extends import_context15.Resource {
           return;
         }
         if (!this.dataSpaceManager) {
-          (0, import_log22.log)("dataSpaceManager not initialized yet, ignoring space admission", {
+          (0, import_log23.log)("dataSpaceManager not initialized yet, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file25,
-            L: 356,
+            F: __dxlog_file26,
+            L: 339,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         if (this.dataSpaceManager.spaces.has(assertion.spaceKey)) {
-          (0, import_log22.log)("space already exists, ignoring space admission", {
+          (0, import_log23.log)("space already exists, ignoring space admission", {
             details: assertion
           }, {
-            F: __dxlog_file25,
-            L: 360,
+            F: __dxlog_file26,
+            L: 343,
             S: this,
             C: (f, a) => f(...a)
           });
           return;
         }
         try {
-          (0, import_log22.log)("accepting space recorded in halo", {
+          (0, import_log23.log)("accepting space recorded in halo", {
             details: assertion
           }, {
-            F: __dxlog_file25,
-            L: 365,
+            F: __dxlog_file26,
+            L: 348,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7308,9 +7597,9 @@ var ServiceContext = class extends import_context15.Resource {
             genesisFeedKey: assertion.genesisFeedKey
           });
         } catch (err) {
-          import_log22.log.catch(err, void 0, {
-            F: __dxlog_file25,
-            L: 371,
+          import_log23.log.catch(err, void 0, {
+            F: __dxlog_file26,
+            L: 354,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7319,14 +7608,65 @@ var ServiceContext = class extends import_context15.Resource {
     };
     await identity.space.spaceState.addCredentialProcessor(this._deviceSpaceSync);
   }
+  async _setNetworkIdentity(params) {
+    try {
+      var _usingCtx = _using_ctx3();
+      const _ = _usingCtx.u(await this._edgeIdentityUpdateMutex.acquire());
+      let edgeIdentity;
+      const identity = this.identityManager.identity;
+      if (identity) {
+        import_log23.log.info("Setting identity on edge connection", {
+          identity: identity.identityKey.toHex(),
+          swarms: this.networkManager.topics
+        }, {
+          F: __dxlog_file26,
+          L: 368,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+        if (params?.deviceCredential) {
+          edgeIdentity = await (0, import_edge_client2.createChainEdgeIdentity)(identity.signer, identity.identityKey, identity.deviceKey, {
+            credential: params.deviceCredential
+          }, []);
+        } else {
+          await (0, import_debug6.warnAfterTimeout)(1e4, "Waiting for identity to be ready for edge connection", async () => {
+            await identity.ready();
+          });
+          (0, import_invariant21.invariant)(identity.deviceCredentialChain, void 0, {
+            F: __dxlog_file26,
+            L: 386,
+            S: this,
+            A: [
+              "identity.deviceCredentialChain",
+              ""
+            ]
+          });
+          edgeIdentity = await (0, import_edge_client2.createChainEdgeIdentity)(identity.signer, identity.identityKey, identity.deviceKey, identity.deviceCredentialChain, []);
+        }
+      } else {
+        edgeIdentity = await (0, import_edge_client2.createEphemeralEdgeIdentity)();
+      }
+      if (this._edgeConnection) {
+        this._edgeConnection.setIdentity(edgeIdentity);
+      }
+      this.networkManager.setPeerInfo({
+        identityKey: edgeIdentity.identityKey,
+        peerKey: edgeIdentity.peerKey
+      });
+    } catch (_) {
+      _usingCtx.e = _;
+    } finally {
+      _usingCtx.d();
+    }
+  }
 };
-_ts_decorate9([
+_ts_decorate10([
   import_tracing10.trace.span()
 ], ServiceContext.prototype, "_open", null);
-_ts_decorate9([
+_ts_decorate10([
   import_tracing10.trace.span()
 ], ServiceContext.prototype, "_initialize", null);
-ServiceContext = _ts_decorate9([
+ServiceContext = _ts_decorate10([
   (0, import_util12.safeInstanceof)("dxos.client-services.ServiceContext"),
   import_tracing10.trace.resource()
 ], ServiceContext);
@@ -7364,16 +7704,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_protocols15.InvalidConfigError("RAM storage cannot be used in persistent mode.");
+    throw new import_protocols17.InvalidConfigError("RAM storage cannot be used in persistent mode.");
   }
   if (!persistent && dataStore !== void 0 && dataStore !== StorageDriver.RAM) {
-    throw new import_protocols15.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
+    throw new import_protocols17.InvalidConfigError("Cannot use a persistent storage in not persistent mode.");
   }
   if (persistent && keyStore === StorageDriver.RAM) {
-    throw new import_protocols15.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
+    throw new import_protocols17.InvalidConfigError("RAM key storage cannot be used in persistent mode.");
   }
   if (!persistent && keyStore !== StorageDriver.RAM && keyStore !== void 0) {
-    throw new import_protocols15.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
+    throw new import_protocols17.InvalidConfigError("Cannot use a persistent key storage in not persistent mode.");
   }
   return {
     storage: (0, import_random_access_storage.createStorage)({
@@ -7404,12 +7744,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_keys16.PublicKey.random().toHex()}`;
+  const storagePath = persistent ? import_node_path.default.join(getRootPath(config), "level") : `/tmp/dxos-${import_keys17.PublicKey.random().toHex()}`;
   const level = (0, import_kv_store.createLevel)(storagePath);
   await level.open();
   return level;
 };
-var __dxlog_file26 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/storage/profile-archive.ts";
+var __dxlog_file27 = "/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 }) => {
@@ -7422,10 +7762,10 @@ var exportProfileData = async ({ storage, level }) => {
   {
     const directory = await storage.createDirectory();
     const files = await directory.list();
-    import_log23.log.info("begin exporting files", {
+    import_log24.log.info("begin exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file26,
+      F: __dxlog_file27,
       L: 30,
       S: void 0,
       C: (f, a) => f(...a)
@@ -7435,23 +7775,23 @@ var exportProfileData = async ({ storage, level }) => {
       const { size } = await file.stat();
       const data = await file.read(0, size);
       archive.storage.push({
-        type: import_protocols16.ProfileArchiveEntryType.FILE,
+        type: import_protocols18.ProfileArchiveEntryType.FILE,
         key: filename,
         value: data
       });
     }
-    import_log23.log.info("done exporting files", {
+    import_log24.log.info("done exporting files", {
       count: files.length
     }, {
-      F: __dxlog_file26,
+      F: __dxlog_file27,
       L: 41,
       S: void 0,
       C: (f, a) => f(...a)
     });
   }
   {
-    import_log23.log.info("begin exporting kv pairs", void 0, {
-      F: __dxlog_file26,
+    import_log24.log.info("begin exporting kv pairs", void 0, {
+      F: __dxlog_file27,
       L: 45,
       S: void 0,
       C: (f, a) => f(...a)
@@ -7463,16 +7803,16 @@ var exportProfileData = async ({ storage, level }) => {
     let count = 0;
     for await (const [key, value] of iter) {
       archive.storage.push({
-        type: import_protocols16.ProfileArchiveEntryType.KEY_VALUE,
+        type: import_protocols18.ProfileArchiveEntryType.KEY_VALUE,
         key,
         value
       });
       count++;
     }
-    import_log23.log.info("done exporting kv pairs", {
+    import_log24.log.info("done exporting kv pairs", {
       count
     }, {
-      F: __dxlog_file26,
+      F: __dxlog_file27,
       L: 56,
       S: void 0,
       C: (f, a) => f(...a)
@@ -7485,10 +7825,10 @@ var importProfileData = async ({ storage, level }, archive) => {
   let count = 0;
   for (const entry2 of archive.storage) {
     switch (entry2.type) {
-      case import_protocols16.ProfileArchiveEntryType.FILE: {
+      case import_protocols18.ProfileArchiveEntryType.FILE: {
         const directory = await storage.createDirectory();
-        (0, import_invariant21.invariant)(typeof entry2.key === "string", "Invalid key type", {
-          F: __dxlog_file26,
+        (0, import_invariant22.invariant)(typeof entry2.key === "string", "Invalid key type", {
+          F: __dxlog_file27,
           L: 79,
           S: void 0,
           A: [
@@ -7497,8 +7837,8 @@ var importProfileData = async ({ storage, level }, archive) => {
           ]
         });
         const file = await directory.getOrCreateFile(entry2.key);
-        (0, import_invariant21.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file26,
+        (0, import_invariant22.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file27,
           L: 81,
           S: void 0,
           A: [
@@ -7510,9 +7850,9 @@ var importProfileData = async ({ storage, level }, archive) => {
         await file.close();
         break;
       }
-      case import_protocols16.ProfileArchiveEntryType.KEY_VALUE: {
-        (0, import_invariant21.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
-          F: __dxlog_file26,
+      case import_protocols18.ProfileArchiveEntryType.KEY_VALUE: {
+        (0, import_invariant22.invariant)(entry2.key instanceof Uint8Array, "Invalid key type", {
+          F: __dxlog_file27,
           L: 87,
           S: void 0,
           A: [
@@ -7520,8 +7860,8 @@ var importProfileData = async ({ storage, level }, archive) => {
             "'Invalid key type'"
           ]
         });
-        (0, import_invariant21.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
-          F: __dxlog_file26,
+        (0, import_invariant22.invariant)(entry2.value instanceof Uint8Array, "Invalid value type", {
+          F: __dxlog_file27,
           L: 88,
           S: void 0,
           A: [
@@ -7541,27 +7881,27 @@ var importProfileData = async ({ storage, level }, archive) => {
     if (++count % 1e3 === 0) {
       await batch.write();
       batch = level.batch();
-      import_log23.log.info("importing", {
+      import_log24.log.info("importing", {
         count,
         total: archive.storage.length,
         progress: `${(count / archive.storage.length * 100).toFixed()}%`
       }, {
-        F: __dxlog_file26,
+        F: __dxlog_file27,
         L: 101,
         S: void 0,
         C: (f, a) => f(...a)
       });
     }
   }
-  import_log23.log.info("committing changes..", void 0, {
-    F: __dxlog_file26,
+  import_log24.log.info("committing changes..", void 0, {
+    F: __dxlog_file27,
     L: 109,
     S: void 0,
     C: (f, a) => f(...a)
   });
   await batch.write();
 };
-var __dxlog_file27 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
+var __dxlog_file28 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/devices/devices-service.ts";
 var DevicesServiceImpl = class {
   constructor(_identityManager) {
     this._identityManager = _identityManager;
@@ -7570,7 +7910,7 @@ var DevicesServiceImpl = class {
     return this._identityManager.updateDeviceProfile(profile);
   }
   queryDevices() {
-    return new import_codec_protobuf12.Stream(({ next }) => {
+    return new import_codec_protobuf13.Stream(({ next }) => {
       const update = () => {
         const deviceKeys = this._identityManager.identity?.authorizedDeviceKeys;
         if (!deviceKeys) {
@@ -7578,8 +7918,8 @@ var DevicesServiceImpl = class {
             devices: []
           });
         } else {
-          (0, import_invariant23.invariant)(this._identityManager.identity?.presence, "presence not present", {
-            F: __dxlog_file27,
+          (0, import_invariant24.invariant)(this._identityManager.identity?.presence, "presence not present", {
+            F: __dxlog_file28,
             L: 32,
             S: this,
             A: [
@@ -7594,9 +7934,9 @@ var DevicesServiceImpl = class {
               const peerState = peers.find((peer) => peer.identityKey.equals(key));
               return {
                 deviceKey: key,
-                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services21.DeviceKind.CURRENT : import_services21.DeviceKind.TRUSTED,
+                kind: this._identityManager.identity?.deviceKey.equals(key) ? import_services23.DeviceKind.CURRENT : import_services23.DeviceKind.TRUSTED,
                 profile,
-                presence: isMe ? import_services21.Device.PresenceState.ONLINE : peerState ? import_services21.Device.PresenceState.ONLINE : import_services21.Device.PresenceState.OFFLINE
+                presence: isMe ? import_services23.Device.PresenceState.ONLINE : peerState ? import_services23.Device.PresenceState.ONLINE : import_services23.Device.PresenceState.OFFLINE
               };
             })
           });
@@ -7620,7 +7960,7 @@ var DevicesServiceImpl = class {
           presenceSubscribed = true;
         }
       };
-      const subscriptions = new import_async23.EventSubscriptions();
+      const subscriptions = new import_async24.EventSubscriptions();
       if (this._identityManager.identity) {
         subscribeIdentity();
         subscribePresence();
@@ -7676,7 +8016,7 @@ var ContactsServiceImpl = class {
         });
       }
       return acc;
-    }, new import_util15.ComplexMap(import_keys18.PublicKey.hash));
+    }, new import_util15.ComplexMap(import_keys19.PublicKey.hash));
     return {
       contacts: [
         ...contacts.values()
@@ -7684,16 +8024,16 @@ var ContactsServiceImpl = class {
     };
   }
   queryContacts() {
-    const subscribedSpaceKeySet = new import_util15.ComplexSet(import_keys18.PublicKey.hash);
-    return new import_codec_protobuf13.Stream(({ next, ctx }) => {
-      const pushUpdateTask = new import_async24.UpdateScheduler(ctx, async () => {
+    const subscribedSpaceKeySet = new import_util15.ComplexSet(import_keys19.PublicKey.hash);
+    return new import_codec_protobuf14.Stream(({ next, ctx }) => {
+      const pushUpdateTask = new import_async25.UpdateScheduler(ctx, async () => {
         const contacts = await this.getContacts();
         next(contacts);
       }, {
         maxFrequency: 2
       });
-      (0, import_async24.scheduleTask)(ctx, async () => {
-        const subscriptions = new import_async24.EventSubscriptions();
+      (0, import_async25.scheduleTask)(ctx, async () => {
+        const subscriptions = new import_async25.EventSubscriptions();
         ctx.onDispose(() => subscriptions.clear());
         const subscribeToSpaceAndUpdate = () => {
           const oldSetSize = subscribedSpaceKeySet.size;
@@ -7716,19 +8056,19 @@ var ContactsServiceImpl = class {
 };
 var LoggingServiceImpl = class {
   constructor() {
-    this._logs = new import_async25.Event();
+    this._logs = new import_async26.Event();
     this._started = Date.now();
-    this._sessionId = import_keys19.PublicKey.random().toHex();
+    this._sessionId = import_keys20.PublicKey.random().toHex();
     this._logProcessor = (_config, entry2) => {
       this._logs.emit(entry2);
     };
   }
   async open() {
-    import_log25.log.runtimeConfig.processors.push(this._logProcessor);
+    import_log26.log.runtimeConfig.processors.push(this._logProcessor);
   }
   async close() {
-    const index = import_log25.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
-    import_log25.log.runtimeConfig.processors.splice(index, 1);
+    const index = import_log26.log.runtimeConfig.processors.findIndex((processor) => processor === this._logProcessor);
+    import_log26.log.runtimeConfig.processors.splice(index, 1);
   }
   async controlMetrics({ reset, record }) {
     if (reset) {
@@ -7754,7 +8094,7 @@ var LoggingServiceImpl = class {
         stats: (0, import_util16.numericalValues)(events, "duration")
       };
     };
-    return new import_codec_protobuf14.Stream(({ next }) => {
+    return new import_codec_protobuf15.Stream(({ next }) => {
       const update = () => {
         const metrics2 = {
           timestamp: /* @__PURE__ */ new Date(),
@@ -7776,7 +8116,7 @@ var LoggingServiceImpl = class {
     });
   }
   queryLogs(request) {
-    return new import_codec_protobuf14.Stream(({ ctx, next }) => {
+    return new import_codec_protobuf15.Stream(({ ctx, next }) => {
       const handler = (entry2) => {
         if (LOG_PROCESSING > 0) {
           return;
@@ -7789,7 +8129,7 @@ var LoggingServiceImpl = class {
         }
         const record = {
           ...entry2,
-          context: (0, import_util16.jsonify)((0, import_log25.getContextFromEntry)(entry2)),
+          context: (0, import_util16.jsonify)((0, import_log26.getContextFromEntry)(entry2)),
           timestamp: /* @__PURE__ */ new Date(),
           meta: {
             // TODO(dmaretskyi): Fix proto.
@@ -7815,16 +8155,16 @@ var LoggingServiceImpl = class {
 };
 var matchFilter = (filter, level, path2, options) => {
   switch (options) {
-    case import_services22.QueryLogsRequest.MatchingOptions.INCLUSIVE:
+    case import_services24.QueryLogsRequest.MatchingOptions.INCLUSIVE:
       return level >= filter.level && (!filter.pattern || path2.includes(filter.pattern));
-    case import_services22.QueryLogsRequest.MatchingOptions.EXPLICIT:
+    case import_services24.QueryLogsRequest.MatchingOptions.EXPLICIT:
       return level === filter.level && (!filter.pattern || path2.includes(filter.pattern));
   }
 };
 var shouldLog = (entry2, request) => {
-  const options = request.options ?? import_services22.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+  const options = request.options ?? import_services24.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   if (request.filters === void 0) {
-    return options === import_services22.QueryLogsRequest.MatchingOptions.INCLUSIVE;
+    return options === import_services24.QueryLogsRequest.MatchingOptions.INCLUSIVE;
   } else {
     return request.filters.some((filter) => matchFilter(filter, entry2.level, entry2.meta?.F ?? "", options));
   }
@@ -7836,7 +8176,7 @@ var NetworkServiceImpl = class {
     this.signalManager = signalManager;
   }
   queryStatus() {
-    return new import_codec_protobuf15.Stream(({ next }) => {
+    return new import_codec_protobuf16.Stream(({ next }) => {
       const update = () => {
         next({
           swarm: this.networkManager.connectionState,
@@ -7880,8 +8220,8 @@ var SystemServiceImpl = class {
     return {
       timestamp: /* @__PURE__ */ new Date(),
       diagnostics: JSON.parse(JSON.stringify(diagnostics, (0, import_util17.jsonKeyReplacer)({
-        truncate: keys === import_services23.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
-        humanize: keys === import_services23.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
+        truncate: keys === import_services25.GetDiagnosticsRequest.KEY_OPTION.TRUNCATE,
+        humanize: keys === import_services25.GetDiagnosticsRequest.KEY_OPTION.HUMANIZE
       })))
     };
   }
@@ -7893,7 +8233,7 @@ var SystemServiceImpl = class {
   }
   // TODO(burdon): Standardize interval option in stream request?
   queryStatus({ interval = 3e3 } = {}) {
-    return new import_codec_protobuf16.Stream(({ next }) => {
+    return new import_codec_protobuf17.Stream(({ next }) => {
       const update = () => {
         next({
           status: this._getCurrentStatus()
@@ -7912,13 +8252,13 @@ var SystemServiceImpl = class {
     await this._onReset();
   }
 };
-function _ts_decorate10(decorators, target, key, desc) {
+function _ts_decorate11(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
   else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
-var __dxlog_file28 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
+var __dxlog_file29 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/services/service-host.ts";
 var ClientServicesHost = class {
   constructor({
     config,
@@ -7932,7 +8272,7 @@ var ClientServicesHost = class {
     runtimeParams
   } = {}) {
     this._tracingService = import_tracing11.TRACE_PROCESSOR.createTraceSender();
-    this._statusUpdate = new import_async22.Event();
+    this._statusUpdate = new import_async23.Event();
     this._edgeConnection = void 0;
     this._edgeHttpClient = void 0;
     this._opening = false;
@@ -7956,9 +8296,9 @@ var ClientServicesHost = class {
         lockKey,
         onAcquire: () => {
           if (!this._opening) {
-            void this.open(new import_context16.Context(void 0, {
-              F: __dxlog_file28,
-              L: 133
+            void this.open(new import_context17.Context(void 0, {
+              F: __dxlog_file29,
+              L: 134
             }));
           }
         },
@@ -7968,14 +8308,14 @@ var ClientServicesHost = class {
     this._systemService = new SystemServiceImpl({
       config: () => this._config,
       statusUpdate: this._statusUpdate,
-      getCurrentStatus: () => this.isOpen ? import_services20.SystemStatus.ACTIVE : import_services20.SystemStatus.INACTIVE,
+      getCurrentStatus: () => this.isOpen ? import_services22.SystemStatus.ACTIVE : import_services22.SystemStatus.INACTIVE,
       getDiagnostics: () => {
         return createDiagnostics(this._serviceRegistry.services, this._serviceContext, this._config);
       },
       onUpdateStatus: async (status) => {
-        if (!this.isOpen && status === import_services20.SystemStatus.ACTIVE) {
+        if (!this.isOpen && status === import_services22.SystemStatus.ACTIVE) {
           await this._resourceLock?.acquire();
-        } else if (this.isOpen && status === import_services20.SystemStatus.INACTIVE) {
+        } else if (this.isOpen && status === import_services22.SystemStatus.INACTIVE) {
           await this._resourceLock?.release();
         }
       },
@@ -8014,25 +8354,25 @@ var ClientServicesHost = class {
   * Can only be called once.
   */
   initialize({ config, ...options }) {
-    (0, import_invariant22.invariant)(!this._open, "service host is open", {
-      F: __dxlog_file28,
-      L: 199,
+    (0, import_invariant23.invariant)(!this._open, "service host is open", {
+      F: __dxlog_file29,
+      L: 200,
       S: this,
       A: [
         "!this._open",
         "'service host is open'"
       ]
     });
-    (0, import_log24.log)("initializing...", void 0, {
-      F: __dxlog_file28,
-      L: 200,
+    (0, import_log25.log)("initializing...", void 0, {
+      F: __dxlog_file29,
+      L: 201,
       S: this,
       C: (f, a) => f(...a)
     });
     if (config) {
-      (0, import_invariant22.invariant)(!this._config, "config already set", {
-        F: __dxlog_file28,
-        L: 203,
+      (0, import_invariant23.invariant)(!this._config, "config already set", {
+        F: __dxlog_file29,
+        L: 204,
         S: this,
         A: [
           "!this._config",
@@ -8045,9 +8385,9 @@ var ClientServicesHost = class {
       }
     }
     if (!options.signalManager) {
-      import_log24.log.warn("running signaling without telemetry metadata.", void 0, {
-        F: __dxlog_file28,
-        L: 211,
+      import_log25.log.warn("running signaling without telemetry metadata.", void 0, {
+        F: __dxlog_file29,
+        L: 212,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -8065,9 +8405,9 @@ var ClientServicesHost = class {
       edgeConnection: this._edgeConnection
     }) : new import_messaging.WebsocketSignalManager(this._config?.get("runtime.services.signaling") ?? []) } = options;
     this._signalManager = signalManager;
-    (0, import_invariant22.invariant)(!this._networkManager, "network manager already set", {
-      F: __dxlog_file28,
-      L: 233,
+    (0, import_invariant23.invariant)(!this._networkManager, "network manager already set", {
+      F: __dxlog_file29,
+      L: 234,
       S: this,
       A: [
         "!this._networkManager",
@@ -8083,9 +8423,9 @@ var ClientServicesHost = class {
         peerKey: this._edgeConnection.peerKey
       } : void 0
     });
-    (0, import_log24.log)("initialized", void 0, {
-      F: __dxlog_file28,
-      L: 246,
+    (0, import_log25.log)("initialized", void 0, {
+      F: __dxlog_file29,
+      L: 247,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8094,45 +8434,45 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    const traceId = import_keys17.PublicKey.random().toHex();
-    import_log24.log.trace("dxos.client-services.host.open", import_protocols17.trace.begin({
+    const traceId = import_keys18.PublicKey.random().toHex();
+    import_log25.log.trace("dxos.client-services.host.open", import_protocols19.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file28,
-      L: 257,
+      F: __dxlog_file29,
+      L: 258,
       S: this,
       C: (f, a) => f(...a)
     });
-    (0, import_invariant22.invariant)(this._config, "config not set", {
-      F: __dxlog_file28,
-      L: 259,
+    (0, import_invariant23.invariant)(this._config, "config not set", {
+      F: __dxlog_file29,
+      L: 260,
       S: this,
       A: [
         "this._config",
         "'config not set'"
       ]
     });
-    (0, import_invariant22.invariant)(this._storage, "storage not set", {
-      F: __dxlog_file28,
-      L: 260,
+    (0, import_invariant23.invariant)(this._storage, "storage not set", {
+      F: __dxlog_file29,
+      L: 261,
       S: this,
       A: [
         "this._storage",
         "'storage not set'"
       ]
     });
-    (0, import_invariant22.invariant)(this._signalManager, "signal manager not set", {
-      F: __dxlog_file28,
-      L: 261,
+    (0, import_invariant23.invariant)(this._signalManager, "signal manager not set", {
+      F: __dxlog_file29,
+      L: 262,
       S: this,
       A: [
         "this._signalManager",
         "'signal manager not set'"
       ]
     });
-    (0, import_invariant22.invariant)(this._networkManager, "network manager not set", {
-      F: __dxlog_file28,
-      L: 262,
+    (0, import_invariant23.invariant)(this._networkManager, "network manager not set", {
+      F: __dxlog_file29,
+      L: 263,
       S: this,
       A: [
         "this._networkManager",
@@ -8140,11 +8480,11 @@ var ClientServicesHost = class {
       ]
     });
     this._opening = true;
-    (0, import_log24.log)("opening...", {
+    (0, import_log25.log)("opening...", {
       lockKey: this._resourceLock?.lockKey
     }, {
-      F: __dxlog_file28,
-      L: 265,
+      F: __dxlog_file29,
+      L: 266,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8159,6 +8499,10 @@ var ClientServicesHost = class {
       await this._serviceContext.initialized.wait();
       return this._serviceContext.dataSpaceManager;
     };
+    const agentManagerProvider = async () => {
+      await this._serviceContext.initialized.wait();
+      return this._serviceContext.edgeAgentManager;
+    };
     const identityService = new IdentityServiceImpl(this._serviceContext.identityManager, this._serviceContext.keyring, () => this._serviceContext.dataSpaceManager, (params) => this._createIdentity(params), (profile) => this._serviceContext.broadcastProfileUpdate(profile));
     this._serviceRegistry.setServices({
       SystemService: this._systemService,
@@ -8177,7 +8521,8 @@ var ClientServicesHost = class {
         events: new DevtoolsHostEvents(),
         config: this._config,
         context: this._serviceContext
-      })
+      }),
+      EdgeAgentService: new EdgeAgentServiceImpl(agentManagerProvider)
     });
     await this._serviceContext.open(ctx);
     await identityService.open();
@@ -8196,19 +8541,19 @@ var ClientServicesHost = class {
     this._open = true;
     this._statusUpdate.emit();
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log24.log)("opened", {
+    (0, import_log25.log)("opened", {
       deviceKey
     }, {
-      F: __dxlog_file28,
-      L: 354,
+      F: __dxlog_file29,
+      L: 362,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log24.log.trace("dxos.client-services.host.open", import_protocols17.trace.end({
+    import_log25.log.trace("dxos.client-services.host.open", import_protocols19.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file28,
-      L: 355,
+      F: __dxlog_file29,
+      L: 363,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8218,11 +8563,11 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = this._serviceContext.identityManager.identity?.deviceKey;
-    (0, import_log24.log)("closing...", {
+    (0, import_log25.log)("closing...", {
       deviceKey
     }, {
-      F: __dxlog_file28,
-      L: 366,
+      F: __dxlog_file29,
+      L: 374,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8236,44 +8581,44 @@ var ClientServicesHost = class {
     await this._level?.close();
     this._open = false;
     this._statusUpdate.emit();
-    (0, import_log24.log)("closed", {
+    (0, import_log25.log)("closed", {
       deviceKey
     }, {
-      F: __dxlog_file28,
-      L: 375,
+      F: __dxlog_file29,
+      L: 383,
       S: this,
       C: (f, a) => f(...a)
     });
   }
   async reset() {
-    const traceId = import_keys17.PublicKey.random().toHex();
-    import_log24.log.trace("dxos.sdk.client-services-host.reset", import_protocols17.trace.begin({
+    const traceId = import_keys18.PublicKey.random().toHex();
+    import_log25.log.trace("dxos.sdk.client-services-host.reset", import_protocols19.trace.begin({
       id: traceId
     }), {
-      F: __dxlog_file28,
-      L: 380,
+      F: __dxlog_file29,
+      L: 388,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log24.log.info("resetting...", void 0, {
-      F: __dxlog_file28,
-      L: 382,
+    import_log25.log.info("resetting...", void 0, {
+      F: __dxlog_file29,
+      L: 390,
       S: this,
       C: (f, a) => f(...a)
     });
     await this._serviceContext?.close();
     await this._storage.reset();
-    import_log24.log.info("reset", void 0, {
-      F: __dxlog_file28,
-      L: 385,
+    import_log25.log.info("reset", void 0, {
+      F: __dxlog_file29,
+      L: 393,
       S: this,
       C: (f, a) => f(...a)
     });
-    import_log24.log.trace("dxos.sdk.client-services-host.reset", import_protocols17.trace.end({
+    import_log25.log.trace("dxos.sdk.client-services-host.reset", import_protocols19.trace.end({
       id: traceId
     }), {
-      F: __dxlog_file28,
-      L: 386,
+      F: __dxlog_file29,
+      L: 394,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8285,21 +8630,21 @@ var ClientServicesHost = class {
     return identity;
   }
 };
-_ts_decorate10([
+_ts_decorate11([
   import_tracing11.trace.info()
 ], ClientServicesHost.prototype, "_opening", void 0);
-_ts_decorate10([
+_ts_decorate11([
   import_tracing11.trace.info()
 ], ClientServicesHost.prototype, "_open", void 0);
-_ts_decorate10([
-  import_async22.synchronized,
+_ts_decorate11([
+  import_async23.synchronized,
   import_tracing11.trace.span()
 ], ClientServicesHost.prototype, "open", null);
-_ts_decorate10([
-  import_async22.synchronized,
+_ts_decorate11([
+  import_async23.synchronized,
   import_tracing11.trace.span()
 ], ClientServicesHost.prototype, "close", null);
-ClientServicesHost = _ts_decorate10([
+ClientServicesHost = _ts_decorate11([
   import_tracing11.trace.resource()
 ], ClientServicesHost);
 // Annotate the CommonJS export names for ESM import in node:
@@ -8312,6 +8657,8 @@ ClientServicesHost = _ts_decorate10([
   DevtoolsHostEvents,
   DevtoolsServiceImpl,
   DiagnosticsCollector,
+  EdgeAgentManager,
+  EdgeAgentServiceImpl,
   EdgeFeedReplicator,
   Identity,
   IdentityManager,
@@ -8346,4 +8693,4 @@ ClientServicesHost = _ts_decorate10([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-MA5EWTRH.cjs.map
+//# sourceMappingURL=chunk-DJIOUOAF.cjs.map