@@ -444,6 +444,44 @@ describe("ContextProxy", () => {
444444 expect ( proxy [ "stateWriteOwner" ] . size ) . toBe ( 1 )
445445 } )
446446
447+ it ( "does not let a failed write whose read-back times out hide a secret that refreshSecrets loaded" , async ( ) => {
448+ vi . useFakeTimers ( )
449+ try {
450+ mockSecrets . store . mockRejectedValue ( new Error ( "keychain locked" ) )
451+ await proxy . initialize ( )
452+ let readBackSettles : ( value : string ) => void = ( ) => { }
453+ mockSecrets . get
454+ . mockImplementationOnce ( ( ) => new Promise ( ( resolve ) => ( readBackSettles = resolve ) ) ) // the read-back, queued first
455+ . mockResolvedValue ( "loaded-key" ) // what the refresh reads
456+
457+ const failed = expect ( proxy . storeSecret ( "openAiApiKey" , "new-key" ) ) . rejects . toThrow ( "keychain locked" )
458+ await vi . advanceTimersByTimeAsync ( 0 ) // the store has failed and the read-back has started
459+ await proxy . refreshSecrets ( )
460+ expect ( proxy . getSecret ( "openAiApiKey" ) ) . toBe ( "loaded-key" )
461+ await vi . advanceTimersByTimeAsync ( 5_000 ) // the read-back times out
462+ await failed
463+
464+ expect ( proxy . getSecret ( "openAiApiKey" ) ) . toBe ( "loaded-key" )
465+ expect ( proxy [ "secretWriteOwner" ] . size ) . toBe ( 0 )
466+ readBackSettles ( "late" )
467+ } finally {
468+ vi . useRealTimers ( )
469+ }
470+ } )
471+
472+ it ( "does not replace a secret written while refreshSecrets was reading it" , async ( ) => {
473+ await proxy . initialize ( )
474+ let finishRead : ( value : string ) => void = ( ) => { }
475+ mockSecrets . get . mockImplementationOnce ( ( ) => new Promise ( ( resolve ) => ( finishRead = resolve ) ) )
476+
477+ const refreshing = proxy . refreshSecrets ( )
478+ await proxy . storeSecret ( "openAiApiKey" , "written-key" ) // starts and succeeds during the read
479+ finishRead ( "older-key" )
480+ await refreshing
481+
482+ expect ( proxy . getSecret ( "openAiApiKey" ) ) . toBe ( "written-key" )
483+ } )
484+
447485 it ( "still reports the failure when the secret cannot be read back either" , async ( ) => {
448486 mockSecrets . store . mockRejectedValue ( new Error ( "keychain locked" ) )
449487 await proxy . initialize ( )
0 commit comments