@dxos/client-services 0.7.5-main.9d2a38b → 0.7.5-main.e94eead

package/dist/lib/node-esm/{chunk-RSOLUJE6.mjs → chunk-YAOQ7FPR.mjs}

@@ -390,14 +390,14 @@ var DevtoolsServiceImpl = class {
 // packages/sdk/client-services/src/packlets/diagnostics/diagnostics.ts
 import { asyncTimeout } from "@dxos/async";
 import { getFirstStreamValue } from "@dxos/codec-protobuf";
-import { credentialTypeFilter } from "@dxos/credentials";
+import { createDidFromIdentityKey, credentialTypeFilter } from "@dxos/credentials";
 import { invariant } from "@dxos/invariant";
 import { STORAGE_VERSION } from "@dxos/protocols";
 import { SpaceMember } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR } from "@dxos/tracing";
 
 // packages/sdk/client-services/src/version.ts
-var DXOS_VERSION = "0.7.5-main.9d2a38b";
+var DXOS_VERSION = "0.7.5-main.e94eead";
 
 // packages/sdk/client-services/src/packlets/services/platform.ts
 import { Platform } from "@dxos/protocols/proto/dxos/client/services";
@@ -466,6 +466,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
@@ -504,16 +505,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 createDidFromIdentityKey(member.key),
         identityKey: member.key,
         profile: {
           displayName: member.assertion.profile?.displayName
         }
       },
       presence: space.presence.getPeersOnline().filter(({ identityKey }) => identityKey.equals(member.key)).length > 0 ? SpaceMember.PresenceState.ONLINE : SpaceMember.PresenceState.OFFLINE
