@dxos/client-services 0.7.5-main.e9bb01b → 0.7.5-staging.2ff1350

package/dist/lib/node/{chunk-WFDMSV4I.cjs → chunk-K6H3KWWB.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_WFDMSV4I_exports = {};
-__export(chunk_WFDMSV4I_exports, {
+var chunk_K6H3KWWB_exports = {};
+__export(chunk_K6H3KWWB_exports, {
   ClientRpcServer: () => ClientRpcServer,
   ClientServicesHost: () => ClientServicesHost,
   DataSpace: () => DataSpace,
@@ -72,7 +72,7 @@ __export(chunk_WFDMSV4I_exports, {
   subscribeToSpaces: () => subscribeToSpaces,
   subscribeToSwarmInfo: () => subscribeToSwarmInfo
 });
-module.exports = __toCommonJS(chunk_WFDMSV4I_exports);
+module.exports = __toCommonJS(chunk_K6H3KWWB_exports);
 var import_async = require("@dxos/async");
 var import_stream = require("@dxos/codec-protobuf/stream");
 var import_feed_store = require("@dxos/feed-store");
@@ -735,7 +735,7 @@ var DevtoolsServiceImpl = class {
     });
   }
 };
-var DXOS_VERSION = "0.7.5-main.e9bb01b";
+var DXOS_VERSION = "0.7.5-staging.2ff1350";
 var getPlatform = () => {
   if (process.browser) {
     if (typeof window !== "undefined") {
@@ -799,6 +799,7 @@ var createDiagnostics = async (clientServices, serviceContext, config) => {
       const identity = serviceContext.identityManager.identity;
       if (identity) {
         diagnostics.identity = {
+          did: identity.did,
           identityKey: identity.identityKey,
           spaceKey: identity.space.key,
           profile: identity.profileDocument
@@ -837,16 +838,17 @@ var getSpaceStats = async (space) => {
       ...credential.subject.assertion,
       id: credential.id
     })),
-    members: Array.from(space.inner.spaceState.members.values()).map((member) => ({
+    members: await Promise.all(Array.from(space.inner.spaceState.members.values()).map(async (member) => ({
       role: member.role,
       identity: {
+        did: await (0, import_credentials.createDidFromIdentityKey)(member.key),
         identityKey: member.key,
         profile: {
           displayName: member.assertion.profile?.displayName
         }
       },
       presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? import_services.SpaceMember.PresenceState.ONLINE : import_services.SpaceMember.PresenceState.OFFLINE
-    })),
+    }))),
     pipeline: {
       // TODO(burdon): Pick properties from credentials if needed.
       currentEpoch: space.automergeSpaceState.lastEpoch,
@@ -926,7 +928,7 @@ var findSystemServiceProvider = () => {
 };
 var findConfigs = () => {
   const configs = import_tracing2.TRACE_PROCESSOR.findResourcesByAnnotation(import_config.ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(import_util2.nonNullable);
+  return configs.map((r) => r.instance.deref()).filter(import_util2.isNonNullable);
 };
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/identity/authenticator.ts";
 var Credential = import_proto.schema.getCodecForType("dxos.halo.credentials.Credential");
@@ -1211,7 +1213,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     this._remoteLength.clear();
   }
   async addFeed(feed) {
-    import_log3.log.info("addFeed", {
+    (0, import_log3.log)("addFeed", {
       key: feed.key,
       connected: this._connected,
       hasConnectionCtx: !!this._connectionCtx
@@ -1248,7 +1250,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
   }
   async _sendMessage(message) {
     if (!this._connectionCtx) {
-      import_log3.log.info("message dropped because connection was disposed", void 0, {
+      (0, import_log3.log)("message dropped because connection was disposed", void 0, {
         F: __dxlog_file5,
         L: 146,
         S: this,
@@ -1257,7 +1259,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
       return;
     }
     if (message.type === "data") {
-      import_log3.log.info("sending blocks", {
+      (0, import_log3.log)("sending blocks", {
         feedKey: message.feedKey,
         blocks: message.blocks.map((b) => b.index)
       }, {
@@ -1332,7 +1334,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
               feedKey
             };
             if (message.length > feed.length) {
-              import_log3.log.info("requesting missing blocks", logMeta, {
+              (0, import_log3.log)("requesting missing blocks", logMeta, {
                 F: __dxlog_file5,
                 L: 194,
                 S: this,
@@ -1347,7 +1349,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
                 }
               });
             } else if (message.length < feed.length) {
-              import_log3.log.info("pushing blocks to remote", logMeta, {
+              (0, import_log3.log)("pushing blocks to remote", logMeta, {
                 F: __dxlog_file5,
                 L: 202,
                 S: this,
@@ -1363,7 +1365,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
           }
         }
         case "data": {
-          import_log3.log.info("received data", {
+          (0, import_log3.log)("received data", {
             feed: message.feedKey,
             blocks: message.blocks.map((b) => b.index)
           }, {
@@ -1402,7 +1404,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     });
   }
   async _pushBlocks(feed, from, to) {
-    import_log3.log.info("pushing blocks", {
+    (0, import_log3.log)("pushing blocks", {
       feed: feed.key.toHex(),
       from,
       to
@@ -1441,7 +1443,7 @@ var EdgeFeedReplicator = class extends import_context3.Resource {
     this._remoteLength.set(feed.key, to);
   }
   async _integrateBlocks(feed, blocks) {
-    import_log3.log.info("integrating blocks", {
+    (0, import_log3.log)("integrating blocks", {
       feed: feed.key.toHex(),
       blocks: blocks.length
     }, {
@@ -2664,7 +2666,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     });
     dataSpace.postOpen.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === import_metadata.EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === import_metadata.EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
       } else if (this._echoEdgeReplicator) {
         (0, import_log8.log)("not connecting EchoEdgeReplicator because of EdgeReplicationSetting", {
@@ -2679,7 +2681,7 @@ var DataSpaceManager = class extends import_context7.Resource {
     });
     dataSpace.preClose.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === import_metadata.EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === import_metadata.EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
       }
     });
@@ -2856,7 +2858,7 @@ var SpacesServiceImpl = class {
     const credentials = await (0, import_credentials13.createAdmissionCredentials)(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     (0, import_invariant8.invariant)(credentials[0].credential, void 0, {
       F: __dxlog_file10,
-      L: 106,
+      L: 111,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2866,7 +2868,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     (0, import_invariant8.invariant)((0, import_credentials13.getCredentialAssertion)(spaceMemberCredential)["@type"] === "dxos.halo.credentials.SpaceMember", void 0, {
       F: __dxlog_file10,
-      L: 108,
+      L: 113,
       S: this,
       A: [
         "getCredentialAssertion(spaceMemberCredential)['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2879,12 +2881,12 @@ var SpacesServiceImpl = class {
     return new import_stream7.Stream(({ next, ctx }) => {
       const scheduler = new import_async12.UpdateScheduler(ctx, async () => {
         const dataSpaceManager = await this._getDataSpaceManager();
-        const spaces = Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space));
+        const spaces = await Promise.all(Array.from(dataSpaceManager.spaces.values()).map((space) => this._serializeSpace(space)));
         (0, import_log9.log)("update", () => ({
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file10,
-          L: 119,
+          L: 126,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2976,7 +2978,7 @@ var SpacesServiceImpl = class {
       } else {
         (0, import_invariant8.invariant)(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file10,
-          L: 217,
+          L: 224,
           S: this,
           A: [
             "!credential.id",
@@ -2985,7 +2987,7 @@ var SpacesServiceImpl = class {
         });
         (0, import_invariant8.invariant)(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file10,
-          L: 218,
+          L: 225,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -2995,7 +2997,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         (0, import_invariant8.invariant)(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file10,
-          L: 220,
+          L: 227,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -3045,7 +3047,7 @@ var SpacesServiceImpl = class {
     const assertion = (0, import_credentials13.getCredentialAssertion)(credential);
     (0, import_invariant8.invariant)(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file10,
-      L: 254,
+      L: 261,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -3055,7 +3057,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     (0, import_invariant8.invariant)(myIdentity && credential.subject.id.equals(myIdentity.identityKey), void 0, {
       F: __dxlog_file10,
-      L: 256,
+      L: 263,
       S: this,
       A: [
         "myIdentity && credential.subject.id.equals(myIdentity.identityKey)",
@@ -3076,10 +3078,10 @@ var SpacesServiceImpl = class {
       });
     }
     return {
-      space: this._serializeSpace(dataSpace)
+      space: await this._serializeSpace(dataSpace)
     };
   }
-  _serializeSpace(space) {
+  async _serializeSpace(space) {
     return {
       id: space.id,
       spaceKey: space.key,
@@ -3099,7 +3101,7 @@ var SpacesServiceImpl = class {
         totalDataTimeframe: void 0,
         spaceRootUrl: space.databaseRoot?.url
       },
-      members: Array.from(space.inner.spaceState.members.values()).map((member) => {
+      members: await Promise.all(Array.from(space.inner.spaceState.members.values()).map(async (member) => {
         const peers = space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key));
         const isMe = this._identityManager.identity?.identityKey.equals(member.key);
         if (isMe) {
@@ -3107,6 +3109,7 @@ var SpacesServiceImpl = class {
         }
         return {
           identity: {
+            did: await (0, import_credentials13.createDidFromIdentityKey)(member.key),
             identityKey: member.key,
             profile: member.profile ?? {}
           },
@@ -3114,7 +3117,7 @@ var SpacesServiceImpl = class {
           presence: peers.length > 0 ? import_services7.SpaceMember.PresenceState.ONLINE : import_services7.SpaceMember.PresenceState.OFFLINE,
           peerStates: peers
         };
-      }),
+      })),
       creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
       metrics: space.metrics,
@@ -3157,13 +3160,14 @@ var Identity = class {
     this.space = params.space;
     this._signer = params.signer;
     this._presence = params.presence;
+    this.did = params.did;
     this.identityKey = params.identityKey;
     this.deviceKey = params.deviceKey;
     import_log6.log.trace("dxos.halo.device", {
       deviceKey: params.deviceKey
     }, {
       F: __dxlog_file11,
-      L: 79,
+      L: 82,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3265,7 +3269,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     (0, import_invariant6.invariant)(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file11,
-      L: 195,
+      L: 198,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -3309,7 +3313,7 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file11,
-      L: 220,
+      L: 223,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3392,7 +3396,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file12,
-      L: 121,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3401,7 +3405,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file12,
-      L: 124,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3414,7 +3418,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file12,
-        L: 129,
+        L: 124,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3424,7 +3428,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file12,
-      L: 136,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3432,13 +3436,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",
@@ -3447,7 +3451,7 @@ var IdentityManager = class {
     });
     (0, import_log10.log)("creating identity...", void 0, {
       F: __dxlog_file12,
-      L: 146,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3465,13 +3469,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",
@@ -3480,7 +3484,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",
@@ -3519,7 +3523,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file12,
-      L: 204,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3530,7 +3534,7 @@ var IdentityManager = class {
       profile: identity.profileDocument
     }, {
       F: __dxlog_file12,
-      L: 210,
+      L: 205,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3567,13 +3571,13 @@ var IdentityManager = class {
       params
     }, {
       F: __dxlog_file12,
-      L: 249,
+      L: 244,
       S: this,
       C: (f, a) => f(...a)
     });
     (0, import_invariant9.invariant)(!this._identity, "Identity already exists.", {
       F: __dxlog_file12,
-      L: 250,
+      L: 245,
       S: this,
       A: [
         "!this._identity",
@@ -3594,7 +3598,7 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new import_context8.Context(void 0, {
       F: __dxlog_file12,
-      L: 264
+      L: 259
     }));
     return {
       identity,
@@ -3613,7 +3617,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file12,
-      L: 278,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3627,7 +3631,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file12,
-      L: 289,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3638,7 +3642,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     (0, import_invariant9.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file12,
-      L: 296,
+      L: 291,
       S: this,
       A: [
         "this._identity",
@@ -3669,7 +3673,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     (0, import_invariant9.invariant)(this._identity, "Identity not initialized.", {
       F: __dxlog_file12,
-      L: 313,
+      L: 308,
       S: this,
       A: [
         "this._identity",
@@ -3702,48 +3706,10 @@ var IdentityManager = class {
       profile
     };
   }
-  async createRecoveryPhrase() {
-    const identity = this._identity;
-    (0, import_invariant9.invariant)(identity, void 0, {
-      F: __dxlog_file12,
-      L: 340,
-      S: this,
-      A: [
-        "identity",
-        ""
-      ]
-    });
-    const seedphrase = (0, import_credentials14.generateSeedPhrase)();
-    const keypair = (0, import_credentials14.keyPairFromSeedPhrase)(seedphrase);
-    const recoveryKey = import_keys9.PublicKey.from(keypair.publicKey);
-    const identityKey = identity.identityKey;
-    const credential = await identity.getIdentityCredentialSigner().createCredential({
-      subject: identityKey,
-      assertion: {
-        "@type": "dxos.halo.credentials.IdentityRecovery",
-        recoveryKey,
-        identityKey
-      }
-    });
-    const receipt = await identity.controlPipeline.writer.write({
-      credential: {
-        credential
-      }
-    });
-    await identity.controlPipeline.state.waitUntilTimeframe(new import_timeframe4.Timeframe([
-      [
-        receipt.feedKey,
-        receipt.seq
-      ]
-    ]));
-    return {
-      seedphrase
-    };
-  }
   async _constructIdentity(identityRecord) {
     (0, import_invariant9.invariant)(!this._identity, void 0, {
       F: __dxlog_file12,
-      L: 362,
+      L: 334,
       S: this,
       A: [
         "!this._identity",
@@ -3754,7 +3720,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file12,
-      L: 363,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3769,7 +3735,7 @@ var IdentityManager = class {
     });
     (0, import_invariant9.invariant)(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file12,
-      L: 376,
+      L: 348,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -3781,7 +3747,7 @@ var IdentityManager = class {
     });
     (0, import_invariant9.invariant)(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file12,
-      L: 380,
+      L: 352,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -3805,10 +3771,12 @@ var IdentityManager = class {
     });
     await space.setControlFeed(controlFeed);
     await space.setDataFeed(dataFeed);
+    const did = await (0, import_credentials14.createDidFromIdentityKey)(identityRecord.identityKey);
     const identity = new Identity({
       space,
       presence,
       signer: this._keyring,
+      did,
       identityKey: identityRecord.identityKey,
       deviceKey: identityRecord.deviceKey,
       edgeConnection: this._edgeConnection,
@@ -3818,7 +3786,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file12,
-      L: 409,
+      L: 383,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3843,7 +3811,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         import_log10.log.warn("auth failure", void 0, {
           F: __dxlog_file12,
-          L: 434,
+          L: 408,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3896,7 +3864,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
     const identity = this._identityManager.identity;
     (0, import_invariant10.invariant)(identity, void 0, {
       F: __dxlog_file13,
-      L: 60,
+      L: 61,
       S: this,
       A: [
         "identity",
@@ -3919,6 +3887,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
       return void 0;
     }
     return {
+      did: this._identityManager.identity.did,
       identityKey: this._identityManager.identity.identityKey,
       spaceKey: this._identityManager.identity.space.key,
       profile: this._identityManager.identity.profileDocument
@@ -3927,7 +3896,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
   async updateProfile(profile) {
     (0, import_invariant10.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 86,
+      L: 88,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -3938,18 +3907,29 @@ var IdentityServiceImpl = class extends import_context9.Resource {
     await this._onProfileUpdate?.(this._identityManager.identity.profileDocument);
     return this._getIdentity();
   }
-  async createRecoveryPhrase() {
-    return this._recoveryManager.createRecoveryPhrase();
+  async createRecoveryCredential(request) {
+    return this._recoveryManager.createRecoveryCredential(request);
+  }
+  async requestRecoveryChallenge() {
+    return this._recoveryManager.requestRecoveryChallenge();
   }
   async recoverIdentity(request) {
-    await this._recoveryManager.recoverIdentity(request);
+    if (request.recoveryCode) {
+      await this._recoveryManager.recoverIdentity({
+        recoveryCode: request.recoveryCode
+      });
+    } else if (request.external) {
+      await this._recoveryManager.recoverIdentityWithExternalSignature(request.external);
+    } else {
+      throw new Error("Invalid request.");
+    }
     return this._getIdentity();
   }
   // TODO(burdon): Rename createPresentation?
   async signPresentation({ presentation, nonce }) {
     (0, import_invariant10.invariant)(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 103,
+      L: 116,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -3968,7 +3948,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
     const identity = this._identityManager.identity;
     (0, import_invariant10.invariant)(identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 117,
+      L: 130,
       S: this,
       A: [
         "identity",
@@ -4006,7 +3986,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
             duplicate: space.id
           }, {
             F: __dxlog_file13,
-            L: 151,
+            L: 164,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -4020,7 +4000,7 @@ var IdentityServiceImpl = class extends import_context9.Resource {
     }, (err) => {
       import_log11.log.catch(err, void 0, {
         F: __dxlog_file13,
-        L: 162,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7082,6 +7062,18 @@ var EdgeAgentManager = class extends import_context15.Resource {
       haloSpaceKey: this._identity.haloSpaceKey.toHex()
     });
     const deviceKey = import_keys15.PublicKey.fromHex(response.deviceKey);
+    if (await this._identity.authorizedDeviceKeys.has(deviceKey)) {
+      import_log21.log.info("agent was already added to HALO, ignoring response", {
+        response
+      }, {
+        F: __dxlog_file25,
+        L: 67,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._updateStatus(import_protocols14.EdgeAgentStatus.ACTIVE, deviceKey);
+      return;
+    }
     await this._identity.admitDevice({
       deviceKey,
       controlFeedKey: import_keys15.PublicKey.fromHex(response.feedKey),
@@ -7090,7 +7082,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
     });
     (0, import_log21.log)("agent created", response, {
       F: __dxlog_file25,
-      L: 73,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7102,7 +7094,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
       isEnabled
     }, {
       F: __dxlog_file25,
-      L: 81,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7135,7 +7127,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
   async _fetchAgentStatus() {
     (0, import_invariant20.invariant)(this._edgeHttpClient, void 0, {
       F: __dxlog_file25,
-      L: 115,
+      L: 121,
       S: this,
       A: [
         "this._edgeHttpClient",
@@ -7145,7 +7137,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
     try {
       (0, import_log21.log)("fetching agent status", void 0, {
         F: __dxlog_file25,
-        L: 117,
+        L: 123,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7164,7 +7156,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
             err
           }, {
             F: __dxlog_file25,
-            L: 127,
+            L: 133,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7177,7 +7169,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
         retryAfterMs
       }, {
         F: __dxlog_file25,
-        L: 132,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7213,7 +7205,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
         spaceId: space.id
       }, {
         F: __dxlog_file25,
-        L: 159,
+        L: 165,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7233,7 +7225,7 @@ var EdgeAgentManager = class extends import_context15.Resource {
       status
     }, {
       F: __dxlog_file25,
-      L: 175,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7306,27 +7298,41 @@ var EdgeIdentityRecoveryManager = class {
     this._identityProvider = _identityProvider;
     this._acceptRecoveredIdentity = _acceptRecoveredIdentity;
   }
-  async createRecoveryPhrase() {
+  async createRecoveryCredential({ recoveryKey, algorithm }) {
     const identity = this._identityProvider();
     (0, import_invariant22.invariant)(identity, void 0, {
       F: __dxlog_file26,
-      L: 29,
+      L: 37,
       S: this,
       A: [
         "identity",
         ""
       ]
     });
-    const seedphrase = (0, import_credentials23.generateSeedPhrase)();
-    const keypair = (0, import_credentials23.keyPairFromSeedPhrase)(seedphrase);
-    const recoveryKey = import_keys17.PublicKey.from(keypair.publicKey);
+    let recoveryCode;
+    if (!recoveryKey) {
+      recoveryCode = (0, import_credentials23.generateSeedPhrase)();
+      const keypair = (0, import_credentials23.keyPairFromSeedPhrase)(recoveryCode);
+      recoveryKey = import_keys17.PublicKey.from(keypair.publicKey);
+      algorithm = "ED25519";
+    }
+    (0, import_invariant22.invariant)(algorithm, "Algorithm is required.", {
+      F: __dxlog_file26,
+      L: 47,
+      S: this,
+      A: [
+        "algorithm",
+        "'Algorithm is required.'"
+      ]
+    });
     const identityKey = identity.identityKey;
     const credential = await identity.getIdentityCredentialSigner().createCredential({
       subject: identityKey,
       assertion: {
         "@type": "dxos.halo.credentials.IdentityRecovery",
         recoveryKey,
-        identityKey
+        identityKey,
+        algorithm
       }
     });
     const receipt = await identity.controlPipeline.writer.write({
@@ -7341,20 +7347,81 @@ var EdgeIdentityRecoveryManager = class {
       ]
     ]));
     return {
-      seedphrase
+      recoveryCode
+    };
+  }
+  async requestRecoveryChallenge() {
+    (0, import_invariant22.invariant)(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
+      L: 66,
+      S: this,
+      A: [
+        "this._edgeClient",
+        "'Not connected to EDGE.'"
+      ]
+    });
+    const deviceKey = await this._keyring.createKey();
+    const controlFeedKey = await this._keyring.createKey();
+    const request = {
+      deviceKey: deviceKey.toHex(),
+      controlFeedKey: controlFeedKey.toHex()
+    };
+    try {
+      await this._edgeClient.recoverIdentity(request);
+      throw new Error("No challenge received.");
+    } catch (error) {
+      if (!(error instanceof import_protocols17.EdgeAuthChallengeError)) {
+        throw error;
+      }
+      return {
+        deviceKey,
+        controlFeedKey,
+        challenge: error.challenge
+      };
+    }
+  }
+  async recoverIdentityWithExternalSignature({ identityDid, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData }) {
+    (0, import_invariant22.invariant)(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
+      L: 98,
+      S: this,
+      A: [
+        "this._edgeClient",
+        "'Not connected to EDGE.'"
+      ]
+    });
+    const request = {
+      identityDid,
+      deviceKey: deviceKey.toHex(),
+      controlFeedKey: controlFeedKey.toHex(),
+      signature: clientDataJson && authenticatorData ? {
+        signature: Buffer.from(signature).toString("base64"),
+        clientDataJson: Buffer.from(clientDataJson).toString("base64"),
+        authenticatorData: Buffer.from(authenticatorData).toString("base64")
+      } : Buffer.from(signature).toString("base64")
     };
+    const response = await this._edgeClient.recoverIdentity(request);
+    await this._acceptRecoveredIdentity({
+      authorizedDeviceCredential: decodeCredential(response.deviceAuthCredential),
+      haloGenesisFeedKey: import_keys17.PublicKey.fromHex(response.genesisFeedKey),
+      haloSpaceKey: import_keys17.PublicKey.fromHex(response.haloSpaceKey),
+      identityKey: import_keys17.PublicKey.fromHex(response.identityKey),
+      deviceKey,
+      controlFeedKey,
+      dataFeedKey: await this._keyring.createKey()
+    });
   }
-  async recoverIdentity(args) {
+  async recoverIdentity({ recoveryCode }) {
     (0, import_invariant22.invariant)(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file26,
-      L: 51,
+      L: 128,
       S: this,
       A: [
         "this._edgeClient",
         "'Not connected to EDGE.'"
       ]
     });
-    const recoveryKeypair = (0, import_credentials23.keyPairFromSeedPhrase)(args.seedphrase);
+    const recoveryKeypair = (0, import_credentials23.keyPairFromSeedPhrase)(recoveryCode);
     const recoveryKey = import_keys17.PublicKey.from(recoveryKeypair.publicKey);
     const deviceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
@@ -7378,7 +7445,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     import_log23.log.info("recovering identity", response, {
       F: __dxlog_file26,
-      L: 77,
+      L: 154,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8907,4 +8974,4 @@ ClientServicesHost = _ts_decorate11([
   subscribeToSpaces,
   subscribeToSwarmInfo
 });
-//# sourceMappingURL=chunk-WFDMSV4I.cjs.map
+//# sourceMappingURL=chunk-K6H3KWWB.cjs.map