@@ -1478,6 +1478,143 @@ it.layer(
14781478 ) ;
14791479 } ) ;
14801480
1481+ it . effect ( "invalidates model caches only for an explicit model refresh" , ( ) =>
1482+ Effect . gen ( function * ( ) {
1483+ const forceRefreshCalls = yield * Ref . make ( 0 ) ;
1484+ const makeInstance = ( name : string ) =>
1485+ Effect . gen ( function * ( ) {
1486+ const driver = ProviderDriverKind . make ( "codex" ) ;
1487+ const instanceId = ProviderInstanceId . make ( name ) ;
1488+ const provider = {
1489+ instanceId,
1490+ driver,
1491+ status : "ready" ,
1492+ enabled : true ,
1493+ installed : true ,
1494+ auth : { status : "authenticated" } ,
1495+ checkedAt : "2026-06-10T00:00:00.000Z" ,
1496+ version : "1.0.0" ,
1497+ models : [ ] ,
1498+ slashCommands : [ ] ,
1499+ skills : [ ] ,
1500+ } as const satisfies ServerProvider ;
1501+ const invalidations = yield * Ref . make ( 0 ) ;
1502+ const maintenanceReads = yield * Ref . make < ReadonlyArray < boolean > > ( [ ] ) ;
1503+ const instance = {
1504+ instanceId,
1505+ driverKind : driver ,
1506+ continuationIdentity : {
1507+ driverKind : driver ,
1508+ continuationKey : `codex:instance:${ name } ` ,
1509+ } ,
1510+ displayName : undefined ,
1511+ enabled : true ,
1512+ snapshot : {
1513+ resolveMaintenance : ( options ) =>
1514+ Ref . update ( maintenanceReads , ( reads ) => [ ...reads , options ?. fresh === true ] ) . pipe (
1515+ Effect . as (
1516+ makeManualOnlyProviderMaintenanceCapabilities ( {
1517+ provider : driver ,
1518+ packageName : `${ name } -package` ,
1519+ } ) ,
1520+ ) ,
1521+ ) ,
1522+ getSnapshot : Effect . succeed ( provider ) ,
1523+ refresh : Effect . succeed ( provider ) ,
1524+ streamChanges : Stream . empty ,
1525+ applyUsageLimits : ( ) => Effect . void ,
1526+ } ,
1527+ invalidateCaches : Ref . update ( invalidations , ( count ) => count + 1 ) ,
1528+ orchestrationAdapter : { } as ProviderInstance [ "orchestrationAdapter" ] ,
1529+ textGeneration : { } as ProviderInstance [ "textGeneration" ] ,
1530+ } satisfies ProviderInstance ;
1531+ const takeMaintenanceReads = Ref . getAndSet ( maintenanceReads , [ ] ) ;
1532+ return { instance, invalidations, takeMaintenanceReads } ;
1533+ } ) ;
1534+ const first = yield * makeInstance ( "codex_first" ) ;
1535+ const second = yield * makeInstance ( "codex_second" ) ;
1536+ const instances = [ first . instance , second . instance ] ;
1537+ const layerInstanceRegistry = Layer . succeed (
1538+ ProviderInstanceRegistry . ProviderInstanceRegistry ,
1539+ {
1540+ getInstance : ( instanceId ) =>
1541+ Effect . succeed ( instances . find ( ( instance ) => instance . instanceId === instanceId ) ) ,
1542+ listInstances : Effect . succeed ( instances ) ,
1543+ listUnavailable : Effect . succeed ( [ ] ) ,
1544+ streamChanges : Stream . empty ,
1545+ subscribeChanges : Effect . flatMap ( PubSub . unbounded < void > ( ) , PubSub . subscribe ) ,
1546+ } ,
1547+ ) ;
1548+ const layerModelManifest = Layer . succeed ( ModelManifest . ModelManifest , {
1549+ current : Effect . succeed ( ModelManifest . BUNDLED_MODEL_MANIFEST ) ,
1550+ refresh : Effect . succeed ( ModelManifest . BUNDLED_MODEL_MANIFEST ) ,
1551+ forceRefresh : Ref . update ( forceRefreshCalls , ( count ) => count + 1 ) . pipe (
1552+ Effect . as ( ModelManifest . BUNDLED_MODEL_MANIFEST ) ,
1553+ ) ,
1554+ refreshInBackground : Effect . void ,
1555+ } ) ;
1556+ const layerLatestVersions = Layer . effect (
1557+ ProviderLatestVersions . ProviderLatestVersions ,
1558+ ProviderLatestVersions . make ( [
1559+ [ "codex_first-package" , "1.0.0" ] ,
1560+ [ "codex_second-package" , "1.0.0" ] ,
1561+ ] ) ,
1562+ ) ;
1563+ const readCachedVersion = ( key : string ) =>
1564+ ProviderLatestVersions . ProviderLatestVersions . use ( ( latestVersions ) =>
1565+ latestVersions . cached ( key , Effect . succeed ( "2.0.0" ) ) ,
1566+ ) ;
1567+
1568+ yield * Effect . gen ( function * ( ) {
1569+ const registry = yield * ProviderRegistry . ProviderRegistry ;
1570+
1571+ yield * registry . refreshInstance ( first . instance . instanceId ) ;
1572+ yield * registry . refresh ( ) ;
1573+ assert . strictEqual ( yield * Ref . get ( forceRefreshCalls ) , 0 ) ;
1574+ assert . strictEqual ( yield * Ref . get ( first . invalidations ) , 0 ) ;
1575+ assert . strictEqual ( yield * readCachedVersion ( "codex_first-package" ) , "1.0.0" ) ;
1576+ yield * first . takeMaintenanceReads ;
1577+
1578+ yield * registry . invalidateModelCaches ( { instanceId : first . instance . instanceId } ) ;
1579+ // The instance refresh that follows resolves installer metadata fresh itself.
1580+ assert . deepStrictEqual ( yield * first . takeMaintenanceReads , [ false ] ) ;
1581+ assert . strictEqual ( yield * Ref . get ( forceRefreshCalls ) , 1 ) ;
1582+ assert . strictEqual ( yield * Ref . get ( first . invalidations ) , 1 ) ;
1583+ assert . strictEqual ( yield * Ref . get ( second . invalidations ) , 0 ) ;
1584+ assert . strictEqual ( yield * readCachedVersion ( "codex_first-package" ) , "2.0.0" ) ;
1585+ assert . strictEqual ( yield * readCachedVersion ( "codex_second-package" ) , "1.0.0" ) ;
1586+
1587+ yield * registry . invalidateModelCaches ( { } ) ;
1588+ assert . strictEqual ( yield * Ref . get ( first . invalidations ) , 2 ) ;
1589+ assert . strictEqual ( yield * Ref . get ( second . invalidations ) , 1 ) ;
1590+ assert . strictEqual ( yield * readCachedVersion ( "codex_second-package" ) , "2.0.0" ) ;
1591+ yield * first . takeMaintenanceReads ;
1592+
1593+ // Only a cached workspace refresh leaves the fresh resolution to this call.
1594+ const workspace = { instanceId : first . instance . instanceId , cwd : process . cwd ( ) } ;
1595+ yield * registry . invalidateModelCaches ( workspace ) ;
1596+ assert . deepStrictEqual ( yield * first . takeMaintenanceReads , [ true ] ) ;
1597+ yield * registry . invalidateModelCaches ( { ...workspace , fresh : true } ) ;
1598+ assert . deepStrictEqual ( yield * first . takeMaintenanceReads , [ false ] ) ;
1599+ } ) . pipe (
1600+ Effect . provide (
1601+ ProviderRegistry . layer . pipe (
1602+ Layer . provideMerge ( layerInstanceRegistry ) ,
1603+ Layer . provideMerge ( layerModelManifest ) ,
1604+ Layer . provideMerge ( layerLatestVersions ) ,
1605+ Layer . provide ( layerUnusedMutator ) ,
1606+ Layer . provideMerge (
1607+ ServerConfig . layerTest ( process . cwd ( ) , {
1608+ prefix : "t3-provider-registry-model-cache-" ,
1609+ } ) ,
1610+ ) ,
1611+ Layer . provideMerge ( NodeServices . layer ) ,
1612+ ) ,
1613+ ) ,
1614+ ) ;
1615+ } ) ,
1616+ ) ;
1617+
14811618 it . effect (
14821619 "a second request for a cwd being scanned gets its result, even if the first leaves" ,
14831620 ( ) =>
0 commit comments