@@ -1891,6 +1891,142 @@ it.layer(
18911891 ) ;
18921892 } ) ;
18931893
1894+ it . effect ( "invalidates model caches only for an explicit model refresh" , ( ) =>
1895+ Effect . gen ( function * ( ) {
1896+ const forceRefreshCalls = yield * Ref . make ( 0 ) ;
1897+ const makeInstance = ( name : string ) =>
1898+ Effect . gen ( function * ( ) {
1899+ const driver = ProviderDriverKind . make ( "codex" ) ;
1900+ const instanceId = ProviderInstanceId . make ( name ) ;
1901+ const provider = {
1902+ instanceId,
1903+ driver,
1904+ status : "ready" ,
1905+ enabled : true ,
1906+ installed : true ,
1907+ auth : { status : "authenticated" } ,
1908+ checkedAt : "2026-06-10T00:00:00.000Z" ,
1909+ version : "1.0.0" ,
1910+ models : [ ] ,
1911+ slashCommands : [ ] ,
1912+ skills : [ ] ,
1913+ } as const satisfies ServerProvider ;
1914+ const invalidations = yield * Ref . make ( 0 ) ;
1915+ const maintenanceReads = yield * Ref . make < ReadonlyArray < boolean > > ( [ ] ) ;
1916+ const instance = {
1917+ instanceId,
1918+ driverKind : driver ,
1919+ continuationIdentity : {
1920+ driverKind : driver ,
1921+ continuationKey : `codex:instance:${ name } ` ,
1922+ } ,
1923+ displayName : undefined ,
1924+ enabled : true ,
1925+ snapshot : {
1926+ resolveMaintenance : ( options ) =>
1927+ Ref . update ( maintenanceReads , ( reads ) => [ ...reads , options ?. fresh === true ] ) . pipe (
1928+ Effect . as (
1929+ makeManualOnlyProviderMaintenanceCapabilities ( {
1930+ provider : driver ,
1931+ packageName : `${ name } -package` ,
1932+ } ) ,
1933+ ) ,
1934+ ) ,
1935+ getSnapshot : Effect . succeed ( provider ) ,
1936+ refresh : Effect . succeed ( provider ) ,
1937+ streamChanges : Stream . empty ,
1938+ applyUsageLimits : ( ) => Effect . void ,
1939+ } ,
1940+ invalidateCaches : Ref . update ( invalidations , ( count ) => count + 1 ) ,
1941+ orchestrationAdapter : { } as ProviderInstance [ "orchestrationAdapter" ] ,
1942+ textGeneration : { } as ProviderInstance [ "textGeneration" ] ,
1943+ } satisfies ProviderInstance ;
1944+ const takeMaintenanceReads = Ref . getAndSet ( maintenanceReads , [ ] ) ;
1945+ return { instance, invalidations, takeMaintenanceReads } ;
1946+ } ) ;
1947+ const first = yield * makeInstance ( "codex_first" ) ;
1948+ const second = yield * makeInstance ( "codex_second" ) ;
1949+ const instances = [ first . instance , second . instance ] ;
1950+ const layerInstanceRegistry = Layer . succeed (
1951+ ProviderInstanceRegistry . ProviderInstanceRegistry ,
1952+ {
1953+ getInstance : ( instanceId ) =>
1954+ Effect . succeed ( instances . find ( ( instance ) => instance . instanceId === instanceId ) ) ,
1955+ listInstances : Effect . succeed ( instances ) ,
1956+ listUnavailable : Effect . succeed ( [ ] ) ,
1957+ streamChanges : Stream . empty ,
1958+ subscribeChanges : Effect . flatMap ( PubSub . unbounded < void > ( ) , PubSub . subscribe ) ,
1959+ } ,
1960+ ) ;
1961+ const layerModelManifest = Layer . succeed ( ModelManifest . ModelManifest , {
1962+ current : Effect . succeed ( ModelManifest . BUNDLED_MODEL_MANIFEST ) ,
1963+ refresh : Effect . succeed ( ModelManifest . BUNDLED_MODEL_MANIFEST ) ,
1964+ forceRefresh : Ref . update ( forceRefreshCalls , ( count ) => count + 1 ) . pipe (
1965+ Effect . as ( ModelManifest . BUNDLED_MODEL_MANIFEST ) ,
1966+ ) ,
1967+ refreshInBackground : Effect . void ,
1968+ } ) ;
1969+ const layerLatestVersions = Layer . effect (
1970+ ProviderLatestVersions . ProviderLatestVersions ,
1971+ ProviderLatestVersions . make ( [
1972+ [ "codex_first-package" , "1.0.0" ] ,
1973+ [ "codex_second-package" , "1.0.0" ] ,
1974+ ] ) ,
1975+ ) ;
1976+ const readCachedVersion = ( key : string ) =>
1977+ ProviderLatestVersions . ProviderLatestVersions . use ( ( latestVersions ) =>
1978+ latestVersions . cached ( key , Effect . succeed ( "2.0.0" ) ) ,
1979+ ) ;
1980+
1981+ yield * Effect . gen ( function * ( ) {
1982+ const registry = yield * ProviderRegistry . ProviderRegistry ;
1983+
1984+ yield * registry . refreshInstance ( first . instance . instanceId ) ;
1985+ yield * registry . refresh ( ) ;
1986+ assert . strictEqual ( yield * Ref . get ( forceRefreshCalls ) , 0 ) ;
1987+ assert . strictEqual ( yield * Ref . get ( first . invalidations ) , 0 ) ;
1988+ assert . strictEqual ( yield * readCachedVersion ( "codex_first-package" ) , "1.0.0" ) ;
1989+ yield * first . takeMaintenanceReads ;
1990+
1991+ yield * registry . invalidateModelCaches ( { instanceId : first . instance . instanceId } ) ;
1992+ // The instance refresh that follows resolves installer metadata fresh itself.
1993+ assert . deepStrictEqual ( yield * first . takeMaintenanceReads , [ false ] ) ;
1994+ assert . strictEqual ( yield * Ref . get ( forceRefreshCalls ) , 1 ) ;
1995+ assert . strictEqual ( yield * Ref . get ( first . invalidations ) , 1 ) ;
1996+ assert . strictEqual ( yield * Ref . get ( second . invalidations ) , 0 ) ;
1997+ assert . strictEqual ( yield * readCachedVersion ( "codex_first-package" ) , "2.0.0" ) ;
1998+ assert . strictEqual ( yield * readCachedVersion ( "codex_second-package" ) , "1.0.0" ) ;
1999+
2000+ yield * registry . invalidateModelCaches ( { } ) ;
2001+ assert . strictEqual ( yield * Ref . get ( first . invalidations ) , 2 ) ;
2002+ assert . strictEqual ( yield * Ref . get ( second . invalidations ) , 1 ) ;
2003+ assert . strictEqual ( yield * readCachedVersion ( "codex_second-package" ) , "2.0.0" ) ;
2004+ yield * first . takeMaintenanceReads ;
2005+
2006+ // Only a cached workspace refresh leaves the fresh resolution to this call.
2007+ const workspace = { instanceId : first . instance . instanceId , cwd : process . cwd ( ) } ;
2008+ yield * registry . invalidateModelCaches ( workspace ) ;
2009+ assert . deepStrictEqual ( yield * first . takeMaintenanceReads , [ true ] ) ;
2010+ yield * registry . invalidateModelCaches ( { ...workspace , fresh : true } ) ;
2011+ assert . deepStrictEqual ( yield * first . takeMaintenanceReads , [ false ] ) ;
2012+ } ) . pipe (
2013+ Effect . provide (
2014+ ProviderRegistry . layer . pipe (
2015+ Layer . provideMerge ( layerInstanceRegistry ) ,
2016+ Layer . provideMerge ( layerModelManifest ) ,
2017+ Layer . provideMerge ( layerLatestVersions ) ,
2018+ Layer . provideMerge (
2019+ ServerConfig . layerTest ( process . cwd ( ) , {
2020+ prefix : "t3-provider-registry-model-cache-" ,
2021+ } ) ,
2022+ ) ,
2023+ Layer . provideMerge ( NodeServices . layer ) ,
2024+ ) ,
2025+ ) ,
2026+ ) ;
2027+ } ) ,
2028+ ) ;
2029+
18942030 it . effect ( "does not run provider probes during layer construction" , ( ) =>
18952031 Effect . gen ( function * ( ) {
18962032 const codexDriver = ProviderDriverKind . make ( "codex" ) ;
0 commit comments