tap-agent 0.7.0

Rust implementation of the Transaction Authorization Protocol (TAP)
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
//! Agent Key Manager for the TAP Agent
//!
//! This module provides an implementation of a key manager that uses the agent key abstraction.
//! It manages keys for signing, verification, encryption, and decryption operations, with support
//! for different key types (Ed25519, P-256, secp256k1).

use crate::agent_key::{AgentKey, DecryptionKey, EncryptionKey, SigningKey, VerificationKey};
use crate::did::{DIDGenerationOptions, DIDKeyGenerator, GeneratedKey, KeyType};
use crate::error::{Error, Result};
use crate::key_manager::{KeyManager, Secret, SecretMaterial};
use crate::local_agent_key::{LocalAgentKey, PublicVerificationKey};
use crate::message::{JweProtected, JwsProtected};
use crate::message_packing::{KeyManagerPacking, MessageError};
use crate::storage::{KeyStorage, StoredKey};

use async_trait::async_trait;
use base64::Engine;
use std::collections::HashMap;
use std::path::PathBuf;
use std::sync::{Arc, RwLock};

/// Agent Key Manager implements the KeyManager trait using the agent key abstraction
#[derive(Debug, Clone)]
pub struct AgentKeyManager {
    /// The DID key generator
    generator: DIDKeyGenerator,
    /// The secret storage (legacy)
    secrets: Arc<RwLock<HashMap<String, Secret>>>,
    /// Signing keys
    signing_keys: Arc<RwLock<HashMap<String, Arc<dyn SigningKey + Send + Sync>>>>,
    /// Encryption keys
    encryption_keys: Arc<RwLock<HashMap<String, Arc<dyn EncryptionKey + Send + Sync>>>>,
    /// Decryption keys
    decryption_keys: Arc<RwLock<HashMap<String, Arc<dyn DecryptionKey + Send + Sync>>>>,
    /// Verification keys
    verification_keys: Arc<RwLock<HashMap<String, Arc<dyn VerificationKey + Send + Sync>>>>,
    /// Generated keys with DID documents (for key ID resolution)
    generated_keys: Arc<RwLock<HashMap<String, GeneratedKey>>>,
    /// Storage path
    storage_path: Option<PathBuf>,
}

impl AgentKeyManager {
    /// Create a new key manager
    pub fn new() -> Self {
        Self {
            generator: DIDKeyGenerator::new(),
            secrets: Arc::new(RwLock::new(HashMap::new())),
            signing_keys: Arc::new(RwLock::new(HashMap::new())),
            encryption_keys: Arc::new(RwLock::new(HashMap::new())),
            decryption_keys: Arc::new(RwLock::new(HashMap::new())),
            verification_keys: Arc::new(RwLock::new(HashMap::new())),
            generated_keys: Arc::new(RwLock::new(HashMap::new())),
            storage_path: None,
        }
    }

