@@ -28,6 +28,7 @@ import {
2828 ProviderDriverKind ,
2929 ProviderInstanceId ,
3030 ServerSettings ,
31+ ServerSettingsError ,
3132 ServerProvider ,
3233 type ServerProviderSlashCommand ,
3334 type ServerSettings as ContractServerSettings ,
@@ -3414,6 +3415,149 @@ it.layer(
34143415 } ) ,
34153416 ) ;
34163417
3418+ const startupSettings = ( instanceId ?: string ) =>
3419+ decodeServerSettings ( {
3420+ ...encodedDefaultServerSettings ,
3421+ providerInstances : {
3422+ ...disabledDefaultSlots (
3423+ "codex" ,
3424+ "claudeAgent" ,
3425+ "cursor" ,
3426+ "grok" ,
3427+ "opencode" ,
3428+ "antigravity" ,
3429+ "pi" ,
3430+ "muse" ,
3431+ ) ,
3432+ ...( instanceId ? { [ instanceId ] : { driver : "ghostDriver" } } : { } ) ,
3433+ } ,
3434+ } ) ;
3435+
3436+ const hydrateDuringSettingsChange = Effect . fnUntraced ( function * ( input : {
3437+ seed : ContractServerSettings ;
3438+ saved : ContractServerSettings ;
3439+ current : ContractServerSettings ;
3440+ failCurrentRead ?: boolean ;
3441+ } ) {
3442+ const changes = yield * PubSub . unbounded < ContractServerSettings | undefined > ( ) ;
3443+ const consume = yield * Deferred . make < void > ( ) ;
3444+ const drained : Array < Deferred . Deferred < void > > = [ ] ;
3445+ let readSeed = true ;
3446+ let failCurrentRead = false ;
3447+ const settings = yield * makeMutableServerSettingsService ( input . current ) ;
3448+ const serverSettings = {
3449+ ...settings ,
3450+ getSettings : Effect . suspend ( ( ) => {
3451+ if ( ! readSeed ) {
3452+ readSeed = true ;
3453+ return PubSub . publish ( changes , input . saved ) . pipe ( Effect . as ( input . seed ) ) ;
3454+ }
3455+ return failCurrentRead
3456+ ? Effect . fail (
3457+ new ServerSettingsError ( {
3458+ settingsPath : "<memory>" ,
3459+ operation : "read-secret" ,
3460+ cause : new Error ( "secret materialization failed" ) ,
3461+ } ) ,
3462+ )
3463+ : settings . getSettings ;
3464+ } ) ,
3465+ streamChanges : Stream . empty ,
3466+ subscribeChanges : Effect . gen ( function * ( ) {
3467+ const subscription = yield * PubSub . subscribe ( changes ) ;
3468+ const done = yield * Deferred . make < void > ( ) ;
3469+ drained . push ( done ) ;
3470+ // The terminal marker acknowledges preceding reconciles, including no-op/failed reads.
3471+ return Stream . fromEffectRepeat (
3472+ Deferred . await ( consume ) . pipe ( Effect . andThen ( PubSub . take ( subscription ) ) ) ,
3473+ ) . pipe (
3474+ Stream . takeWhile ( ( next ) : next is ContractServerSettings => next !== undefined ) ,
3475+ Stream . ensuring ( Deferred . succeed ( done , undefined ) ) ,
3476+ ) ;
3477+ } ) ,
3478+ } satisfies ServerSettingsModule . ServerSettingsService [ "Service" ] ;
3479+ const dependencies = yield * Layer . build (
3480+ Layer . mergeAll (
3481+ AntigravityInstallation . AntigravityInstallation . layer ,
3482+ ServerSecretStore . layer ,
3483+ OpenCodeRuntime . layer . pipe ( Layer . provide ( OpenCodeServerLedger . layerTest ) ) ,
3484+ ) . pipe (
3485+ Layer . provideMerge (
3486+ Layer . succeed ( ServerSettingsModule . ServerSettingsService , serverSettings ) ,
3487+ ) ,
3488+ Layer . provideMerge (
3489+ ServerConfig . layerTest ( process . cwd ( ) , { prefix : "t3-provider-registry-" } ) ,
3490+ ) ,
3491+ Layer . provideMerge ( layerTestHttpClient ) ,
3492+ Layer . provideMerge (
3493+ Layer . succeed (
3494+ ProviderEventLoggers . ProviderEventLoggers ,
3495+ ProviderEventLoggers . NoOpProviderEventLoggers ,
3496+ ) ,
3497+ ) ,
3498+ Layer . provideMerge ( ProviderLatestVersions . layer ) ,
3499+ Layer . provideMerge ( McpProviderSessions . layer ) ,
3500+ Layer . provideMerge ( ResetCreditCoordinator . layerTest ) ,
3501+ Layer . provideMerge ( layerBackgroundPolicyAlwaysRun ) ,
3502+ ) ,
3503+ ) ;
3504+ readSeed = false ;
3505+ const services = yield * Layer . build ( ProviderInstanceRegistryHydration . layer ) . pipe (
3506+ Effect . provide ( dependencies ) ,
3507+ ) ;
3508+ failCurrentRead = input . failCurrentRead ?? false ;
3509+ yield * PubSub . publish ( changes , undefined ) ;
3510+ yield * Deferred . succeed ( consume , undefined ) ;
3511+ yield * Effect . forEach ( drained , Deferred . await ) ;
3512+ const registry = yield * ProviderInstanceRegistry . ProviderInstanceRegistry . pipe (
3513+ Effect . provide ( services ) ,
3514+ ) ;
3515+ return ( yield * registry . listUnavailable ) . map (
3516+ ( provider ) : string | undefined => provider . instanceId ,
3517+ ) ;
3518+ } ) ;
3519+
3520+ it . effect ( "applies a settings change saved while the provider registry starts" , ( ) =>
3521+ Effect . gen ( function * ( ) {
3522+ const saved = startupSettings ( "ghost_late" ) ;
3523+ const unavailable = yield * hydrateDuringSettingsChange ( {
3524+ seed : startupSettings ( ) ,
3525+ saved,
3526+ current : saved ,
3527+ } ) ;
3528+ assert . include ( unavailable , "ghost_late" ) ;
3529+ } ) ,
3530+ ) ;
3531+
3532+ it . effect ( "does not apply a queued settings change older than the registry seed" , ( ) =>
3533+ Effect . gen ( function * ( ) {
3534+ const seed = startupSettings ( "ghost_current" ) ;
3535+ const unavailable = yield * hydrateDuringSettingsChange ( {
3536+ seed,
3537+ saved : startupSettings ( "ghost_stale" ) ,
3538+ current : seed ,
3539+ } ) ;
3540+ assert . include ( unavailable , "ghost_current" ) ;
3541+ assert . notInclude ( unavailable , "ghost_stale" ) ;
3542+ } ) ,
3543+ ) ;
3544+
3545+ it . effect (
3546+ "retains the newer registry seed when a queued stale change cannot read current settings" ,
3547+ ( ) =>
3548+ Effect . gen ( function * ( ) {
3549+ const seed = startupSettings ( "ghost_current" ) ;
3550+ const unavailable = yield * hydrateDuringSettingsChange ( {
3551+ seed,
3552+ saved : startupSettings ( "ghost_stale" ) ,
3553+ current : seed ,
3554+ failCurrentRead : true ,
3555+ } ) ;
3556+ assert . include ( unavailable , "ghost_current" ) ;
3557+ assert . notInclude ( unavailable , "ghost_stale" ) ;
3558+ } ) ,
3559+ ) ;
3560+
34173561 it . effect (
34183562 "keeps Cursor disabled and skips provider probing when settings use their defaults" ,
34193563 ( ) =>
0 commit comments