@@ -132,6 +132,7 @@ import { OrchestrationEventStoreLive } from "./persistence/Layers/OrchestrationE
132132import { OrchestrationEventStore } from "./persistence/Services/OrchestrationEventStore.ts" ;
133133import { PersistenceSqlError } from "./persistence/Errors.ts" ;
134134import * as ProviderRegistry from "./provider/Services/ProviderRegistry.ts" ;
135+ import * as ModelManifest from "./provider/ModelManifest.ts" ;
135136import * as ProviderService from "./provider/Services/ProviderService.ts" ;
136137import { ProviderAuthService } from "./provider/Services/ProviderAuthService.ts" ;
137138import { ProviderInstanceRegistry } from "./provider/Services/ProviderInstanceRegistry.ts" ;
@@ -142,7 +143,10 @@ import {
142143import type { ProviderInstance } from "./provider/ProviderDriver.ts" ;
143144import * as ProviderSessionDirectory from "./provider/Services/ProviderSessionDirectory.ts" ;
144145import { ProviderAdapterRequestError } from "./provider/Errors.ts" ;
145- import { makeManualOnlyProviderMaintenanceCapabilities } from "./provider/providerMaintenance.ts" ;
146+ import {
147+ makeManualOnlyProviderMaintenanceCapabilities ,
148+ ProviderVersionCache ,
149+ } from "./provider/providerMaintenance.ts" ;
146150import * as ServerLifecycleEvents from "./serverLifecycleEvents.ts" ;
147151import * as ServerRuntimeStartup from "./serverRuntimeStartup.ts" ;
148152import * as ServiceLauncherClient from "./cloud/serviceLauncherClient.ts" ;
@@ -516,6 +520,7 @@ const buildAppUnderTest = (options?: {
516520 keybindings ?: Partial < Keybindings . Keybindings [ "Service" ] > ;
517521 environmentTheme ?: Partial < EnvironmentTheme . EnvironmentThemeService [ "Service" ] > ;
518522 providerRegistry ?: Partial < ProviderRegistry . ProviderRegistry [ "Service" ] > ;
523+ modelManifest ?: Partial < ModelManifest . ModelManifest [ "Service" ] > ;
519524 usageLimitSources ?: Partial < UsageLimitSources . UsageLimitSources [ "Service" ] > ;
520525 providerService ?: Partial < ProviderService . ProviderService [ "Service" ] > ;
521526 providerAuth ?: Partial < ProviderAuthService [ "Service" ] > ;
@@ -790,6 +795,10 @@ const buildAppUnderTest = (options?: {
790795 ) ,
791796 Layer . provide (
792797 Layer . mergeAll (
798+ Layer . mock ( ModelManifest . ModelManifest ) ( {
799+ forceRefresh : Effect . succeed ( ModelManifest . BUNDLED_MODEL_MANIFEST ) ,
800+ ...options ?. layers ?. modelManifest ,
801+ } ) ,
793802 Layer . mock ( ProviderRegistry . ProviderRegistry ) ( {
794803 getProviders : Effect . succeed ( [ ] ) ,
795804 refresh : ( ) => Effect . succeed ( [ ] ) ,
@@ -6337,6 +6346,99 @@ it.layer(NodeServices.layer)("server router seam", (it) => {
63376346 } ) . pipe ( Effect . provide ( NodeHttpServer . layerTest ) ) ,
63386347 ) ;
63396348
6349+ for ( const mode of [ "all" , "targeted" , "background" ] as const ) {
6350+ it . effect ( `provider refresh invalidates T3 caches before probing (${ mode } )` , ( ) => {
6351+ const driver = ProviderDriverKind . make ( "codex" ) ;
6352+ const instanceIds = [ ProviderInstanceId . make ( "codex" ) , ProviderInstanceId . make ( "codex_work" ) ] ;
6353+ const packageNames = [ "@example/personal" , "@example/work" ] ;
6354+ const versionCache = new Map (
6355+ packageNames . map ( ( name ) => [
6356+ name ,
6357+ {
6358+ expiresAt : Number . MAX_SAFE_INTEGER ,
6359+ version : "1.0.0" ,
6360+ } ,
6361+ ] ) ,
6362+ ) ;
6363+ const invalidated : string [ ] = [ ] ;
6364+ const freshMaintenance : string [ ] = [ ] ;
6365+ let manifestRefreshed = false ;
6366+ let probed = false ;
6367+ const instances = instanceIds . map (
6368+ ( instanceId , index ) =>
6369+ ( {
6370+ instanceId,
6371+ driverKind : driver ,
6372+ continuationIdentity : { driverKind : driver , continuationKey : instanceId } ,
6373+ displayName : undefined ,
6374+ enabled : true ,
6375+ invalidateCaches : Effect . sync ( ( ) => {
6376+ invalidated . push ( instanceId ) ;
6377+ } ) ,
6378+ snapshot : {
6379+ resolveMaintenance : ( options ) =>
6380+ Effect . sync ( ( ) => {
6381+ assert . isTrue ( options ?. fresh ) ;
6382+ freshMaintenance . push ( instanceId ) ;
6383+ return makeManualOnlyProviderMaintenanceCapabilities ( {
6384+ provider : driver ,
6385+ packageName : packageNames [ index ] ! ,
6386+ } ) ;
6387+ } ) ,
6388+ getSnapshot : Effect . never ,
6389+ refresh : Effect . never ,
6390+ streamChanges : Stream . empty ,
6391+ applyUsageLimits : ( ) => Effect . void ,
6392+ } ,
6393+ adapter : { } as ProviderInstance [ "adapter" ] ,
6394+ textGeneration : { } as ProviderInstance [ "textGeneration" ] ,
6395+ } ) satisfies ProviderInstance ,
6396+ ) ;
6397+ const expected =
6398+ mode === "background" ? [ ] : mode === "targeted" ? [ instanceIds [ 1 ] ! ] : instanceIds ;
6399+ const probe = Effect . sync ( ( ) => {
6400+ probed = true ;
6401+ assert . equal ( manifestRefreshed , mode !== "background" ) ;
6402+ assert . deepEqual ( invalidated . toSorted ( ) , expected . toSorted ( ) ) ;
6403+ assert . deepEqual ( freshMaintenance . toSorted ( ) , expected . toSorted ( ) ) ;
6404+ for ( let index = 0 ; index < instanceIds . length ; index ++ ) {
6405+ assert . equal (
6406+ versionCache . has ( packageNames [ index ] ! ) ,
6407+ ! expected . includes ( instanceIds [ index ] ! ) ,
6408+ ) ;
6409+ }
6410+ return [ ] ;
6411+ } ) ;
6412+ return Effect . gen ( function * ( ) {
6413+ yield * buildAppUnderTest ( {
6414+ layers : {
6415+ modelManifest : {
6416+ forceRefresh : Effect . sync ( ( ) => {
6417+ manifestRefreshed = true ;
6418+ return ModelManifest . BUNDLED_MODEL_MANIFEST ;
6419+ } ) ,
6420+ } ,
6421+ providerInstanceRegistry : { listInstances : Effect . succeed ( instances ) } ,
6422+ providerRegistry : { refresh : ( ) => probe , refreshInstance : ( ) => probe } ,
6423+ } ,
6424+ } ) ;
6425+ const wsUrl = yield * getWsServerUrl ( "/ws" ) ;
6426+ yield * Effect . scoped (
6427+ withWsRpcClient ( wsUrl , ( client ) =>
6428+ client [ WS_METHODS . serverRefreshProviders ] ( {
6429+ ...( mode === "targeted" ? { instanceId : instanceIds [ 1 ] ! } : { } ) ,
6430+ ...( mode !== "background" ? { refreshModels : true } : { } ) ,
6431+ } ) ,
6432+ ) ,
6433+ ) ;
6434+ assert . isTrue ( probed ) ;
6435+ } ) . pipe (
6436+ Effect . provideService ( ProviderVersionCache , versionCache ) ,
6437+ Effect . provide ( NodeHttpServer . layerTest ) ,
6438+ ) ;
6439+ } ) ;
6440+ }
6441+
63406442 it . effect ( "serves config on reconnect without starting provider probes" , ( ) =>
63416443 Effect . gen ( function * ( ) {
63426444 const refresh = vi . fn ( ( ) => Effect . never ) ;
0 commit comments