    /// Get a generated key (with DID document) by DID
    pub fn get_generated_key(&self, did: &str) -> Result<GeneratedKey> {
        if let Ok(generated_keys) = self.generated_keys.read() {
            if let Some(key) = generated_keys.get(did) {
                return Ok(key.clone());
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        Err(Error::KeyNotFound(format!(
            "Generated key not found for DID: {}",
            did
        )))
    }

    /// Get the key type for a signing key (for debugging)
    pub async fn get_signing_key_type(&self, did: &str) -> Result<String> {
        // Try to find a signing key for this DID
        if let Ok(signing_keys) = self.signing_keys.read() {
            for (kid, key) in signing_keys.iter() {
                if kid.starts_with(did) {
                    if let Ok(jwk) = key.public_key_jwk() {
                        let kty = jwk.get("kty").and_then(|v| v.as_str());
                        let crv = jwk.get("crv").and_then(|v| v.as_str());
                        return Ok(format!("kty: {:?}, crv: {:?}", kty, crv));
                    }
                }
            }
        }

        Err(Error::KeyNotFound(format!(
            "No signing key found for DID: {}",
            did
        )))
    }

    /// Create a LocalAgentKey from a GeneratedKey
    pub fn agent_key_from_generated(&self, key: &GeneratedKey) -> Result<LocalAgentKey> {
        // Create a secret for the key
        let secret = self.generator.create_secret_from_key(key);

        // Create a LocalAgentKey
        Ok(LocalAgentKey::new(secret, key.key_type))
    }

    /// Store an agent key in all collections
    fn store_agent_key(&self, agent_key: &LocalAgentKey, key_id: &str) -> Result<()> {
        // Store the agent key as signing, encryption, and decryption keys
        if let Ok(mut signing_keys) = self.signing_keys.write() {
            signing_keys.insert(
                key_id.to_string(),
                Arc::new(agent_key.clone()) as Arc<dyn SigningKey + Send + Sync>,
            );
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        if let Ok(mut encryption_keys) = self.encryption_keys.write() {
            encryption_keys.insert(
                key_id.to_string(),
                Arc::new(agent_key.clone()) as Arc<dyn EncryptionKey + Send + Sync>,
            );
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        if let Ok(mut decryption_keys) = self.decryption_keys.write() {
            decryption_keys.insert(
                key_id.to_string(),
                Arc::new(agent_key.clone()) as Arc<dyn DecryptionKey + Send + Sync>,
            );
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Also store a reference in verification keys
        if let Ok(mut verification_keys) = self.verification_keys.write() {
            verification_keys.insert(
                key_id.to_string(),
                Arc::new(agent_key.clone()) as Arc<dyn VerificationKey + Send + Sync>,
            );
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        Ok(())
    }

    /// Get the raw private key bytes and key type for a DID
    ///
    /// Checks generated_keys first (raw bytes), falls back to extracting
    /// from the secrets JWK "d" parameter.
    pub fn get_private_key(&self, did: &str) -> Result<(Vec<u8>, KeyType)> {
        // Check generated_keys first (has raw bytes)
        if let Ok(generated_keys) = self.generated_keys.read() {
            if let Some(key) = generated_keys.get(did) {
                return Ok((key.private_key.clone(), key.key_type));
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        // Fall back to secrets (JWK format)
        if let Ok(secrets) = self.secrets.read() {
            if let Some(secret) = secrets.get(did) {
                return crate::key_manager::extract_private_key_from_secret(secret);
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        Err(Error::KeyNotFound(format!(
            "Private key not found for DID: {}",
            did
        )))
    }

    /// Save keys to storage if a storage path is configured
    pub fn save_to_storage(&self) -> Result<()> {
        // Skip if no storage path is configured
        if self.storage_path.is_none() {
            return Ok(());
        }

        // Create a KeyStorage object from our secrets
        let mut key_storage = KeyStorage::new();

        // Add all secrets
        if let Ok(secrets) = self.secrets.read() {
            for (did, secret) in secrets.iter() {
                // Extract key type from the key
                let key_type = match secret.secret_material {
                    SecretMaterial::JWK {
                        ref private_key_jwk,
                    } => {
                        let kty = private_key_jwk.get("kty").and_then(|v| v.as_str());
                        let crv = private_key_jwk.get("crv").and_then(|v| v.as_str());

                        match (kty, crv) {
                            #[cfg(feature = "crypto-ed25519")]
                            (Some("OKP"), Some("Ed25519")) => KeyType::Ed25519,
                            #[cfg(feature = "crypto-p256")]
                            (Some("EC"), Some("P-256")) => KeyType::P256,
                            #[cfg(feature = "crypto-secp256k1")]
                            (Some("EC"), Some("secp256k1")) => KeyType::Secp256k1,
                            _ => KeyType::Ed25519, // Default
                        }
                    }
                };

                // Get private and public keys from the JWK
                let private_key_b64 = match &secret.secret_material {
                    SecretMaterial::JWK { private_key_jwk } => private_key_jwk
                        .get("d")
                        .and_then(|v| v.as_str())
                        .unwrap_or("")
                        .to_string(),
                };

                let public_key_b64 = match &secret.secret_material {
                    SecretMaterial::JWK { private_key_jwk } => private_key_jwk
                        .get("x")
                        .and_then(|v| v.as_str())
                        .unwrap_or("")
                        .to_string(),
                };

                // Create a StoredKey and add to key storage
                let stored_key = StoredKey {
                    did: did.clone(),
                    label: String::new(), // Will be auto-generated when added
                    key_type,
                    private_key: private_key_b64,
                    public_key: public_key_b64,
                    metadata: HashMap::new(),
                };
                key_storage.add_key(stored_key);
            }
        }

        // Save to storage
        if let Some(path) = &self.storage_path {
            key_storage.save_to_path(path)?;
        } else {
            key_storage.save_default()?;
        }

        Ok(())
    }

    /// Load from default storage location
    pub fn load_from_default_storage(mut self) -> Result<Self> {
        self.storage_path = None;
        self.load_keys_from_storage()
    }

    /// Load from a specific storage path
    pub fn load_from_path(mut self, path: PathBuf) -> Result<Self> {
        self.storage_path = Some(path);
        self.load_keys_from_storage()
    }

    /// Load keys from configured storage
    fn load_keys_from_storage(&self) -> Result<Self> {
        // Load storage
        let storage = if let Some(path) = &self.storage_path {
            KeyStorage::load_from_path(path)?
        } else {
            KeyStorage::load_default()?
        };

        // Process each stored key
        for (did, stored_key) in storage.keys {
            // Convert to a legacy secret
            let secret = KeyStorage::to_secret(&stored_key);

            // Add to secrets
            if let Ok(mut secrets) = self.secrets.write() {
                secrets.insert(did.clone(), secret.clone());
            } else {
                return Err(Error::FailedToAcquireResolverWriteLock);
            }

            // Create an agent key
            let key_type = stored_key.key_type;
            let agent_key = LocalAgentKey::new(secret, key_type);
            let key_id = AgentKey::key_id(&agent_key).to_string();

            // Store in all collections
            self.store_agent_key(&agent_key, &key_id)?;
        }

        Ok(self.clone())
    }

    /// Add a key to the key manager with option to save to storage
    fn add_key_internal(&self, key: &GeneratedKey, save_to_storage: bool) -> Result<()> {
        // Create a LocalAgentKey
        let agent_key = self.agent_key_from_generated(key)?;
        let key_id = AgentKey::key_id(&agent_key).to_string();

        // Store the legacy secret
        if let Ok(mut secrets) = self.secrets.write() {
            secrets.insert(key.did.clone(), agent_key.clone().secret);
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Store in all collections
        self.store_agent_key(&agent_key, &key_id)?;

        // Save to storage if configured and requested
        if save_to_storage {
            self.save_to_storage()?;
        }

        Ok(())
    }

    /// Add a key to the key manager without saving to storage
    /// This is useful when you plan to save to storage manually later
    pub fn add_key_without_save(&self, key: &GeneratedKey) -> Result<()> {
        self.add_key_internal(key, false)
    }

    /// Generate a new key with the specified options without saving to storage
    /// This is useful when you plan to save to storage manually later
    pub fn generate_key_without_save(&self, options: DIDGenerationOptions) -> Result<GeneratedKey> {
        self.generate_key_internal(options, false)
    }

    /// Internal method to generate a key with optional storage save
    fn generate_key_internal(
        &self,
        options: DIDGenerationOptions,
        save_to_storage: bool,
    ) -> Result<GeneratedKey> {
        // Generate the key
        let key = self.generator.generate_did(options)?;

        // Create a LocalAgentKey
        let agent_key = self.agent_key_from_generated(&key)?;
        let key_id = AgentKey::key_id(&agent_key).to_string();

        // Store the legacy secret
        if let Ok(mut secrets) = self.secrets.write() {
            secrets.insert(key.did.clone(), agent_key.clone().secret);
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Store the generated key for DID document access
        if let Ok(mut generated_keys) = self.generated_keys.write() {
            generated_keys.insert(key.did.clone(), key.clone());
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Store in all collections
        self.store_agent_key(&agent_key, &key_id)?;

        // Save to storage if configured and requested
        if save_to_storage {
            self.save_to_storage()?;
        }

        Ok(key)
    }

    /// Generate a new web DID with the specified domain and options without saving to storage
    /// This is useful when you plan to save to storage manually later
    pub fn generate_web_did_without_save(
        &self,
        domain: &str,
        options: DIDGenerationOptions,
    ) -> Result<GeneratedKey> {
        self.generate_web_did_internal(domain, options, false)
    }

    /// Internal method to generate a web DID with optional storage save
    fn generate_web_did_internal(
        &self,
        domain: &str,
        options: DIDGenerationOptions,
        save_to_storage: bool,
    ) -> Result<GeneratedKey> {
        // Generate the key
        let key = self.generator.generate_web_did(domain, options)?;

        // Create a LocalAgentKey
        let agent_key = self.agent_key_from_generated(&key)?;
        let key_id = AgentKey::key_id(&agent_key).to_string();

        // Store the legacy secret
        if let Ok(mut secrets) = self.secrets.write() {
            secrets.insert(key.did.clone(), agent_key.clone().secret);
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Store the generated key for DID document access
        if let Ok(mut generated_keys) = self.generated_keys.write() {
            generated_keys.insert(key.did.clone(), key.clone());
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Store in all collections
        self.store_agent_key(&agent_key, &key_id)?;

        // Save to storage if configured and requested
        if save_to_storage {
            self.save_to_storage()?;
        }

        Ok(key)
    }
}

impl Default for AgentKeyManager {
    fn default() -> Self {
        Self::new()
    }
}

#[async_trait]
impl KeyManager for AgentKeyManager {
    /// Get access to the secrets storage
    fn secrets(&self) -> Arc<RwLock<HashMap<String, Secret>>> {
        Arc::clone(&self.secrets)
    }

    /// Get the raw private key bytes and key type for a DID
    fn get_private_key(&self, did: &str) -> Result<(Vec<u8>, KeyType)> {
        AgentKeyManager::get_private_key(self, did)
    }

    /// Generate a new key with the specified options
    fn generate_key(&self, options: DIDGenerationOptions) -> Result<GeneratedKey> {
        self.generate_key_internal(options, true)
    }

    /// Generate a new web DID with the specified domain and options
    fn generate_web_did(
        &self,
        domain: &str,
        options: DIDGenerationOptions,
    ) -> Result<GeneratedKey> {
        self.generate_web_did_internal(domain, options, true)
    }

    /// Add an existing key to the key manager
    fn add_key(&self, key: &GeneratedKey) -> Result<()> {
        self.add_key_internal(key, true)
    }

    /// Remove a key from the key manager
    fn remove_key(&self, did: &str) -> Result<()> {
        // Remove from legacy secrets
        if let Ok(mut secrets) = self.secrets.write() {
            secrets.remove(did);
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Remove from signing keys
        if let Ok(mut signing_keys) = self.signing_keys.write() {
            signing_keys.retain(|k, _| !k.starts_with(did));
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Remove from encryption keys
        if let Ok(mut encryption_keys) = self.encryption_keys.write() {
            encryption_keys.retain(|k, _| !k.starts_with(did));
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Remove from decryption keys
        if let Ok(mut decryption_keys) = self.decryption_keys.write() {
            decryption_keys.retain(|k, _| !k.starts_with(did));
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Remove from verification keys
        if let Ok(mut verification_keys) = self.verification_keys.write() {
            verification_keys.retain(|k, _| !k.starts_with(did));
        } else {
            return Err(Error::FailedToAcquireResolverWriteLock);
        }

        // Save to storage if configured
        self.save_to_storage()?;

        Ok(())
    }

    /// Check if the key manager has a key for the given DID
    fn has_key(&self, did: &str) -> Result<bool> {
        // Check legacy secrets first
        if let Ok(secrets) = self.secrets.read() {
            if secrets.contains_key(did) {
                return Ok(true);
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        // Check if any signing key has this DID
        if let Ok(signing_keys) = self.signing_keys.read() {
            if signing_keys.values().any(|k| k.did() == did) {
                return Ok(true);
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        Ok(false)
    }

    /// Get a list of all DIDs in the key manager
    fn list_keys(&self) -> Result<Vec<String>> {
        // Collect DIDs from both legacy secrets and new keys
        let mut dids = Vec::new();

        // Add DIDs from legacy secrets
        if let Ok(secrets) = self.secrets.read() {
            dids.extend(secrets.keys().cloned());
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        // Add DIDs from signing keys
        if let Ok(signing_keys) = self.signing_keys.read() {
            for key in signing_keys.values() {
                if !dids.contains(&key.did().to_string()) {
                    dids.push(key.did().to_string());
                }
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        Ok(dids)
    }

    /// Add a signing key to the key manager
    async fn add_signing_key(&self, key: Arc<dyn SigningKey + Send + Sync>) -> Result<()> {
        if let Ok(mut signing_keys) = self.signing_keys.write() {
            signing_keys.insert(key.key_id().to_string(), key);
            Ok(())
        } else {
            Err(Error::FailedToAcquireResolverWriteLock)
        }
    }

    /// Add an encryption key to the key manager
    async fn add_encryption_key(&self, key: Arc<dyn EncryptionKey + Send + Sync>) -> Result<()> {
        if let Ok(mut encryption_keys) = self.encryption_keys.write() {
            encryption_keys.insert(key.key_id().to_string(), key);
            Ok(())
        } else {
            Err(Error::FailedToAcquireResolverWriteLock)
        }
    }

    /// Add a decryption key to the key manager
    async fn add_decryption_key(&self, key: Arc<dyn DecryptionKey + Send + Sync>) -> Result<()> {
        if let Ok(mut decryption_keys) = self.decryption_keys.write() {
            decryption_keys.insert(key.key_id().to_string(), key);
            Ok(())
        } else {
            Err(Error::FailedToAcquireResolverWriteLock)
        }
    }

    /// Get a signing key by ID
    async fn get_signing_key(&self, kid: &str) -> Result<Arc<dyn SigningKey + Send + Sync>> {
        // Check if we have a signing key with this ID
        if let Ok(signing_keys) = self.signing_keys.read() {
            if let Some(key) = signing_keys.get(kid) {
                return Ok(key.clone());
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        // If not, check legacy secrets
        if let Ok(secrets) = self.secrets.read() {
            // Try to find a secret with this DID or kid
            let did = kid.split('#').next().unwrap_or(kid);
            if let Some(secret) = secrets.get(did) {
                // Detect key type from the JWK
                let key_type = match &secret.secret_material {
                    SecretMaterial::JWK { private_key_jwk } => {
                        let kty = private_key_jwk.get("kty").and_then(|v| v.as_str());
                        let crv = private_key_jwk.get("crv").and_then(|v| v.as_str());
                        match (kty, crv) {
                            #[cfg(feature = "crypto-ed25519")]
                            (Some("OKP"), Some("Ed25519")) => KeyType::Ed25519,
                            #[cfg(feature = "crypto-p256")]
                            (Some("EC"), Some("P-256")) => KeyType::P256,
                            #[cfg(feature = "crypto-secp256k1")]
                            (Some("EC"), Some("secp256k1")) => KeyType::Secp256k1,
                            _ => KeyType::Ed25519, // Default
                        }
                    }
                };
                // Create a LocalAgentKey
                let agent_key = LocalAgentKey::new(secret.clone(), key_type);

                // Add to signing keys for next time
                if let Ok(mut signing_keys) = self.signing_keys.write() {
                    let arc_key = Arc::new(agent_key.clone()) as Arc<dyn SigningKey + Send + Sync>;
                    signing_keys.insert(AgentKey::key_id(&agent_key).to_string(), arc_key.clone());
                    return Ok(arc_key);
                }
            }
        }

        Err(Error::Cryptography(format!(
            "No signing key found with ID: {}",
            kid
        )))
    }

    /// Get an encryption key by ID
    async fn get_encryption_key(&self, kid: &str) -> Result<Arc<dyn EncryptionKey + Send + Sync>> {
        // Check if we have an encryption key with this ID
        if let Ok(encryption_keys) = self.encryption_keys.read() {
            if let Some(key) = encryption_keys.get(kid) {
                return Ok(key.clone());
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        // If not, check legacy secrets
        if let Ok(secrets) = self.secrets.read() {
            // Try to find a secret with this DID or kid
            let did = kid.split('#').next().unwrap_or(kid);
            if let Some(secret) = secrets.get(did) {
                // Detect key type from the JWK
                let key_type = match &secret.secret_material {
                    SecretMaterial::JWK { private_key_jwk } => {
                        let kty = private_key_jwk.get("kty").and_then(|v| v.as_str());
                        let crv = private_key_jwk.get("crv").and_then(|v| v.as_str());
                        match (kty, crv) {
                            #[cfg(feature = "crypto-ed25519")]
                            (Some("OKP"), Some("Ed25519")) => KeyType::Ed25519,
                            #[cfg(feature = "crypto-p256")]
                            (Some("EC"), Some("P-256")) => KeyType::P256,
                            #[cfg(feature = "crypto-secp256k1")]
                            (Some("EC"), Some("secp256k1")) => KeyType::Secp256k1,
                            _ => KeyType::Ed25519, // Default
                        }
                    }
                };
                // Create a LocalAgentKey
                let agent_key = LocalAgentKey::new(secret.clone(), key_type);

                // Add to encryption keys for next time
                if let Ok(mut encryption_keys) = self.encryption_keys.write() {
                    let arc_key =
                        Arc::new(agent_key.clone()) as Arc<dyn EncryptionKey + Send + Sync>;
                    encryption_keys
                        .insert(AgentKey::key_id(&agent_key).to_string(), arc_key.clone());
                    return Ok(arc_key);
                }
            }
        }

        Err(Error::Cryptography(format!(
            "No encryption key found with ID: {}",
            kid
        )))
    }

    /// Get a decryption key by ID
    async fn get_decryption_key(&self, kid: &str) -> Result<Arc<dyn DecryptionKey + Send + Sync>> {
        // Check if we have a decryption key with this ID
        if let Ok(decryption_keys) = self.decryption_keys.read() {
            if let Some(key) = decryption_keys.get(kid) {
                return Ok(key.clone());
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        // If not, check legacy secrets
        if let Ok(secrets) = self.secrets.read() {
            // Try to find a secret with this DID or kid
            let did = kid.split('#').next().unwrap_or(kid);
            if let Some(secret) = secrets.get(did) {
                // Detect key type from the JWK
                let key_type = match &secret.secret_material {
                    SecretMaterial::JWK { private_key_jwk } => {
                        let kty = private_key_jwk.get("kty").and_then(|v| v.as_str());
                        let crv = private_key_jwk.get("crv").and_then(|v| v.as_str());
                        match (kty, crv) {
                            #[cfg(feature = "crypto-ed25519")]
                            (Some("OKP"), Some("Ed25519")) => KeyType::Ed25519,
                            #[cfg(feature = "crypto-p256")]
                            (Some("EC"), Some("P-256")) => KeyType::P256,
                            #[cfg(feature = "crypto-secp256k1")]
                            (Some("EC"), Some("secp256k1")) => KeyType::Secp256k1,
                            _ => KeyType::Ed25519, // Default
                        }
                    }
                };
                // Create a LocalAgentKey
                let agent_key = LocalAgentKey::new(secret.clone(), key_type);

                // Add to decryption keys for next time
                if let Ok(mut decryption_keys) = self.decryption_keys.write() {
                    let arc_key =
                        Arc::new(agent_key.clone()) as Arc<dyn DecryptionKey + Send + Sync>;
                    decryption_keys
                        .insert(AgentKey::key_id(&agent_key).to_string(), arc_key.clone());
                    return Ok(arc_key);
                }
            }
        }

        Err(Error::Cryptography(format!(
            "No decryption key found with ID: {}",
            kid
        )))
    }

    /// Resolve a verification key by ID
    async fn resolve_verification_key(
        &self,
        kid: &str,
    ) -> Result<Arc<dyn VerificationKey + Send + Sync>> {
        // Check if we have a verification key with this ID
        if let Ok(verification_keys) = self.verification_keys.read() {
            if let Some(key) = verification_keys.get(kid) {
                return Ok(key.clone());
            }
        } else {
            return Err(Error::FailedToAcquireResolverReadLock);
        }

        // If not found locally, try to derive from a signing key
        let signing_key = KeyManager::get_signing_key(self, kid).await;
        if let Ok(key) = signing_key {
            // Create a verification key from the signing key
            let public_jwk = key.public_key_jwk()?;
            let verification_key = Arc::new(PublicVerificationKey::new(kid.to_string(), public_jwk))
                as Arc<dyn VerificationKey + Send + Sync>;

            // Add to verification keys for next time
            if let Ok(mut verification_keys) = self.verification_keys.write() {
                verification_keys.insert(kid.to_string(), verification_key.clone());
            }

            return Ok(verification_key);
        }

        // Resolve did:key DIDs directly from the DID string (public key is embedded)
        let did = kid.split('#').next().unwrap_or(kid);
        if did.starts_with("did:key:") {
            let resolver = crate::did::KeyResolver::new();
            #[cfg(not(target_arch = "wasm32"))]
            let did_doc_result = {
                use crate::did::DIDMethodResolver;
                resolver.resolve_method(did).await
            };
            #[cfg(target_arch = "wasm32")]
            let did_doc_result = {
                use crate::did::WasmDIDMethodResolver;
                resolver.resolve_method(did)
            };

            if let Ok(Some(did_doc)) = did_doc_result {
                // Find the verification method matching the kid
                if let Some(vm) = did_doc.verification_method.iter().find(|vm| vm.id == kid) {
                    if let Ok(vk) = PublicVerificationKey::from_verification_material(
                        kid.to_string(),
                        &vm.verification_material,
                    ) {
                        let verification_key =
                            Arc::new(vk) as Arc<dyn VerificationKey + Send + Sync>;

                        // Cache for future lookups
                        if let Ok(mut verification_keys) = self.verification_keys.write() {
                            verification_keys.insert(kid.to_string(), verification_key.clone());
                        }

                        return Ok(verification_key);
                    }
                }
            }
        }

        Err(Error::Cryptography(format!(
            "No verification key found with ID: {}",
            kid
        )))
    }

    /// Sign data with a key
    async fn sign_jws(
        &self,
        kid: &str,
        payload: &[u8],
        protected_header: Option<JwsProtected>,
    ) -> Result<String> {
        // Get the signing key
        let signing_key = KeyManager::get_signing_key(self, kid).await?;

        // Sign the payload
        let jws = signing_key
            .create_jws(payload, protected_header)
            .await
            .map_err(|e| Error::Cryptography(e.to_string()))?;

        // Serialize the JWS
        serde_json::to_string(&jws).map_err(|e| Error::Serialization(e.to_string()))
    }

    /// Verify a JWS
    async fn verify_jws(&self, jws: &str, expected_kid: Option<&str>) -> Result<Vec<u8>> {
        // Parse the JWS
        let jws: crate::message::Jws = serde_json::from_str(jws)
            .map_err(|e| Error::Serialization(format!("Failed to parse JWS: {}", e)))?;

        // Find the signature to verify
        let signature = if let Some(kid) = expected_kid {
            jws.signatures
                .iter()
                .find(|s| s.get_kid().as_deref() == Some(kid))
                .ok_or_else(|| {
                    Error::Cryptography(format!("No signature found with kid: {}", kid))
                })?
        } else {
            // Use the first signature
            jws.signatures
                .first()
                .ok_or_else(|| Error::Cryptography("No signatures in JWS".to_string()))?
        };

        // Get the protected header
        let protected = signature.get_protected_header().map_err(|e| {
            Error::Cryptography(format!("Failed to decode protected header: {}", e))
        })?;

        // Get the verification key using kid from protected header
        let kid = signature
            .get_kid()
            .ok_or_else(|| Error::Cryptography("No kid found in JWS signature".to_string()))?;
        let verification_key = KeyManager::resolve_verification_key(self, &kid).await?;

        // Decode the signature
        let signature_bytes = base64::engine::general_purpose::STANDARD
            .decode(&signature.signature)
            .map_err(|e| Error::Cryptography(format!("Failed to decode signature: {}", e)))?;

        // Create the signing input (protected.payload)
        let signing_input = format!("{}.{}", signature.protected, jws.payload);

        // Verify the signature
        let verified = verification_key
            .verify_signature(signing_input.as_bytes(), &signature_bytes, &protected)
            .await
            .map_err(|e| Error::Cryptography(e.to_string()))?;

        if !verified {
            return Err(Error::Cryptography(
                "Signature verification failed".to_string(),
            ));
        }

        // Decode the payload
        let payload_bytes = base64::engine::general_purpose::STANDARD
            .decode(&jws.payload)
            .map_err(|e| Error::Cryptography(format!("Failed to decode payload: {}", e)))?;

        Ok(payload_bytes)
    }

    /// Encrypt data for a recipient
    async fn encrypt_jwe(
        &self,
        sender_kid: &str,
        recipient_kid: &str,
        plaintext: &[u8],
        protected_header: Option<JweProtected>,
    ) -> Result<String> {
        // Get the encryption key
        let encryption_key = KeyManager::get_encryption_key(self, sender_kid).await?;

        // Resolve the recipient's verification key
        let recipient_key = KeyManager::resolve_verification_key(self, recipient_kid).await?;

        // Encrypt the plaintext
        let jwe = encryption_key
            .create_jwe(plaintext, &[recipient_key], protected_header)
            .await
            .map_err(|e| Error::Cryptography(e.to_string()))?;

        // Serialize the JWE
        serde_json::to_string(&jwe).map_err(|e| Error::Serialization(e.to_string()))
    }

    /// Decrypt a JWE
    async fn decrypt_jwe(&self, jwe: &str, expected_kid: Option<&str>) -> Result<Vec<u8>> {
        // Parse the JWE
        let jwe: crate::message::Jwe = serde_json::from_str(jwe)
            .map_err(|e| Error::Serialization(format!("Failed to parse JWE: {}", e)))?;

        // Find the recipient if expected_kid is provided
        if let Some(kid) = expected_kid {
            // Just verify recipient exists, we don't need the actual instance
            jwe.recipients
                .iter()
                .find(|r| r.header.kid == kid)
                .ok_or_else(|| {
                    Error::Cryptography(format!("No recipient found with kid: {}", kid))
                })?;

            // Get the decryption key
            let decryption_key = KeyManager::get_decryption_key(self, kid).await?;

            // Decrypt the JWE
            decryption_key
                .unwrap_jwe(&jwe)
                .await
                .map_err(|e| Error::Cryptography(e.to_string()))
        } else {
            // Try each recipient
            for recipient in &jwe.recipients {
                // Try to get the decryption key
                if let Ok(decryption_key) =
                    KeyManager::get_decryption_key(self, &recipient.header.kid).await
                {
                    // Try to decrypt
                    if let Ok(plaintext) = decryption_key.unwrap_jwe(&jwe).await {
                        return Ok(plaintext);
                    }
                }
            }

            Err(Error::Cryptography(
                "Failed to decrypt JWE for any recipient".to_string(),
            ))
        }
    }
}

/// A builder for AgentKeyManager
#[derive(Debug, Clone)]
pub struct AgentKeyManagerBuilder {
    /// Legacy secrets
    secrets: HashMap<String, Secret>,
    /// Signing keys
    signing_keys: HashMap<String, Arc<dyn SigningKey + Send + Sync>>,
    /// Encryption keys
    encryption_keys: HashMap<String, Arc<dyn EncryptionKey + Send + Sync>>,
    /// Decryption keys
    decryption_keys: HashMap<String, Arc<dyn DecryptionKey + Send + Sync>>,
    /// Verification keys
    verification_keys: HashMap<String, Arc<dyn VerificationKey + Send + Sync>>,
    /// Load from storage
    load_from_storage: bool,
    /// Storage path
    storage_path: Option<PathBuf>,
}

impl Default for AgentKeyManagerBuilder {
    fn default() -> Self {
        Self::new()
    }
}

impl AgentKeyManagerBuilder {
    /// Create a new KeyManagerBuilder
    pub fn new() -> Self {
        Self {
            secrets: HashMap::new(),
            signing_keys: HashMap::new(),
            encryption_keys: HashMap::new(),
            decryption_keys: HashMap::new(),
            verification_keys: HashMap::new(),
            load_from_storage: false,
            storage_path: None,
        }
    }

    /// Load keys from default storage location
    pub fn load_from_default_storage(mut self) -> Self {
        self.load_from_storage = true;
        self.storage_path = None;
        self
    }

    /// Load keys from a specific storage path
    pub fn load_from_path(mut self, path: PathBuf) -> Self {
        self.load_from_storage = true;
        self.storage_path = Some(path);
        self
    }

    /// Add a legacy secret
    pub fn add_secret(mut self, did: String, secret: Secret) -> Self {
        self.secrets.insert(did, secret);
        self
    }

    /// Add a signing key
    pub fn add_signing_key(mut self, key: Arc<dyn SigningKey + Send + Sync>) -> Self {
        self.signing_keys.insert(key.key_id().to_string(), key);
        self
    }

    /// Add an encryption key
    pub fn add_encryption_key(mut self, key: Arc<dyn EncryptionKey + Send + Sync>) -> Self {
        self.encryption_keys.insert(key.key_id().to_string(), key);
        self
    }

    /// Add a decryption key
    pub fn add_decryption_key(mut self, key: Arc<dyn DecryptionKey + Send + Sync>) -> Self {
        self.decryption_keys.insert(key.key_id().to_string(), key);
        self
    }

    /// Add a verification key
    pub fn add_verification_key(mut self, key: Arc<dyn VerificationKey + Send + Sync>) -> Self {
        self.verification_keys.insert(key.key_id().to_string(), key);
        self
    }

    /// Build the KeyManager
    pub fn build(self) -> Result<AgentKeyManager> {
        let mut key_manager = AgentKeyManager {
            generator: DIDKeyGenerator::new(),
            secrets: Arc::new(RwLock::new(self.secrets)),
            signing_keys: Arc::new(RwLock::new(self.signing_keys)),
            encryption_keys: Arc::new(RwLock::new(self.encryption_keys)),
            decryption_keys: Arc::new(RwLock::new(self.decryption_keys)),
            verification_keys: Arc::new(RwLock::new(self.verification_keys)),
            generated_keys: Arc::new(RwLock::new(HashMap::new())),
            storage_path: self.storage_path.clone(),
        };

        // Load keys from storage if requested
        if self.load_from_storage {
            key_manager = if let Some(path) = self.storage_path {
                key_manager.load_from_path(path)?
            } else {
                key_manager.load_from_default_storage()?
            };
        }

        Ok(key_manager)
    }
}

#[async_trait]
impl KeyManagerPacking for AgentKeyManager {
    async fn get_signing_key(&self, kid: &str) -> Result<Arc<dyn SigningKey + Send + Sync>> {
        KeyManager::get_signing_key(self, kid)
            .await
            .map_err(|e| Error::from(MessageError::KeyManager(e.to_string())))
    }

    async fn get_encryption_key(&self, kid: &str) -> Result<Arc<dyn EncryptionKey + Send + Sync>> {
        KeyManager::get_encryption_key(self, kid)
            .await
            .map_err(|e| Error::from(MessageError::KeyManager(e.to_string())))
    }

    async fn get_decryption_key(&self, kid: &str) -> Result<Arc<dyn DecryptionKey + Send + Sync>> {
        KeyManager::get_decryption_key(self, kid)
            .await
            .map_err(|e| Error::from(MessageError::KeyManager(e.to_string())))
    }

    async fn resolve_verification_key(
        &self,
        kid: &str,
    ) -> Result<Arc<dyn VerificationKey + Send + Sync>> {
        KeyManager::resolve_verification_key(self, kid)
            .await
            .map_err(|e| Error::from(MessageError::KeyManager(e.to_string())))
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::agent::TapAgent;
    use crate::did::{DIDGenerationOptions, KeyType};
    use crate::key_manager::KeyManager;

    #[test]
    fn test_get_private_key_for_generated_key() {
        let km = AgentKeyManager::new();
        let key = km
            .generate_key(DIDGenerationOptions {
                key_type: KeyType::Ed25519,
            })
            .unwrap();

        let (private_key, key_type) = km.get_private_key(&key.did).unwrap();
        assert_eq!(private_key, key.private_key);
        assert_eq!(key_type, KeyType::Ed25519);
    }

    #[test]
    fn test_get_private_key_for_storage_loaded_key() {
        // Simulate a key loaded from storage (only in secrets, not in generated_keys)
        let km = AgentKeyManager::new();
        let key = km
            .generate_key(DIDGenerationOptions {
                key_type: KeyType::Ed25519,
            })
            .unwrap();

        // Create a new key manager and load only the secret (simulating storage load)
        let km2 = AgentKeyManager::new();
        let secret = km.secrets().read().unwrap().get(&key.did).cloned().unwrap();
        km2.secrets()
            .write()
            .unwrap()
            .insert(key.did.clone(), secret);

        // Should still be able to extract the private key from the secret
        let (private_key, key_type) = km2.get_private_key(&key.did).unwrap();
        assert_eq!(private_key, key.private_key);
        assert_eq!(key_type, KeyType::Ed25519);
    }

    #[cfg(feature = "crypto-p256")]
    #[test]
    fn test_get_private_key_p256() {
        let km = AgentKeyManager::new();
        let key = km
            .generate_key(DIDGenerationOptions {
                key_type: KeyType::P256,
            })
            .unwrap();

        let (private_key, key_type) = km.get_private_key(&key.did).unwrap();
        assert_eq!(private_key, key.private_key);
        assert_eq!(key_type, KeyType::P256);
    }

    #[cfg(feature = "crypto-secp256k1")]
    #[test]
    fn test_get_private_key_secp256k1() {
        let km = AgentKeyManager::new();
        let key = km
            .generate_key(DIDGenerationOptions {
                key_type: KeyType::Secp256k1,
            })
            .unwrap();

        let (private_key, key_type) = km.get_private_key(&key.did).unwrap();
        assert_eq!(private_key, key.private_key);
        assert_eq!(key_type, KeyType::Secp256k1);
    }

    #[test]
    fn test_get_private_key_unknown_did() {
        let km = AgentKeyManager::new();
        let result = km.get_private_key("did:key:nonexistent");
        assert!(result.is_err());
        match result.unwrap_err() {
            Error::KeyNotFound(_) => {} // expected
            other => panic!("Expected KeyNotFound, got: {:?}", other),
        }
    }

    #[tokio::test]
    async fn test_get_private_key_roundtrip() {
        let km = AgentKeyManager::new();
        let key = km
            .generate_key(DIDGenerationOptions {
                key_type: KeyType::Ed25519,
            })
            .unwrap();

        // Export
        let (private_key, key_type) = km.get_private_key(&key.did).unwrap();

        // Reimport
        let (_agent, new_did) = TapAgent::from_private_key(&private_key, key_type, false)
            .await
            .unwrap();

        // Same DID
        assert_eq!(new_did, key.did);
    }
}