-    })),
+    }))),
     pipeline: {
       // TODO(burdon): Pick properties from credentials if needed.
       currentEpoch: space.automergeSpaceState.lastEpoch,
@@ -569,7 +571,7 @@ import { ClientServicesProviderResource } from "@dxos/client-protocol";
 import { ConfigResource } from "@dxos/config";
 import { GetDiagnosticsRequest } from "@dxos/protocols/proto/dxos/client/services";
 import { TRACE_PROCESSOR as TRACE_PROCESSOR2 } from "@dxos/tracing";
-import { jsonKeyReplacer, nonNullable } from "@dxos/util";
+import { jsonKeyReplacer, isNonNullable } from "@dxos/util";
 var GET_DIAGNOSTICS_RPC_TIMEOUT = 1e4;
 var DiagnosticsCollector = class {
   static {
@@ -602,7 +604,7 @@ var findSystemServiceProvider = () => {
 };
 var findConfigs = () => {
   const configs = TRACE_PROCESSOR2.findResourcesByAnnotation(ConfigResource);
-  return configs.map((r) => r.instance.deref()).filter(nonNullable);
+  return configs.map((r) => r.instance.deref()).filter(isNonNullable);
 };
 
 // packages/sdk/client-services/src/packlets/identity/authenticator.ts
@@ -913,7 +915,7 @@ var EdgeFeedReplicator = class extends Resource {
     this._remoteLength.clear();
   }
   async addFeed(feed) {
-    log3.info("addFeed", {
+    log3("addFeed", {
       key: feed.key,
       connected: this._connected,
       hasConnectionCtx: !!this._connectionCtx
@@ -950,7 +952,7 @@ var EdgeFeedReplicator = class extends Resource {
   }
   async _sendMessage(message) {
     if (!this._connectionCtx) {
-      log3.info("message dropped because connection was disposed", void 0, {
+      log3("message dropped because connection was disposed", void 0, {
         F: __dxlog_file5,
         L: 146,
         S: this,
@@ -959,7 +961,7 @@ var EdgeFeedReplicator = class extends Resource {
       return;
     }
     if (message.type === "data") {
-      log3.info("sending blocks", {
+      log3("sending blocks", {
         feedKey: message.feedKey,
         blocks: message.blocks.map((b) => b.index)
       }, {
@@ -1034,7 +1036,7 @@ var EdgeFeedReplicator = class extends Resource {
               feedKey
             };
             if (message.length > feed.length) {
-              log3.info("requesting missing blocks", logMeta, {
+              log3("requesting missing blocks", logMeta, {
                 F: __dxlog_file5,
                 L: 194,
                 S: this,
@@ -1049,7 +1051,7 @@ var EdgeFeedReplicator = class extends Resource {
                 }
               });
             } else if (message.length < feed.length) {
-              log3.info("pushing blocks to remote", logMeta, {
+              log3("pushing blocks to remote", logMeta, {
                 F: __dxlog_file5,
                 L: 202,
                 S: this,
@@ -1065,7 +1067,7 @@ var EdgeFeedReplicator = class extends Resource {
           }
         }
         case "data": {
-          log3.info("received data", {
+          log3("received data", {
             feed: message.feedKey,
             blocks: message.blocks.map((b) => b.index)
           }, {
@@ -1104,7 +1106,7 @@ var EdgeFeedReplicator = class extends Resource {
     });
   }
   async _pushBlocks(feed, from, to) {
-    log3.info("pushing blocks", {
+    log3("pushing blocks", {
       feed: feed.key.toHex(),
       from,
       to
@@ -1143,7 +1145,7 @@ var EdgeFeedReplicator = class extends Resource {
     this._remoteLength.set(feed.key, to);
   }
   async _integrateBlocks(feed, blocks) {
-    log3.info("integrating blocks", {
+    log3("integrating blocks", {
       feed: feed.key.toHex(),
       blocks: blocks.length
     }, {
@@ -2450,7 +2452,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     dataSpace.postOpen.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.connectToSpace(dataSpace.id);
       } else if (this._echoEdgeReplicator) {
         log6("not connecting EchoEdgeReplicator because of EdgeReplicationSetting", {
@@ -2465,7 +2467,7 @@ var DataSpaceManager = class extends Resource4 {
     });
     dataSpace.preClose.append(async () => {
       const setting = dataSpace.getEdgeReplicationSetting();
-      if (setting === EdgeReplicationSetting.ENABLED) {
+      if (!setting || setting === EdgeReplicationSetting.ENABLED) {
         await this._echoEdgeReplicator?.disconnectFromSpace(dataSpace.id);
       }
     });
@@ -2570,7 +2572,7 @@ var DataSpaceManager = class extends Resource4 {
         guestKeypair: invitation.guestKey ? {
           publicKey: invitation.guestKey
         } : void 0,
-        lifetime: invitation.expiresOn ? invitation.expiresOn.getTime() - Date.now() : void 0,
+        lifetime: invitation.expiresOn ? (invitation.expiresOn.getTime() - Date.now()) / 1e3 : void 0,
         multiUse: invitation.multiUse,
         delegationCredentialId: credentialId,
         persistent: false
@@ -2598,7 +2600,7 @@ DataSpaceManager = _ts_decorate3([
 // packages/sdk/client-services/src/packlets/spaces/spaces-service.ts
 import { EventSubscriptions as EventSubscriptions2, UpdateScheduler, scheduleTask as scheduleTask3 } from "@dxos/async";
 import { Stream as Stream7 } from "@dxos/codec-protobuf/stream";
-import { createAdmissionCredentials as createAdmissionCredentials2, getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
+import { createAdmissionCredentials as createAdmissionCredentials2, createDidFromIdentityKey as createDidFromIdentityKey2, getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { raise } from "@dxos/debug";
 import { writeMessages as writeMessages2 } from "@dxos/feed-store";
 import { invariant as invariant6 } from "@dxos/invariant";
@@ -2654,7 +2656,7 @@ var SpacesServiceImpl = class {
     const credentials = await createAdmissionCredentials2(identity.getIdentityCredentialSigner(), request.memberKey, space.key, space.genesisFeedKey, request.newRole, space.spaceState.membershipChainHeads);
     invariant6(credentials[0].credential, void 0, {
       F: __dxlog_file10,
-      L: 106,
+      L: 111,
       S: this,
       A: [
         "credentials[0].credential",
@@ -2664,7 +2666,7 @@ var SpacesServiceImpl = class {
     const spaceMemberCredential = credentials[0].credential.credential;
     invariant6(getCredentialAssertion3(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'",
@@ -2677,12 +2679,12 @@ var SpacesServiceImpl = class {
     return new Stream7(({ next, ctx }) => {
       const scheduler = new 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)));
         log7("update", () => ({
           ids: spaces.map((space) => space.id)
         }), {
           F: __dxlog_file10,
-          L: 119,
+          L: 126,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -2774,7 +2776,7 @@ var SpacesServiceImpl = class {
       } else {
         invariant6(!credential.id, "Id on unsigned credentials is not allowed", {
           F: __dxlog_file10,
-          L: 217,
+          L: 224,
           S: this,
           A: [
             "!credential.id",
@@ -2783,7 +2785,7 @@ var SpacesServiceImpl = class {
         });
         invariant6(this._identityManager.identity, "Identity is not available", {
           F: __dxlog_file10,
-          L: 218,
+          L: 225,
           S: this,
           A: [
             "this._identityManager.identity",
@@ -2793,7 +2795,7 @@ var SpacesServiceImpl = class {
         const signer = this._identityManager.identity.getIdentityCredentialSigner();
         invariant6(credential.issuer.equals(signer.getIssuer()), void 0, {
           F: __dxlog_file10,
-          L: 220,
+          L: 227,
           S: this,
           A: [
             "credential.issuer.equals(signer.getIssuer())",
@@ -2843,7 +2845,7 @@ var SpacesServiceImpl = class {
     const assertion = getCredentialAssertion3(credential);
     invariant6(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file10,
-      L: 254,
+      L: 261,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -2853,7 +2855,7 @@ var SpacesServiceImpl = class {
     const myIdentity = this._identityManager.identity;
     invariant6(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)",
@@ -2874,10 +2876,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,
@@ -2897,7 +2899,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) {
@@ -2905,6 +2907,7 @@ var SpacesServiceImpl = class {
         }
         return {
           identity: {
+            did: await createDidFromIdentityKey2(member.key),
             identityKey: member.key,
             profile: member.profile ?? {}
           },
@@ -2912,7 +2915,7 @@ var SpacesServiceImpl = class {
           presence: peers.length > 0 ? SpaceMember4.PresenceState.ONLINE : SpaceMember4.PresenceState.OFFLINE,
           peerStates: peers
         };
-      }),
+      })),
       creator: space.inner.spaceState.creator?.key,
       cache: space.cache,
       metrics: space.metrics,
@@ -2957,13 +2960,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;
     log8.trace("dxos.halo.device", {
       deviceKey: params.deviceKey
     }, {
       F: __dxlog_file11,
-      L: 79,
+      L: 82,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3065,7 +3069,7 @@ var Identity = class {
   getIdentityCredentialSigner() {
     invariant7(this._deviceStateMachine.deviceCredentialChain, "Device credential chain is not ready.", {
       F: __dxlog_file11,
-      L: 195,
+      L: 198,
       S: this,
       A: [
         "this._deviceStateMachine.deviceCredentialChain",
@@ -3109,7 +3113,7 @@ var Identity = class {
       dataFeedKey
     }, {
       F: __dxlog_file11,
-      L: 220,
+      L: 223,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3166,7 +3170,7 @@ Identity = _ts_decorate4([
 import platform from "platform";
 import { Event as Event6 } from "@dxos/async";
 import { Context as Context4 } from "@dxos/context";
-import { createCredentialSignerWithKey as createCredentialSignerWithKey2, CredentialGenerator, generateSeedPhrase, keyPairFromSeedPhrase } from "@dxos/credentials";
+import { createCredentialSignerWithKey as createCredentialSignerWithKey2, createDidFromIdentityKey as createDidFromIdentityKey3, CredentialGenerator } from "@dxos/credentials";
 import { invariant as invariant8 } from "@dxos/invariant";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { log as log9 } from "@dxos/log";
@@ -3208,7 +3212,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file12,
-      L: 121,
+      L: 116,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3217,7 +3221,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file12,
-      L: 124,
+      L: 119,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3230,7 +3234,7 @@ var IdentityManager = class {
         displayName: this._identity.profileDocument?.displayName
       }, {
         F: __dxlog_file12,
-        L: 129,
+        L: 124,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -3240,7 +3244,7 @@ var IdentityManager = class {
       id: traceId
     }), {
       F: __dxlog_file12,
-      L: 136,
+      L: 131,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3248,13 +3252,13 @@ var IdentityManager = class {
   async close() {
     await this._identity?.close(new Context4(void 0, {
       F: __dxlog_file12,
-      L: 140
+      L: 135
     }));
   }
   async createIdentity({ displayName, deviceProfile } = {}) {
     invariant8(!this._identity, "Identity already exists.", {
       F: __dxlog_file12,
-      L: 145,
+      L: 140,
       S: this,
       A: [
         "!this._identity",
@@ -3263,7 +3267,7 @@ var IdentityManager = class {
     });
     log9("creating identity...", void 0, {
       F: __dxlog_file12,
-      L: 146,
+      L: 141,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3281,13 +3285,13 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new Context4(void 0, {
       F: __dxlog_file12,
-      L: 161
+      L: 156
     }));
     {
       const generator = new CredentialGenerator(this._keyring, identityRecord.identityKey, identityRecord.deviceKey);
       invariant8(identityRecord.haloSpace.genesisFeedKey, "Genesis feed key is required.", {
         F: __dxlog_file12,
-        L: 165,
+        L: 160,
         S: this,
         A: [
           "identityRecord.haloSpace.genesisFeedKey",
@@ -3296,7 +3300,7 @@ var IdentityManager = class {
       });
       invariant8(identityRecord.haloSpace.dataFeedKey, "Data feed key is required.", {
         F: __dxlog_file12,
-        L: 166,
+        L: 161,
         S: this,
         A: [
           "identityRecord.haloSpace.dataFeedKey",
@@ -3335,7 +3339,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file12,
-      L: 204,
+      L: 199,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3346,7 +3350,7 @@ var IdentityManager = class {
       profile: identity.profileDocument
     }, {
       F: __dxlog_file12,
-      L: 210,
+      L: 205,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3383,13 +3387,13 @@ var IdentityManager = class {
       params
     }, {
       F: __dxlog_file12,
-      L: 249,
+      L: 244,
       S: this,
       C: (f, a) => f(...a)
     });
     invariant8(!this._identity, "Identity already exists.", {
       F: __dxlog_file12,
-      L: 250,
+      L: 245,
       S: this,
       A: [
         "!this._identity",
@@ -3410,7 +3414,7 @@ var IdentityManager = class {
     const identity = await this._constructIdentity(identityRecord);
     await identity.open(new Context4(void 0, {
       F: __dxlog_file12,
-      L: 264
+      L: 259
     }));
     return {
       identity,
@@ -3429,7 +3433,7 @@ var IdentityManager = class {
       displayName: this._identity.profileDocument?.displayName
     }, {
       F: __dxlog_file12,
-      L: 278,
+      L: 273,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3443,7 +3447,7 @@ var IdentityManager = class {
       deviceKey: identity.deviceKey
     }, {
       F: __dxlog_file12,
-      L: 289,
+      L: 284,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3454,7 +3458,7 @@ var IdentityManager = class {
   async updateProfile(profile) {
     invariant8(this._identity, "Identity not initialized.", {
       F: __dxlog_file12,
-      L: 296,
+      L: 291,
       S: this,
       A: [
         "this._identity",
@@ -3485,7 +3489,7 @@ var IdentityManager = class {
   async updateDeviceProfile(profile) {
     invariant8(this._identity, "Identity not initialized.", {
       F: __dxlog_file12,
-      L: 313,
+      L: 308,
       S: this,
       A: [
         "this._identity",
@@ -3518,48 +3522,10 @@ var IdentityManager = class {
       profile
     };
   }
-  async createRecoveryPhrase() {
-    const identity = this._identity;
-    invariant8(identity, void 0, {
-      F: __dxlog_file12,
-      L: 340,
-      S: this,
-      A: [
-        "identity",
-        ""
-      ]
-    });
-    const seedphrase = generateSeedPhrase();
-    const keypair = keyPairFromSeedPhrase(seedphrase);
-    const recoveryKey = PublicKey7.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 Timeframe3([
-      [
-        receipt.feedKey,
-        receipt.seq
-      ]
-    ]));
-    return {
-      seedphrase
-    };
-  }
   async _constructIdentity(identityRecord) {
     invariant8(!this._identity, void 0, {
       F: __dxlog_file12,
-      L: 362,
+      L: 334,
       S: this,
       A: [
         "!this._identity",
@@ -3570,7 +3536,7 @@ var IdentityManager = class {
       identityRecord
     }, {
       F: __dxlog_file12,
-      L: 363,
+      L: 335,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3585,7 +3551,7 @@ var IdentityManager = class {
     });
     invariant8(identityRecord.haloSpace.controlFeedKey, void 0, {
       F: __dxlog_file12,
-      L: 376,
+      L: 348,
       S: this,
       A: [
         "identityRecord.haloSpace.controlFeedKey",
@@ -3597,7 +3563,7 @@ var IdentityManager = class {
     });
     invariant8(identityRecord.haloSpace.dataFeedKey, void 0, {
       F: __dxlog_file12,
-      L: 380,
+      L: 352,
       S: this,
       A: [
         "identityRecord.haloSpace.dataFeedKey",
@@ -3621,10 +3587,12 @@ var IdentityManager = class {
     });
     await space.setControlFeed(controlFeed);
     await space.setDataFeed(dataFeed);
+    const did = await createDidFromIdentityKey3(identityRecord.identityKey);
     const identity = new Identity({
       space,
       presence,
       signer: this._keyring,
+      did,
       identityKey: identityRecord.identityKey,
       deviceKey: identityRecord.deviceKey,
       edgeConnection: this._edgeConnection,
@@ -3634,7 +3602,7 @@ var IdentityManager = class {
       identityKey: identityRecord.identityKey
     }, {
       F: __dxlog_file12,
-      L: 409,
+      L: 383,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -3659,7 +3627,7 @@ var IdentityManager = class {
       onAuthFailure: () => {
         log9.warn("auth failure", void 0, {
           F: __dxlog_file12,
-          L: 434,
+          L: 408,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -3722,7 +3690,7 @@ var IdentityServiceImpl = class extends Resource5 {
     const identity = this._identityManager.identity;
     invariant9(identity, void 0, {
       F: __dxlog_file13,
-      L: 60,
+      L: 61,
       S: this,
       A: [
         "identity",
@@ -3745,6 +3713,7 @@ var IdentityServiceImpl = class extends Resource5 {
       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
@@ -3753,7 +3722,7 @@ var IdentityServiceImpl = class extends Resource5 {
   async updateProfile(profile) {
     invariant9(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 86,
+      L: 88,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -3764,18 +3733,29 @@ var IdentityServiceImpl = class extends Resource5 {
     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 }) {
     invariant9(this._identityManager.identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 103,
+      L: 116,
       S: this,
       A: [
         "this._identityManager.identity",
@@ -3794,7 +3774,7 @@ var IdentityServiceImpl = class extends Resource5 {
     const identity = this._identityManager.identity;
     invariant9(identity, "Identity not initialized.", {
       F: __dxlog_file13,
-      L: 117,
+      L: 130,
       S: this,
       A: [
         "identity",
@@ -3832,7 +3812,7 @@ var IdentityServiceImpl = class extends Resource5 {
             duplicate: space.id
           }, {
             F: __dxlog_file13,
-            L: 151,
+            L: 164,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -3846,7 +3826,7 @@ var IdentityServiceImpl = class extends Resource5 {
     }, (err) => {
       log10.catch(err, void 0, {
         F: __dxlog_file13,
-        L: 162,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -4627,14 +4607,14 @@ var DeviceInvitationProtocol = class {
 
 // packages/sdk/client-services/src/packlets/invitations/invitations-handler.ts
 import { scheduleTask as scheduleTask7, TimeoutError as TimeoutError2 } from "@dxos/async";
-import { INVITATION_TIMEOUT } from "@dxos/client-protocol";
+import { INVITATION_TIMEOUT, getExpirationTime } from "@dxos/client-protocol";
 import { ContextDisposedError as ContextDisposedError3 } from "@dxos/context";
 import { createKeyPair, sign as sign2 } from "@dxos/crypto";
 import { invariant as invariant15 } from "@dxos/invariant";
 import { PublicKey as PublicKey11 } from "@dxos/keys";
 import { log as log17 } from "@dxos/log";
 import { createTeleportProtocolFactory } from "@dxos/network-manager";
-import { InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace7 } from "@dxos/protocols";
+import { InvalidInvitationError, InvalidInvitationExtensionRoleError as InvalidInvitationExtensionRoleError3, trace as trace7 } from "@dxos/protocols";
 import { Invitation as Invitation7 } from "@dxos/protocols/proto/dxos/client/services";
 import { AuthenticationResponse as AuthenticationResponse2 } from "@dxos/protocols/proto/dxos/halo/invitations";
 import { InvitationOptions as InvitationOptions4 } from "@dxos/protocols/proto/dxos/halo/invitations";
@@ -4657,6 +4637,12 @@ import { Invitation as Invitation3 } from "@dxos/protocols/proto/dxos/client/ser
 var stateToString = (state) => {
   return Object.entries(Invitation3.State).find(([key, val]) => val === state)?.[0] ?? "unknown";
 };
+var computeExpirationTime = (invitation) => {
+  if (!invitation.lifetime) {
+    return;
+  }
+  return new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime * 1e3);
+};
 var tryAcquireBeforeContextDisposed = async (ctx, mutex) => {
   let guard;
   return cancelWithContext3(ctx, (async () => {
@@ -5672,18 +5658,19 @@ var InvitationsHandler = class {
       });
       return extension;
     };
-    if (invitation.lifetime && invitation.created) {
-      if (invitation.created.getTime() + invitation.lifetime * 1e3 < Date.now()) {
+    const expiresOn = getExpirationTime(invitation);
+    if (expiresOn) {
+      if (expiresOn.getTime() < Date.now()) {
         log17.warn("invitation has already expired", void 0, {
           F: __dxlog_file21,
-          L: 193,
+          L: 194,
           S: this,
           C: (f, a) => f(...a)
         });
         guardedState.set(null, Invitation7.State.EXPIRED);
         void ctx.dispose().catch((err) => log17.catch(err, void 0, {
           F: __dxlog_file21,
-          L: 195,
+          L: 196,
           S: this,
           C: (f, a) => f(...a)
         }));
@@ -5694,7 +5681,7 @@ var InvitationsHandler = class {
         guardedState.set(null, Invitation7.State.EXPIRED);
         metrics.increment("dxos.invitation.expired");
         await ctx.dispose();
-      }, invitation.created.getTime() + invitation.lifetime * 1e3 - Date.now());
+      }, expiresOn.getTime() - Date.now());
     }
     let swarmConnection;
     scheduleTask7(ctx, async () => {
@@ -5710,7 +5697,7 @@ var InvitationsHandler = class {
       type: invitation.type
     }, {
       F: __dxlog_file21,
-      L: 226,
+      L: 227,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -5718,7 +5705,7 @@ var InvitationsHandler = class {
     if (deviceProfile) {
       invariant15(invitation.kind === Invitation7.Kind.DEVICE, "deviceProfile provided for non-device invitation", {
         F: __dxlog_file21,
-        L: 235,
+        L: 236,
         S: this,
         A: [
           "invitation.kind === Invitation.Kind.DEVICE",
@@ -5736,7 +5723,7 @@ var InvitationsHandler = class {
         triedPeers: triedPeersIds.size
       }, {
         F: __dxlog_file21,
-        L: 243,
+        L: 244,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -5763,7 +5750,7 @@ var InvitationsHandler = class {
               currentState: guardedState.current.state
             }, {
               F: __dxlog_file21,
-              L: 271,
+              L: 272,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5781,7 +5768,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 283,
+                L: 284,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5793,7 +5780,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 294,
+                L: 295,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5803,7 +5790,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 298,
+                L: 299,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5817,7 +5804,7 @@ var InvitationsHandler = class {
                 authMethod: introductionResponse.authMethod
               }, {
                 F: __dxlog_file21,
-                L: 306,
+                L: 307,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5839,7 +5826,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 336,
+                L: 337,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5852,7 +5839,7 @@ var InvitationsHandler = class {
                 ...protocol.toJSON()
               }, {
                 F: __dxlog_file21,
-                L: 350,
+                L: 351,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5865,7 +5852,7 @@ var InvitationsHandler = class {
                 id: traceId
               }), {
                 F: __dxlog_file21,
-                L: 359,
+                L: 360,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5875,7 +5862,7 @@ var InvitationsHandler = class {
                   ...protocol.toJSON()
                 }, {
                   F: __dxlog_file21,
-                  L: 362,
+                  L: 363,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5883,7 +5870,7 @@ var InvitationsHandler = class {
               } else {
                 log17.verbose("auth failed", err, {
                   F: __dxlog_file21,
-                  L: 365,
+                  L: 366,
                   S: this,
                   C: (f, a) => f(...a)
                 });
@@ -5895,7 +5882,7 @@ var InvitationsHandler = class {
                 error: err
               }), {
                 F: __dxlog_file21,
-                L: 369,
+                L: 370,
                 S: this,
                 C: (f, a) => f(...a)
               });
@@ -5911,7 +5898,7 @@ var InvitationsHandler = class {
               ...protocol.toJSON()
             }, {
               F: __dxlog_file21,
-              L: 378,
+              L: 379,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5919,7 +5906,7 @@ var InvitationsHandler = class {
           } else {
             log17.verbose("auth failed", err, {
               F: __dxlog_file21,
-              L: 381,
+              L: 382,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -5936,7 +5923,7 @@ var InvitationsHandler = class {
           ...protocol.toJSON()
         }, {
           F: __dxlog_file21,
-          L: 393,
+          L: 394,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -5949,14 +5936,14 @@ var InvitationsHandler = class {
     });
     edgeInvitationHandler.handle(ctx, guardedState, protocol, deviceProfile);
     scheduleTask7(ctx, async () => {
-      const error = protocol.checkInvitation(invitation);
+      const error = checkInvitation(protocol, invitation);
       if (error) {
         stream.error(error);
         await ctx.dispose();
       } else {
         invariant15(invitation.swarmKey, void 0, {
           F: __dxlog_file21,
-          L: 405,
+          L: 406,
           S: this,
           A: [
             "invitation.swarmKey",
@@ -6000,7 +5987,7 @@ var InvitationsHandler = class {
     for (let attempt = 1; attempt <= MAX_OTP_ATTEMPTS; attempt++) {
       log17("guest waiting for authentication code...", void 0, {
         F: __dxlog_file21,
-        L: 457,
+        L: 458,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6008,7 +5995,7 @@ var InvitationsHandler = class {
       const authCode = await authenticated.wait(options);
       log17("sending authentication request", void 0, {
         F: __dxlog_file21,
-        L: 461,
+        L: 462,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -6027,7 +6014,7 @@ var InvitationsHandler = class {
             attempt
           }, {
             F: __dxlog_file21,
-            L: 472,
+            L: 473,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -6045,7 +6032,7 @@ var InvitationsHandler = class {
     }
     log17("sending authentication request", void 0, {
       F: __dxlog_file21,
-      L: 491,
+      L: 492,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6058,6 +6045,13 @@ var InvitationsHandler = class {
     }
   }
 };
+var checkInvitation = (protocol, invitation) => {
+  const expiresOn = getExpirationTime(invitation);
+  if (expiresOn && expiresOn.getTime() < Date.now()) {
+    return new InvalidInvitationError("Invitation already expired.");
+  }
+  return protocol.checkInvitation(invitation);
+};
 var createAdmissionKeypair = () => {
   const keypair = createKeyPair();
   return {
@@ -6172,7 +6166,7 @@ import { createCancelDelegatedSpaceInvitationCredential, createDelegatedSpaceInv
 import { writeMessages as writeMessages4 } from "@dxos/feed-store";
 import { invariant as invariant16 } from "@dxos/invariant";
 import { log as log18 } from "@dxos/log";
-import { AlreadyJoinedError as AlreadyJoinedError3, AuthorizationError as AuthorizationError2, InvalidInvitationError, SpaceNotFoundError as SpaceNotFoundError2 } from "@dxos/protocols";
+import { AlreadyJoinedError as AlreadyJoinedError3, AuthorizationError as AuthorizationError2, InvalidInvitationError as InvalidInvitationError2, SpaceNotFoundError as SpaceNotFoundError2 } from "@dxos/protocols";
 import { Invitation as Invitation8 } from "@dxos/protocols/proto/dxos/client/services";
 import { SpaceMember as SpaceMember6 } from "@dxos/protocols/proto/dxos/halo/credentials";
 var __dxlog_file22 = "/home/runner/work/dxos/dxos/packages/sdk/client-services/src/packlets/invitations/space-invitation-protocol.ts";
@@ -6192,7 +6186,7 @@ var SpaceInvitationProtocol = class {
   }
   checkCanInviteNewMembers() {
     if (this._spaceKey == null) {
-      return new InvalidInvitationError("No spaceKey was provided for a space invitation.");
+      return new InvalidInvitationError2("No spaceKey was provided for a space invitation.");
     }
     const space = this._spaceManager.spaces.get(this._spaceKey);
     if (space == null) {
@@ -6206,7 +6200,7 @@ var SpaceInvitationProtocol = class {
   getInvitationContext() {
     invariant16(this._spaceKey, void 0, {
       F: __dxlog_file22,
-      L: 64,
+      L: 65,
       S: this,
       A: [
         "this._spaceKey",
@@ -6216,7 +6210,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant16(space, void 0, {
       F: __dxlog_file22,
-      L: 66,
+      L: 67,
       S: this,
       A: [
         "space",
@@ -6232,7 +6226,7 @@ var SpaceInvitationProtocol = class {
   async admit(invitation, request, guestProfile) {
     invariant16(this._spaceKey && request.space, void 0, {
       F: __dxlog_file22,
-      L: 79,
+      L: 80,
       S: this,
       A: [
         "this._spaceKey && request.space",
@@ -6244,7 +6238,7 @@ var SpaceInvitationProtocol = class {
       guest: request.space.deviceKey
     }, {
       F: __dxlog_file22,
-      L: 80,
+      L: 81,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6266,7 +6260,7 @@ var SpaceInvitationProtocol = class {
   async delegate(invitation) {
     invariant16(this._spaceKey, void 0, {
       F: __dxlog_file22,
-      L: 100,
+      L: 101,
       S: this,
       A: [
         "this._spaceKey",
@@ -6276,7 +6270,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant16(space, void 0, {
       F: __dxlog_file22,
-      L: 102,
+      L: 103,
       S: this,
       A: [
         "space",
@@ -6286,7 +6280,7 @@ var SpaceInvitationProtocol = class {
     if (invitation.authMethod === Invitation8.AuthMethod.KNOWN_PUBLIC_KEY) {
       invariant16(invitation.guestKeypair?.publicKey, void 0, {
         F: __dxlog_file22,
-        L: 104,
+        L: 105,
         S: this,
         A: [
           "invitation.guestKeypair?.publicKey",
@@ -6299,7 +6293,7 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file22,
-      L: 107,
+      L: 108,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -6308,13 +6302,13 @@ var SpaceInvitationProtocol = class {
       authMethod: invitation.authMethod,
       swarmKey: invitation.swarmKey,
       role: invitation.role ?? SpaceMember6.Role.ADMIN,
-      expiresOn: invitation.lifetime ? new Date((invitation.created?.getTime() ?? Date.now()) + invitation.lifetime) : void 0,
+      expiresOn: computeExpirationTime(invitation),
       multiUse: invitation.multiUse ?? false,
       guestKey: invitation.authMethod === Invitation8.AuthMethod.KNOWN_PUBLIC_KEY ? invitation.guestKeypair.publicKey : void 0
     });
     invariant16(credential.credential, void 0, {
       F: __dxlog_file22,
-      L: 127,
+      L: 126,
       S: this,
       A: [
         "credential.credential",
@@ -6329,7 +6323,7 @@ var SpaceInvitationProtocol = class {
   async cancelDelegation(invitation) {
     invariant16(this._spaceKey, void 0, {
       F: __dxlog_file22,
-      L: 133,
+      L: 132,
       S: this,
       A: [
         "this._spaceKey",
@@ -6338,7 +6332,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant16(invitation.type === Invitation8.Type.DELEGATED && invitation.delegationCredentialId, void 0, {
       F: __dxlog_file22,
-      L: 134,
+      L: 133,
       S: this,
       A: [
         "invitation.type === Invitation.Type.DELEGATED && invitation.delegationCredentialId",
@@ -6348,7 +6342,7 @@ var SpaceInvitationProtocol = class {
     const space = this._spaceManager.spaces.get(this._spaceKey);
     invariant16(space, void 0, {
       F: __dxlog_file22,
-      L: 136,
+      L: 135,
       S: this,
       A: [
         "space",
@@ -6360,14 +6354,14 @@ var SpaceInvitationProtocol = class {
       id: invitation.invitationId
     }, {
       F: __dxlog_file22,
-      L: 138,
+      L: 137,
       S: this,
       C: (f, a) => f(...a)
     });
     const credential = await createCancelDelegatedSpaceInvitationCredential(this._signingContext.credentialSigner, space.key, invitation.delegationCredentialId);
     invariant16(credential.credential, void 0, {
       F: __dxlog_file22,
-      L: 145,
+      L: 144,
       S: this,
       A: [
         "credential.credential",
@@ -6380,7 +6374,7 @@ var SpaceInvitationProtocol = class {
   }
   checkInvitation(invitation) {
     if (invitation.spaceKey == null) {
-      return new InvalidInvitationError("No spaceKey was provided for a space invitation.");
+      return new InvalidInvitationError2("No spaceKey was provided for a space invitation.");
     }
     if (this._spaceManager.spaces.has(invitation.spaceKey)) {
       return new AlreadyJoinedError3("Already joined space.");
@@ -6406,7 +6400,7 @@ var SpaceInvitationProtocol = class {
   async accept(response) {
     invariant16(response.space, void 0, {
       F: __dxlog_file22,
-      L: 180,
+      L: 179,
       S: this,
       A: [
         "response.space",
@@ -6417,7 +6411,7 @@ var SpaceInvitationProtocol = class {
     const assertion = getCredentialAssertion5(credential);
     invariant16(assertion["@type"] === "dxos.halo.credentials.SpaceMember", "Invalid credential", {
       F: __dxlog_file22,
-      L: 183,
+      L: 182,
       S: this,
       A: [
         "assertion['@type'] === 'dxos.halo.credentials.SpaceMember'",
@@ -6426,7 +6420,7 @@ var SpaceInvitationProtocol = class {
     });
     invariant16(credential.subject.id.equals(this._signingContext.identityKey), void 0, {
       F: __dxlog_file22,
-      L: 184,
+      L: 183,
       S: this,
       A: [
         "credential.subject.id.equals(this._signingContext.identityKey)",
@@ -6662,7 +6656,7 @@ var InvitationsManager = class {
     }
   }
   _createInvitation(protocol, _options) {
-    const { invitationId = PublicKey12.random().toHex(), type = Invitation9.Type.INTERACTIVE, authMethod = Invitation9.AuthMethod.SHARED_SECRET, state = Invitation9.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey12.random(), persistent = _options?.authMethod !== Invitation9.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = SpaceMember7.Role.ADMIN, lifetime = 86400, multiUse = false, ...options } = _options ?? {};
+    const { invitationId = PublicKey12.random().toHex(), type = Invitation9.Type.INTERACTIVE, authMethod = Invitation9.AuthMethod.SHARED_SECRET, state = Invitation9.State.INIT, timeout = INVITATION_TIMEOUT2, swarmKey = PublicKey12.random(), persistent = _options?.authMethod !== Invitation9.AuthMethod.KNOWN_PUBLIC_KEY, created = /* @__PURE__ */ new Date(), guestKeypair = void 0, role = SpaceMember7.Role.ADMIN, lifetime = 86400 * 7, multiUse = false, ...options } = _options ?? {};
     const authCode = options?.authCode ?? (authMethod === Invitation9.AuthMethod.SHARED_SECRET ? generatePasscode(AUTHENTICATION_CODE_LENGTH) : void 0);
     return {
       invitationId,
@@ -7022,6 +7016,18 @@ var EdgeAgentManager = class extends Resource6 {
       haloSpaceKey: this._identity.haloSpaceKey.toHex()
     });
     const deviceKey = PublicKey13.fromHex(response.deviceKey);
+    if (await this._identity.authorizedDeviceKeys.has(deviceKey)) {
+      log21.info("agent was already added to HALO, ignoring response", {
+        response
+      }, {
+        F: __dxlog_file25,
+        L: 67,
+        S: this,
+        C: (f, a) => f(...a)
+      });
+      this._updateStatus(EdgeAgentStatus.ACTIVE, deviceKey);
+      return;
+    }
     await this._identity.admitDevice({
       deviceKey,
       controlFeedKey: PublicKey13.fromHex(response.feedKey),
@@ -7030,7 +7036,7 @@ var EdgeAgentManager = class extends Resource6 {
     });
     log21("agent created", response, {
       F: __dxlog_file25,
-      L: 73,
+      L: 79,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7042,7 +7048,7 @@ var EdgeAgentManager = class extends Resource6 {
       isEnabled
     }, {
       F: __dxlog_file25,
-      L: 81,
+      L: 87,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7075,7 +7081,7 @@ var EdgeAgentManager = class extends Resource6 {
   async _fetchAgentStatus() {
     invariant19(this._edgeHttpClient, void 0, {
       F: __dxlog_file25,
-      L: 115,
+      L: 121,
       S: this,
       A: [
         "this._edgeHttpClient",
@@ -7085,7 +7091,7 @@ var EdgeAgentManager = class extends Resource6 {
     try {
       log21("fetching agent status", void 0, {
         F: __dxlog_file25,
-        L: 117,
+        L: 123,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7104,7 +7110,7 @@ var EdgeAgentManager = class extends Resource6 {
             err
           }, {
             F: __dxlog_file25,
-            L: 127,
+            L: 133,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -7117,7 +7123,7 @@ var EdgeAgentManager = class extends Resource6 {
         retryAfterMs
       }, {
         F: __dxlog_file25,
-        L: 132,
+        L: 138,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7153,7 +7159,7 @@ var EdgeAgentManager = class extends Resource6 {
         spaceId: space.id
       }, {
         F: __dxlog_file25,
-        L: 159,
+        L: 165,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -7173,7 +7179,7 @@ var EdgeAgentManager = class extends Resource6 {
       status
     }, {
       F: __dxlog_file25,
-      L: 175,
+      L: 181,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -7263,7 +7269,7 @@ import { trace as Trace3 } from "@dxos/tracing";
 import { safeInstanceof } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/identity/identity-recovery-manager.ts
-import { generateSeedPhrase as generateSeedPhrase2, keyPairFromSeedPhrase as keyPairFromSeedPhrase2 } from "@dxos/credentials";
+import { generateSeedPhrase, keyPairFromSeedPhrase } from "@dxos/credentials";
 import { sign as sign3 } from "@dxos/crypto";
 import { invariant as invariant20 } from "@dxos/invariant";
 import { PublicKey as PublicKey14 } from "@dxos/keys";
@@ -7279,27 +7285,41 @@ var EdgeIdentityRecoveryManager = class {
     this._identityProvider = _identityProvider;
     this._acceptRecoveredIdentity = _acceptRecoveredIdentity;
   }
-  async createRecoveryPhrase() {
+  async createRecoveryCredential({ data }) {
     const identity = this._identityProvider();
     invariant20(identity, void 0, {
       F: __dxlog_file26,
-      L: 29,
+      L: 37,
       S: this,
       A: [
         "identity",
         ""
       ]
     });
-    const seedphrase = generateSeedPhrase2();
-    const keypair = keyPairFromSeedPhrase2(seedphrase);
-    const recoveryKey = PublicKey14.from(keypair.publicKey);
+    let recoveryKey;
+    let lookupKey;
+    let algorithm;
+    let recoveryCode;
+    if (data) {
+      recoveryKey = data.recoveryKey;
+      lookupKey = data.lookupKey;
+      algorithm = data.algorithm;
+    } else {
+      recoveryCode = generateSeedPhrase();
+      const keypair = keyPairFromSeedPhrase(recoveryCode);
+      recoveryKey = PublicKey14.from(keypair.publicKey);
+      lookupKey = PublicKey14.from(keypair.publicKey);
+      algorithm = "ED25519";
+    }
     const identityKey = identity.identityKey;
     const credential = await identity.getIdentityCredentialSigner().createCredential({
       subject: identityKey,
       assertion: {
         "@type": "dxos.halo.credentials.IdentityRecovery",
         recoveryKey,
-        identityKey
+        identityKey,
+        algorithm,
+        lookupKey
       }
     });
     const receipt = await identity.controlPipeline.writer.write({
@@ -7314,25 +7334,86 @@ var EdgeIdentityRecoveryManager = class {
       ]
     ]));
     return {
-      seedphrase
+      recoveryCode
     };
   }
-  async recoverIdentity(args) {
+  async requestRecoveryChallenge() {
     invariant20(this._edgeClient, "Not connected to EDGE.", {
       F: __dxlog_file26,
-      L: 51,
+      L: 74,
+      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 EdgeAuthChallengeError2)) {
+        throw error;
+      }
+      return {
+        deviceKey,
+        controlFeedKey,
+        challenge: error.challenge
+      };
+    }
+  }
+  async recoverIdentityWithExternalSignature({ lookupKey, deviceKey, controlFeedKey, signature, clientDataJson, authenticatorData }) {
+    invariant20(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
+      L: 106,
+      S: this,
+      A: [
+        "this._edgeClient",
+        "'Not connected to EDGE.'"
+      ]
+    });
+    const request = {
+      lookupKey: lookupKey.toHex(),
+      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: PublicKey14.fromHex(response.genesisFeedKey),
+      haloSpaceKey: PublicKey14.fromHex(response.haloSpaceKey),
+      identityKey: PublicKey14.fromHex(response.identityKey),
+      deviceKey,
+      controlFeedKey,
+      dataFeedKey: await this._keyring.createKey()
+    });
+  }
+  async recoverIdentity({ recoveryCode }) {
+    invariant20(this._edgeClient, "Not connected to EDGE.", {
+      F: __dxlog_file26,
+      L: 136,
       S: this,
       A: [
         "this._edgeClient",
         "'Not connected to EDGE.'"
       ]
     });
-    const recoveryKeypair = keyPairFromSeedPhrase2(args.seedphrase);
+    const recoveryKeypair = keyPairFromSeedPhrase(recoveryCode);
     const recoveryKey = PublicKey14.from(recoveryKeypair.publicKey);
     const deviceKey = await this._keyring.createKey();
     const controlFeedKey = await this._keyring.createKey();
     const request = {
-      recoveryKey: recoveryKey.toHex(),
+      lookupKey: recoveryKey.toHex(),
       deviceKey: deviceKey.toHex(),
       controlFeedKey: controlFeedKey.toHex()
     };
@@ -7351,7 +7432,7 @@ var EdgeIdentityRecoveryManager = class {
     }
     log22.info("recovering identity", response, {
       F: __dxlog_file26,
-      L: 77,
+      L: 162,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -8953,4 +9034,4 @@ export {
   importProfileData,
   ClientServicesHost
 };
-//# sourceMappingURL=chunk-RSOLUJE6.mjs.map
+//# sourceMappingURL=chunk-YAOQ7FPR.mjs.map