@@ -613,9 +613,9 @@ const layerConfigSources = Layer.mergeAll(
613613 Layer . provideMerge ( NodeServices . layer ) ,
614614) ;
615615
616- it . effect (
617- "starts remote discovery alongside initial config and preserves updates through discovery and ACK" ,
618- ( ) =>
616+ it . effect . each ( [ "pending" , "cached" ] as const ) (
617+ "%s remote discovery preserves initial config and updates through discovery and ACK" ,
618+ ( discovery ) =>
619619 Effect . gen ( function * ( ) {
620620 const keybindings = yield * Keybindings . Keybindings ;
621621 const settings = yield * ServerSettings . ServerSettingsService ;
@@ -653,7 +653,9 @@ it.effect(
653653 Layer . mock ( RemoteOpenTargets . RemoteOpenTargets ) ( {
654654 resolveTargets : ( ) =>
655655 Deferred . succeed ( remoteDiscoveryStarted , undefined ) . pipe (
656- Effect . andThen ( Deferred . await ( finishRemoteDiscovery ) ) ,
656+ Effect . andThen (
657+ discovery === "cached" ? Effect . void : Deferred . await ( finishRemoteDiscovery ) ,
658+ ) ,
657659 Effect . as ( targets ) ,
658660 ) ,
659661 } ) ,
@@ -737,7 +739,7 @@ it.effect(
737739 const snapshot = yield * Queue . take ( responses ) ;
738740 assert . equal ( snapshot . type , "snapshot" ) ;
739741 if ( snapshot . type !== "snapshot" ) return yield * Effect . die ( "Missing initial snapshot" ) ;
740- assert . deepEqual ( snapshot . config . remoteOpenTargets , [ ] ) ;
742+ assert . deepEqual ( snapshot . config . remoteOpenTargets , discovery === "cached" ? targets : [ ] ) ;
741743 assert . isFalse ( snapshot . config . settings . defaultAutoPull ) ;
742744 assert . deepEqual ( snapshot . config . keybindings , initialKeybindings ) ;
743745 const duringAck = yield * keybindings . upsertKeybindingRule ( {
@@ -774,18 +776,20 @@ it.effect(
774776 }
775777 assert . isEmpty ( expectedSettings ) ;
776778 assert . isEmpty ( expectedKeybindings ) ;
777- yield * Deferred . await ( remoteDiscoveryStarted ) ;
778- yield * Deferred . succeed ( finishRemoteDiscovery , undefined ) ;
779- const resolved = yield * Queue . take ( responses ) ;
780- assert . equal ( resolved . type , "snapshot" ) ;
781- if ( resolved . type !== "snapshot" ) return yield * Effect . die ( "Missing remote targets" ) ;
782- assert . deepEqual ( resolved . config . remoteOpenTargets , targets ) ;
783- assert . deepEqual (
784- resolved . config . settings ,
785- ServerSettings . redactServerSettingsForClient ( latestSettings ) ,
786- ) ;
787- assert . deepEqual ( resolved . config . keybindings , latestKeybindings ) ;
788- yield * acknowledge ;
779+ if ( discovery === "pending" ) {
780+ yield * Deferred . await ( remoteDiscoveryStarted ) ;
781+ yield * Deferred . succeed ( finishRemoteDiscovery , undefined ) ;
782+ const resolved = yield * Queue . take ( responses ) ;
783+ assert . equal ( resolved . type , "snapshot" ) ;
784+ if ( resolved . type !== "snapshot" ) return yield * Effect . die ( "Missing remote targets" ) ;
785+ assert . deepEqual ( resolved . config . remoteOpenTargets , targets ) ;
786+ assert . deepEqual (
787+ resolved . config . settings ,
788+ ServerSettings . redactServerSettingsForClient ( latestSettings ) ,
789+ ) ;
790+ assert . deepEqual ( resolved . config . keybindings , latestKeybindings ) ;
791+ yield * acknowledge ;
792+ }
789793 yield * server . write ( 0 , { _tag : "Interrupt" , requestId, interruptors : [ ] } ) ;
790794 } ) . pipe (
791795 Effect . provide (
0 commit comments