@@ -154,6 +154,7 @@ it.effect("resends late editors without rolling back updates already sent", () =
154154 Deferred . await ( settingsSent ) . pipe ( Effect . as ( "file-explorer" as const ) ) ,
155155 } ,
156156 { resolveTargets : ( ) => Effect . succeed ( [ ] ) } ,
157+ { resolve : ( ) => Effect . succeed ( [ ] ) } ,
157158 ) . pipe (
158159 Stream . tap ( ( event ) =>
159160 event . type === "settingsUpdated" ? Deferred . succeed ( settingsSent , undefined ) : Effect . void ,
@@ -185,6 +186,7 @@ it.effect("resends a reveal kind and remote targets that outlast the snapshot ti
185186 resolveFileManagerRevealKind : ( ) => Effect . succeed ( "file-explorer" ) ,
186187 } ,
187188 { resolveTargets : ( ) => Deferred . await ( finishDiscovery ) } ,
189+ { resolve : ( ) => Effect . succeed ( [ ] ) } ,
188190 ) . pipe ( Stream . runCollect , Effect . forkScoped ( { startImmediately : true } ) ) ;
189191 yield * TestClock . adjust ( "6 seconds" ) ;
190192 yield * Deferred . succeed ( finishDiscovery , targets ) ;
@@ -618,8 +620,15 @@ const layerConfigSources = Layer.mergeAll(
618620 Layer . provideMerge ( NodeServices . layer ) ,
619621) ;
620622
621- it . effect . each ( [ "pending" , "cached" ] as const ) (
622- "%s remote discovery preserves initial config and updates through discovery and ACK" ,
623+ it . effect . each ( [
624+ "pending" ,
625+ "cached" ,
626+ "direct-pending" ,
627+ "direct-cached" ,
628+ "direct-failed" ,
629+ "direct-interrupted" ,
630+ ] as const ) (
631+ "%s endpoint discovery preserves initial config and updates through discovery and ACK" ,
623632 ( discovery ) =>
624633 Effect . gen ( function * ( ) {
625634 const keybindings = yield * Keybindings . Keybindings ;
@@ -638,6 +647,15 @@ it.effect.each(["pending", "cached"] as const)(
638647 const remoteDiscoveryStarted = yield * Deferred . make < void > ( ) ;
639648 const finishRemoteDiscovery = yield * Deferred . make < void > ( ) ;
640649 const targets = [ { kind : "mdns" as const , host : "test.local" } ] ;
650+ const direct = discovery . startsWith ( "direct-" ) ;
651+ const bound = [ { kind : "lan" as const , httpBaseUrl : "http://192.168.1.10:3773/" } ] ;
652+ const endpoints = [
653+ ...bound ,
654+ { kind : "tailnet" as const , httpBaseUrl : "https://test.ts.net/" } ,
655+ ] ;
656+ const directStarted = yield * Deferred . make < void > ( ) ;
657+ const finishDirect = yield * Deferred . make < void > ( ) ;
658+ const directStopped = yield * Deferred . make < void > ( ) ;
641659 const responses = yield * Queue . unbounded < ServerConfigStreamEvent > ( ) ;
642660 const configRpcServices = Layer . mergeAll (
643661 layerUnusedConfigRpcServices ,
@@ -659,12 +677,30 @@ it.effect.each(["pending", "cached"] as const)(
659677 resolveTargets : ( ) =>
660678 Deferred . succeed ( remoteDiscoveryStarted , undefined ) . pipe (
661679 Effect . andThen (
662- discovery === "cached" ? Effect . void : Deferred . await ( finishRemoteDiscovery ) ,
680+ discovery === "cached" || direct
681+ ? Effect . void
682+ : Deferred . await ( finishRemoteDiscovery ) ,
663683 ) ,
664684 Effect . as ( targets ) ,
665685 ) ,
666686 } ) ,
667- Layer . mock ( DirectEndpoints . DirectEndpoints ) ( { resolve : ( ) => Effect . succeed ( [ ] ) } ) ,
687+ Layer . mock ( DirectEndpoints . DirectEndpoints ) ( {
688+ resolveAvailable : ( ) => Effect . succeed ( discovery === "direct-cached" ? endpoints : bound ) ,
689+ resolve : ( ) =>
690+ direct
691+ ? Deferred . succeed ( directStarted , undefined ) . pipe (
692+ Effect . andThen (
693+ discovery === "direct-cached" ? Effect . void : Deferred . await ( finishDirect ) ,
694+ ) ,
695+ Effect . andThen (
696+ discovery === "direct-failed"
697+ ? Effect . die ( "probe failed" )
698+ : Effect . succeed ( endpoints ) ,
699+ ) ,
700+ Effect . onExit ( ( ) => Deferred . succeed ( directStopped , undefined ) ) ,
701+ )
702+ : Effect . succeed ( bound ) ,
703+ } ) ,
668704 Layer . mock ( ManagedProjectFolders . ManagedProjectFolders ) ( {
669705 scratchRoot : Effect . succeedNone ,
670706 namedProjectsRoot : process . cwd ( ) ,
@@ -744,7 +780,14 @@ it.effect.each(["pending", "cached"] as const)(
744780 const snapshot = yield * Queue . take ( responses ) ;
745781 assert . equal ( snapshot . type , "snapshot" ) ;
746782 if ( snapshot . type !== "snapshot" ) return yield * Effect . die ( "Missing initial snapshot" ) ;
747- assert . deepEqual ( snapshot . config . remoteOpenTargets , discovery === "cached" ? targets : [ ] ) ;
783+ assert . deepEqual (
784+ snapshot . config . remoteOpenTargets ,
785+ discovery === "cached" || direct ? targets : [ ] ,
786+ ) ;
787+ assert . deepEqual (
788+ snapshot . config . directEndpoints ,
789+ discovery === "direct-cached" ? endpoints : bound ,
790+ ) ;
748791 assert . isFalse ( snapshot . config . settings . defaultAutoPull ) ;
749792 assert . deepEqual ( snapshot . config . keybindings , initialKeybindings ) ;
750793 const duringAck = yield * keybindings . upsertKeybindingRule ( {
@@ -795,7 +838,31 @@ it.effect.each(["pending", "cached"] as const)(
795838 assert . deepEqual ( resolved . config . keybindings , latestKeybindings . keybindings ) ;
796839 yield * acknowledge ;
797840 }
841+ if ( direct ) {
842+ yield * Deferred . await ( directStarted ) ;
843+ if ( discovery === "direct-pending" ) {
844+ yield * Deferred . succeed ( finishDirect , undefined ) ;
845+ const resolved = yield * Queue . take ( responses ) ;
846+ assert . equal ( resolved . type , "snapshot" ) ;
847+ if ( resolved . type !== "snapshot" ) return yield * Effect . die ( "Missing direct endpoints" ) ;
848+ assert . deepEqual ( resolved . config . directEndpoints , endpoints ) ;
849+ assert . deepEqual (
850+ resolved . config . settings ,
851+ ServerSettings . redactServerSettingsForClient ( latestSettings ) ,
852+ ) ;
853+ assert . deepEqual ( resolved . config . keybindings , latestKeybindings . keybindings ) ;
854+ yield * acknowledge ;
855+ } else if ( discovery === "direct-failed" ) {
856+ yield * Deferred . succeed ( finishDirect , undefined ) ;
857+ yield * Deferred . await ( directStopped ) ;
858+ yield * settings . updateSettings ( { defaultAutoPull : false } ) ;
859+ const event = yield * Queue . take ( responses ) ;
860+ assert . equal ( event . type , "settingsUpdated" ) ;
861+ yield * acknowledge ;
862+ }
863+ }
798864 yield * server . write ( 0 , { _tag : "Interrupt" , requestId, interruptors : [ ] } ) ;
865+ if ( direct ) yield * Deferred . await ( directStopped ) ;
799866 } ) . pipe (
800867 Effect . provide (
801868 Layer . mergeAll (
@@ -858,7 +925,10 @@ it.effect("on-demand clients get provider config without workspace snapshots", (
858925 Layer . mock ( RemoteOpenTargets . RemoteOpenTargets ) ( {
859926 resolveTargets : ( ) => Effect . succeed ( [ ] ) ,
860927 } ) ,
861- Layer . mock ( DirectEndpoints . DirectEndpoints ) ( { resolve : ( ) => Effect . succeed ( [ ] ) } ) ,
928+ Layer . mock ( DirectEndpoints . DirectEndpoints ) ( {
929+ resolve : ( ) => Effect . succeed ( [ ] ) ,
930+ resolveAvailable : ( ) => Effect . succeed ( [ ] ) ,
931+ } ) ,
862932 Layer . mock ( ManagedProjectFolders . ManagedProjectFolders ) ( {
863933 scratchRoot : Effect . succeedNone ,
864934 namedProjectsRoot : process . cwd ( ) ,
0 commit comments