@@ -322,6 +322,8 @@ type ThreadSettingsSessionValue = {
322322 readonly setSearchQuery : ( query : string ) => void ;
323323 readonly setShowLegacy : ( showLegacy : boolean ) => void ;
324324 readonly toggleProvider : ( providerKey : string ) => void ;
325+ /** The provider whose catalog for this folder the picker keeps fresh. */
326+ readonly workspaceScan : { readonly instanceId : ProviderInstanceId ; readonly cwd : string } | null ;
325327} ;
326328
327329const ThreadSettingsSessionContext = createContext < ThreadSettingsSessionValue | null > ( null ) ;
@@ -602,8 +604,17 @@ function ThreadSettingsSessionProvider(
602604 ) ;
603605 } ;
604606
607+ const environmentId = props . environmentId ;
608+ // Like the web picker's open tab: scanning every provider would spawn a probe per provider.
609+ const scannedInstanceId =
610+ providerFilter !== null && providerFilter !== FAVORITES_PROVIDER_FILTER
611+ ? ProviderInstanceId . make ( providerFilter )
612+ : props . providerInstanceId ;
613+ const workspaceScan =
614+ props . cwd && scannedInstanceId ? { instanceId : scannedInstanceId , cwd : props . cwd } : null ;
615+
605616 const value = {
606- environmentId : props . environmentId ,
617+ environmentId,
607618 providerInstanceId : props . providerInstanceId ,
608619 providerGroups,
609620 manageHidden,
@@ -635,24 +646,17 @@ function ThreadSettingsSessionProvider(
635646 setShowLegacy : setShowLegacyToggle ,
636647 toggleProvider,
637648 toggleFavorite,
649+ workspaceScan,
638650 } satisfies ThreadSettingsSessionValue ;
639651
640- const environmentId = props . environmentId ;
641- const cwd = props . cwd ;
642- // Like the web picker's open tab: scanning every provider would spawn a probe per provider.
643- const scannedInstanceId =
644- providerFilter !== null && providerFilter !== FAVORITES_PROVIDER_FILTER
645- ? ProviderInstanceId . make ( providerFilter )
646- : props . providerInstanceId ;
647-
648652 return (
649653 < ThreadSettingsSessionContext . Provider value = { value } >
650- { environmentId && cwd && scannedInstanceId ? (
654+ { environmentId && workspaceScan ? (
651655 < ProviderWorkspaceSnapshotScan
652- key = { scannedInstanceId }
656+ key = { workspaceScan . instanceId }
653657 environmentId = { environmentId }
654- instanceId = { scannedInstanceId }
655- cwd = { cwd }
658+ instanceId = { workspaceScan . instanceId }
659+ cwd = { workspaceScan . cwd }
656660 />
657661 ) : null }
658662 { props . children }
@@ -961,11 +965,20 @@ function ThreadSettingsMainContent(props: {
961965 const refreshProviders = ( ) => {
962966 if ( ! session . environmentId || isRefreshingProviders ) return ;
963967 setIsRefreshingProviders ( true ) ;
964- void refreshProviderCatalog ( session . environmentId ) . then ( ( result ) => {
965- setIsRefreshingProviders ( false ) ;
966- const error = providerCatalogRefreshError ( result ) ;
967- if ( error ) Dialog . alert ( "Could not refresh models" , error ) ;
968- } ) ;
968+ const environmentId = session . environmentId ;
969+ const workspaceScan = session . workspaceScan ;
970+ void refreshProviderCatalog ( environmentId )
971+ . then ( ( result ) =>
972+ // A project's own models are read per folder, so the machine refresh alone keeps them stale.
973+ result . _tag === "Success" && workspaceScan
974+ ? refreshProvidersCommand ( { environmentId, input : { ...workspaceScan , fresh : true } } )
975+ : result ,
976+ )
977+ . then ( ( result ) => {
978+ setIsRefreshingProviders ( false ) ;
979+ const error = providerCatalogRefreshError ( result ) ;
980+ if ( error ) Dialog . alert ( "Could not refresh models" , error ) ;
981+ } ) ;
969982 } ;
970983 const [ animationsReady , setAnimationsReady ] = useState ( false ) ;
971984 const catalogItems = buildThreadSettingsCatalogItems ( session ) ;
0 commit comments