@@ -68,6 +68,17 @@ const decodeServerSettings = Schema.decodeSync(ServerSettings);
6868const encodeServerSettings = Schema . encodeSync ( ServerSettings ) ;
6969const encodedDefaultServerSettings = encodeServerSettings ( DEFAULT_SERVER_SETTINGS ) ;
7070
71+ /** Default slots that settings mark disabled, so their probes never spawn. */
72+ const disabledDefaultSlots = (
73+ ...drivers : ReadonlyArray < string >
74+ ) : ContractServerSettings [ "providerInstances" ] =>
75+ Object . fromEntries (
76+ drivers . map ( ( driver ) => [
77+ ProviderInstanceId . make ( driver ) ,
78+ { driver : ProviderDriverKind . make ( driver ) , enabled : false } ,
79+ ] ) ,
80+ ) ;
81+
7182const defaultClaudeSettings : ClaudeSettings = Schema . decodeSync ( ClaudeSettings ) ( { } ) ;
7283const defaultCodexSettings : CodexSettings = Schema . decodeSync ( CodexSettings ) ( { } ) ;
7384const decodeCodexSettings = Schema . decodeSync ( CodexSettings ) ;
@@ -2663,24 +2674,18 @@ it.layer(
26632674 const serverSettings = yield * makeMutableServerSettingsService (
26642675 decodeServerSettings (
26652676 deepMerge ( encodedDefaultServerSettings , {
2666- providers : {
2667- // Disable every built-in probe that would otherwise spawn
2668- // on the CI host. `enabled: false` short-circuits each
2669- // driver's probe *before* it touches the spawner, so the
2670- // test environment stays isolated from the dev
2671- // machine's PATH.
2672- codex : { enabled : false } ,
2673- claudeAgent : { enabled : false } ,
2674- cursor : { enabled : false } ,
2675- grok : { enabled : false } ,
2676- opencode : { enabled : false } ,
2677- } ,
26782677 // `providerInstances` keys are branded `ProviderInstanceId`;
26792678 // the branded index signature rejects plain string literals
26802679 // at the TS level even though the runtime schema happily
26812680 // accepts + decodes them. Cast the patch to `unknown` so
26822681 // the `Schema.decodeSync` below does the real validation.
26832682 providerInstances : {
2683+ // Disable every built-in probe that would otherwise spawn
2684+ // on the CI host. `enabled: false` short-circuits each
2685+ // driver's probe *before* it touches the spawner, so the
2686+ // test environment stays isolated from the dev
2687+ // machine's PATH.
2688+ ...disabledDefaultSlots ( "codex" , "claudeAgent" , "cursor" , "grok" , "opencode" ) ,
26842689 // Matches the shape the user had in `.t3/dev/settings.json`
26852690 // when the bug was reported: a custom enabled Codex instance
26862691 // pointing at a binary the server has to actually spawn.
@@ -2781,12 +2786,13 @@ it.layer(
27812786 const mutableServerSettings = yield * makeMutableServerSettingsService (
27822787 decodeServerSettings (
27832788 deepMerge ( encodedDefaultServerSettings , {
2784- providers : {
2785- codex : { enabled : true , binaryPath : firstMissing } ,
2786- claudeAgent : { enabled : false } ,
2787- cursor : { enabled : false } ,
2788- grok : { enabled : false } ,
2789- opencode : { enabled : false } ,
2789+ providerInstances : {
2790+ ...disabledDefaultSlots ( "claudeAgent" , "cursor" , "grok" , "opencode" ) ,
2791+ [ ProviderInstanceId . make ( "codex" ) ] : {
2792+ driver : ProviderDriverKind . make ( "codex" ) ,
2793+ enabled : true ,
2794+ config : { binaryPath : firstMissing } ,
2795+ } ,
27902796 } ,
27912797 } ) ,
27922798 ) ,
@@ -2871,8 +2877,13 @@ it.layer(
28712877 ) ,
28722878 ) ;
28732879 yield * serverSettings . updateSettings ( {
2874- providers : {
2875- codex : { enabled : true , binaryPath : secondMissing } ,
2880+ providerInstances : {
2881+ ...disabledDefaultSlots ( "claudeAgent" , "cursor" , "grok" , "opencode" ) ,
2882+ [ ProviderInstanceId . make ( "codex" ) ] : {
2883+ driver : ProviderDriverKind . make ( "codex" ) ,
2884+ enabled : true ,
2885+ config : { binaryPath : secondMissing } ,
2886+ } ,
28762887 } ,
28772888 } ) ;
28782889 // Start the lazy stream only after publishing. A watcher that did
@@ -2900,14 +2911,8 @@ it.layer(
29002911 const serverSettings = yield * makeMutableServerSettingsService (
29012912 decodeServerSettings (
29022913 deepMerge ( encodedDefaultServerSettings , {
2903- providers : {
2904- codex : { enabled : false } ,
2905- claudeAgent : { enabled : false } ,
2906- cursor : { enabled : false } ,
2907- grok : { enabled : false } ,
2908- opencode : { enabled : false } ,
2909- } ,
29102914 providerInstances : {
2915+ ...disabledDefaultSlots ( "codex" , "claudeAgent" , "cursor" , "grok" , "opencode" ) ,
29112916 ghost_main : {
29122917 driver : "ghostDriver" ,
29132918 displayName : "A fork-only driver we don't ship" ,
@@ -2971,14 +2976,7 @@ it.layer(
29712976 const serverSettings = yield * makeMutableServerSettingsService (
29722977 decodeServerSettings (
29732978 deepMerge ( encodedDefaultServerSettings , {
2974- providers : {
2975- codex : {
2976- enabled : false ,
2977- } ,
2978- grok : {
2979- enabled : false ,
2980- } ,
2981- } ,
2979+ providerInstances : disabledDefaultSlots ( "codex" , "grok" ) ,
29822980 } ) ,
29832981 ) ,
29842982 ) ;
0 commit comments