@@ -49,6 +49,7 @@ import {
4949 shortcutLabelForCommand ,
5050} from "../../keybindings" ;
5151import {
52+ useClientSettings ,
5253 useEnvironmentModelPreferences ,
5354 useToggleEnvironmentModelFavorite ,
5455} from "~/hooks/useSettings" ;
@@ -190,10 +191,12 @@ function modelJumpLabelsByKey(
190191function ModelPickerProviderNotices ( {
191192 setupEntries,
192193 updateRequiredNotices,
194+ emptyLabel,
193195 onRequestClose,
194196 onOpenProviderSetup,
195197} : {
196198 setupEntries : ReadonlyArray < ProviderInstanceEntry > ;
199+ emptyLabel : string ;
197200 updateRequiredNotices : ReadonlyArray < { instanceId : ProviderInstanceId ; notice : string } > ;
198201 onRequestClose : ( ( ) => void ) | undefined ;
199202 onOpenProviderSetup : ( ( instanceId : ProviderInstanceId ) => void ) | undefined ;
@@ -221,7 +224,7 @@ function ModelPickerProviderNotices({
221224 ) ) }
222225 </ div >
223226 ) : (
224- < ComboboxEmpty className = "empty:h-0" > No models found </ ComboboxEmpty >
227+ < ComboboxEmpty className = "empty:h-0" > { emptyLabel } </ ComboboxEmpty >
225228 ) }
226229 { updateRequiredNotices . map ( ( { instanceId, notice } ) => (
227230 < p
@@ -572,6 +575,9 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
572575
573576 const isLocked = lockedProvider !== null ;
574577 const isSearching = searchQuery . trim ( ) . length > 0 ;
578+ // Inside one provider's tab the provider line repeats the selected rail icon on every row.
579+ const redesign = useClientSettings ( ( s ) => s . redesignEnabled ) ;
580+ const rowsMixProviders = ! redesign || isSearching || selectedInstanceId === "favorites" ;
575581 const lockedDisabledInstanceIds = ( ( ) => {
576582 if ( ! isLocked ) {
577583 return undefined ;
@@ -937,8 +943,10 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
937943 className = "group w-full cursor-pointer"
938944 >
939945 < div className = "min-w-0 flex-1 text-left" >
940- < div className = "text-xs font-medium leading-snug" > Legacy models</ div >
941- < div className = "mt-1 text-xs font-normal leading-snug text-muted-foreground/70" >
946+ < div className = "text-xs font-medium leading-snug redesign:text-sm redesign:font-normal" >
947+ Legacy models
948+ </ div >
949+ < div className = "mt-1 text-xs font-normal leading-snug text-muted-foreground/70 redesign:text-muted-foreground" >
942950 { legacySection . legacyModels . length } models
943951 </ div >
944952 </ div >
@@ -977,8 +985,8 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
977985 ? selectedModelKeySet . has ( modelKey )
978986 : modelKey === activeModelKey
979987 }
980- showSelection = { selectedModelKeys !== undefined }
981- showProvider
988+ showSelection = { selectedModelKeys !== undefined || redesign }
989+ showProvider = { rowsMixProviders || Boolean ( model . subProvider ) }
982990 preferShortName = { ! isLocked }
983991 useTriggerLabel = { false }
984992 showNewBadge = { model . badge === "new" }
@@ -993,6 +1001,11 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
9931001 < ModelPickerProviderNotices
9941002 setupEntries = { providerSetupEntries }
9951003 updateRequiredNotices = { updateRequiredNotices }
1004+ emptyLabel = {
1005+ selectedInstanceId === "favorites" && ! isSearching
1006+ ? "No favorites yet"
1007+ : "No models found"
1008+ }
9961009 onRequestClose = { onRequestClose }
9971010 onOpenProviderSetup = { onOpenProviderSetup }
9981011 />
0 commit comments