Model picker UI Improvements, Virtualize Model List#3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusmarminge merged 5 commits into from
Jun 10, 2026
Merged

Model picker UI Improvements, Virtualize Model List #3021

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c02784
feat(web): redesign model picker rail, favorites, and locked-provider…
juliusmarminge Jun 9, 2026
f0cb4c1
Improve model picker disabled states and layout
juliusmarminge Jun 10, 2026
3302ad7
Switch model picker to virtualized legend list
juliusmarminge Jun 10, 2026
f558f91
rm
juliusmarminge Jun 10, 2026
fac4c4a
Keep model picker favorites rows in sync
juliusmarminge Jun 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions apps/web/src/components/ChatView.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3597,6 +3597,23 @@ export default function ChatView(props: ChatViewProps) {
composerRef,
]);

const getModelDisabledReason = useCallback(
(instanceId: ProviderInstanceId, model: string): string | null => {
if (!activeThread) {
return null;
}
const reason = getStartedThreadModelChangeBlockReason({
providers: providerStatuses,
hasStartedSession: activeThread.session !== null,
currentModelSelection: activeThread.modelSelection,
currentProviderInstanceId: activeThread.session?.providerInstanceId ?? null,
nextModelSelection: { instanceId, model },
});
return reason ? `${reason.description} Start a new thread to use this model.` : null;
},
[activeThread, providerStatuses],
);

const onProviderModelSelect = useCallback(
(instanceId: ProviderInstanceId, model: string) => {
if (!activeThread) return;
Expand DownExpand Up@@ -3915,6 +3932,7 @@ export default function ChatView(props: ChatViewProps) {
onChangeActivePendingUserInputCustomAnswer
}
onProviderModelSelect={onProviderModelSelect}
getModelDisabledReason={getModelDisabledReason}
toggleInteractionMode={toggleInteractionMode}
handleRuntimeModeChange={handleRuntimeModeChange}
handleInteractionModeChange={handleInteractionModeChange}
Expand Down
3 changes: 3 additions & 0 deletions apps/web/src/components/chat/ChatComposer.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,7 @@ export interface ChatComposerProps {
) => void;

onProviderModelSelect: (instanceId: ProviderInstanceId, model: string) => void;
getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
toggleInteractionMode: () => void;
handleRuntimeModeChange: (mode: RuntimeMode) => void;
handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -544,6 +545,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
onPreviousActivePendingUserInputQuestion,
onChangeActivePendingUserInputCustomAnswer,
onProviderModelSelect,
getModelDisabledReason,
toggleInteractionMode,
handleRuntimeModeChange,
handleInteractionModeChange,
Expand DownExpand Up@@ -2328,6 +2330,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
onOpenChange={(open) => {
setIsComposerModelPickerOpen(open);
}}
getModelDisabledReason={getModelDisabledReason}
onInstanceModelChange={onProviderModelSelect}
/>

Expand Down
141 changes: 79 additions & 62 deletions apps/web/src/components/chat/ModelListRow.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import { memo } from "react";
import { StarIcon } from "lucide-react";
import { CheckIcon, StarIcon } from "lucide-react";
import {
getDisplayModelName,
getTriggerDisplayModelLabel,
Expand All@@ -27,97 +27,114 @@ export const ModelListRow = memo(function ModelListRow(props: {
providerDisplayName: string;
providerAccentColor?: string | undefined;
isFavorite: boolean;
isSelected: boolean;
showProvider: boolean;
preferShortName?: boolean;
useTriggerLabel?: boolean;
showNewBadge?: boolean;
jumpLabel?: string | null;
disabledReason?: string | null;
onToggleFavorite: () => void;
}) {
const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.driverKind] ?? null;
const providerLabel = props.model.subProvider
? `${props.providerDisplayName} · ${props.model.subProvider}`
: props.providerDisplayName;

return (
const row = (
<ComboboxItem
hideIndicator
index={props.index}
value={`${props.instanceId}:${props.model.slug}`}
contentClassName="flex w-full items-start gap-2"
disabled={Boolean(props.disabledReason)}
contentClassName="flex w-full items-center gap-3"
className={cn(
"w-full cursor-pointer rounded px-3 py-2 transition-colors group",
"data-highlighted:bg-muted data-selected:bg-accent data-selected:text-foreground",
"group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2.5 transition-[background-color,box-shadow,color]",
"data-highlighted:bg-muted/56 data-selected:bg-transparent data-selected:text-foreground data-selected:ring-0",
props.disabledReason &&
"data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
)}
>
<Tooltip>
<TooltipTrigger
render={
<button
className="mt-0.5 shrink-0 cursor-pointer opacity-40 transition-opacity group-hover:opacity-100"
onClick={(event) => {
event.stopPropagation();
props.onToggleFavorite();
}}
onKeyDown={(event) => {
event.stopPropagation();
}}
type="button"
aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
>
<StarIcon
className={cn("size-4", props.isFavorite && "fill-current text-yellow-500")}
/>
</button>
}
/>
<TooltipPopup side="top" align="center">
{props.isFavorite ? "Remove from favorites" : "Add to favorites"}
</TooltipPopup>
</Tooltip>

<div className="min-w-0 flex-1 text-left">
<div className="flex items-center justify-between gap-2 min-w-0">
<div className="text-xs font-medium leading-snug flex items-center gap-2 min-w-0">
<span className="truncate">
{props.useTriggerLabel
? getTriggerDisplayModelLabel(props.model)
: getDisplayModelName(
props.model,
props.preferShortName ? { preferShortName: true } : undefined,
)}
</span>
{props.showNewBadge ? (
<span
className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
aria-label="New model"
>
New
</span>
) : null}
<div className="flex min-w-0 items-center gap-2">
<div className="min-w-0 truncate text-xs font-medium leading-snug">
{props.useTriggerLabel
? getTriggerDisplayModelLabel(props.model)
: getDisplayModelName(
props.model,
props.preferShortName ? { preferShortName: true } : undefined,
)}
</div>
{props.jumpLabel ? (
<Kbd className="h-4 min-w-0 shrink-0 rounded-sm px-1.5 text-[10px]">
{props.jumpLabel}
</Kbd>
{props.isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
{props.showNewBadge ? (
<span
className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
aria-label="New model"
>
New
</span>
) : null}
</div>
{props.showProvider && (
<div className="flex items-center gap-1 mt-0.5">
<div className="mt-1 flex items-center gap-1.5">
{ProviderIcon ? <ProviderIcon className="size-3 shrink-0" /> : null}
{props.providerAccentColor ? (
<span
className="size-1.5 shrink-0 rounded-full"
style={{ backgroundColor: props.providerAccentColor }}
aria-hidden
/>
) : null}
<span className="text-xs font-normal leading-snug text-muted-foreground/70 truncate">
<span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
{providerLabel}
</span>
</div>
)}
</div>

<div className="flex shrink-0 items-center gap-1.5">
{props.jumpLabel ? (
<Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
) : null}
<Tooltip>
<TooltipTrigger
render={
<button
className={cn(
"relative -mr-1 flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-64 transition-[background-color,color,opacity] hover:bg-background/70 hover:text-foreground hover:opacity-100 group-hover:opacity-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11",
props.isFavorite && "text-foreground opacity-100",
)}
onClick={(event) => {
event.stopPropagation();
props.onToggleFavorite();
}}
onKeyDown={(event) => {
event.stopPropagation();
}}
disabled={Boolean(props.disabledReason)}

@cursorcursorBotJun 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Favorite star blocked on disabled rows

Medium Severity

Rows blocked by getModelDisabledReason still appear in the list, but the favorite control is disabled whenever disabledReason is set. Favoriting only updates settings and does not change the thread model, so users in a started thread cannot favorite other visible models they are blocked from selecting until they start a new thread.

Fix in CursorFix in Web

Reviewed by Cursor Bugbot for commit f0cb4c1. Configure here.

type="button"
aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
>
<StarIcon
className={cn(
"size-3.5 sm:size-3",
props.isFavorite && "fill-current text-yellow-500",
)}
/>
</button>
}
/>
<TooltipPopup side="top" align="center">
{props.isFavorite ? "Remove from favorites" : "Add to favorites"}
</TooltipPopup>
</Tooltip>
</div>
</ComboboxItem>
);

if (!props.disabledReason) {
return row;
}

return (
<Tooltip>
<TooltipTrigger render={row} />
<TooltipPopup side="left" align="center" className="max-w-64 text-balance leading-snug">
{props.disabledReason}
</TooltipPopup>
</Tooltip>
);
});
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Model picker UI Improvements, Virtualize Model List#3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 5 commits into

from

Jun 10, 2026
 Merged


Model picker UI Improvements, Virtualize Model List
#3021
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4c02784

feat(web): redesign model picker rail, favorites, and locked-provider…


juliusmarminge Jun 9, 2026
f0cb4c1

Improve model picker disabled states and layout


juliusmarminge Jun 10, 2026
3302ad7

Switch model picker to virtualized legend list


juliusmarminge Jun 10, 2026
f558f91

rm


juliusmarminge Jun 10, 2026
fac4c4a

Keep model picker favorites rows in sync


juliusmarminge Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3597,6 +3597,23 @@ export default function ChatView(props: ChatViewProps) {
 composerRef,
 ]);

 const getModelDisabledReason = useCallback(
 (instanceId: ProviderInstanceId, model: string): string | null => {
 if (!activeThread) {
 return null;
 }
 const reason = getStartedThreadModelChangeBlockReason({
 providers: providerStatuses,
 hasStartedSession: activeThread.session !== null,
 currentModelSelection: activeThread.modelSelection,
 currentProviderInstanceId: activeThread.session?.providerInstanceId ?? null,
 nextModelSelection: { instanceId, model },
 });
 return reason ? `${reason.description} Start a new thread to use this model.` : null;
 },
 [activeThread, providerStatuses],
 );

 const onProviderModelSelect = useCallback(
 (instanceId: ProviderInstanceId, model: string) => {
 if (!activeThread) return;
Expand DownExpand Up@@ -3915,6 +3932,7 @@ export default function ChatView(props: ChatViewProps) {
 onChangeActivePendingUserInputCustomAnswer
 }
 onProviderModelSelect={onProviderModelSelect}
 getModelDisabledReason={getModelDisabledReason}
 toggleInteractionMode={toggleInteractionMode}
 handleRuntimeModeChange={handleRuntimeModeChange}
 handleInteractionModeChange={handleInteractionModeChange}
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,7 @@ export interface ChatComposerProps {
 ) => void;

 onProviderModelSelect: (instanceId: ProviderInstanceId, model: string) => void;
 getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
 toggleInteractionMode: () => void;
 handleRuntimeModeChange: (mode: RuntimeMode) => void;
 handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -544,6 +545,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onPreviousActivePendingUserInputQuestion,
 onChangeActivePendingUserInputCustomAnswer,
 onProviderModelSelect,
 getModelDisabledReason,
 toggleInteractionMode,
 handleRuntimeModeChange,
 handleInteractionModeChange,
Expand DownExpand Up@@ -2328,6 +2330,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onOpenChange={(open) => {
 setIsComposerModelPickerOpen(open);
 }}
 getModelDisabledReason={getModelDisabledReason}
 onInstanceModelChange={onProviderModelSelect}
 />

Expand Down

141 changes: 79 additions & 62 deletions
apps/web/src/components/chat/ModelListRow.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import { memo } from "react";
import { StarIcon } from "lucide-react";
import { CheckIcon, StarIcon } from "lucide-react";
import {
 getDisplayModelName,
 getTriggerDisplayModelLabel,
Expand All@@ -27,97 +27,114 @@ export const ModelListRow = memo(function ModelListRow(props: {
 providerDisplayName: string;
 providerAccentColor?: string | undefined;
 isFavorite: boolean;
 isSelected: boolean;
 showProvider: boolean;
 preferShortName?: boolean;
 useTriggerLabel?: boolean;
 showNewBadge?: boolean;
 jumpLabel?: string | null;
 disabledReason?: string | null;
 onToggleFavorite: () => void;
}) {
 const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.driverKind] ?? null;
 const providerLabel = props.model.subProvider
 ? `${props.providerDisplayName} · ${props.model.subProvider}`
 : props.providerDisplayName;

return (
const row = (
 <ComboboxItem
 hideIndicator
 index={props.index}
 value={`${props.instanceId}:${props.model.slug}`}
 contentClassName="flex w-full items-start gap-2"
 disabled={Boolean(props.disabledReason)}
 contentClassName="flex w-full items-center gap-3"
 className={cn(
 "w-full cursor-pointer rounded px-3 py-2 transition-colors group",
 "data-highlighted:bg-muted data-selected:bg-accent data-selected:text-foreground",
 "group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2.5 transition-[background-color,box-shadow,color]",
 "data-highlighted:bg-muted/56 data-selected:bg-transparent data-selected:text-foreground data-selected:ring-0",
 props.disabledReason &&
 "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
 )}
 >
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className="mt-0.5 shrink-0 cursor-pointer opacity-40 transition-opacity group-hover:opacity-100"
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn("size-4", props.isFavorite && "fill-current text-yellow-500")}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>

 <div className="min-w-0 flex-1 text-left">
 <div className="flex items-center justify-between gap-2 min-w-0">
 <div className="text-xs font-medium leading-snug flex items-center gap-2 min-w-0">
 <span className="truncate">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </span>
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 <div className="flex min-w-0 items-center gap-2">
 <div className="min-w-0 truncate text-xs font-medium leading-snug">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </div>
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 shrink-0 rounded-sm px-1.5 text-[10px]">
 {props.jumpLabel}
 </Kbd>
 {props.isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 </div>
 {props.showProvider && (
 <div className="flex items-center gap-1 mt-0.5">
 <div className="mt-1 flex items-center gap-1.5">
 {ProviderIcon ? <ProviderIcon className="size-3 shrink-0" /> : null}
 {props.providerAccentColor ? (
 <span
 className="size-1.5 shrink-0 rounded-full"
 style={{ backgroundColor: props.providerAccentColor }}
 aria-hidden
 />
 ) : null}
 <span className="text-xs font-normal leading-snug text-muted-foreground/70 truncate">
 <span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
 {providerLabel}
 </span>
 </div>
 )}
 </div>

 <div className="flex shrink-0 items-center gap-1.5">
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
 ) : null}
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className={cn(
 "relative -mr-1 flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-64 transition-[background-color,color,opacity] hover:bg-background/70 hover:text-foreground hover:opacity-100 group-hover:opacity-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11",
 props.isFavorite && "text-foreground opacity-100",
 )}
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 disabled={Boolean(props.disabledReason)}
@cursorcursorBotJun 10, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Favorite star blocked on disabled rows
Medium Severity
Rows blocked by getModelDisabledReason still appear in the list, but the favorite control is disabled whenever disabledReason is set. Favoriting only updates settings and does not change the thread model, so users in a started thread cannot favorite other visible models they are blocked from selecting until they start a new thread.
Fix in CursorFix in Web
Reviewed by Cursor Bugbot for commit f0cb4c1. Configure here.
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn(
 "size-3.5 sm:size-3",
 props.isFavorite && "fill-current text-yellow-500",
 )}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>
 </div>
 </ComboboxItem>
 );

 if (!props.disabledReason) {
 return row;
 }

 return (
 <Tooltip>
 <TooltipTrigger render={row} />
 <TooltipPopup side="left" align="center" className="max-w-64 text-balance leading-snug">
 {props.disabledReason}
 </TooltipPopup>
 </Tooltip>
 );
});
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Model picker UI Improvements, Virtualize Model List#3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 5 commits into

from

Jun 10, 2026
 Merged


Model picker UI Improvements, Virtualize Model List
#3021
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4c02784

feat(web): redesign model picker rail, favorites, and locked-provider…


juliusmarminge Jun 9, 2026
f0cb4c1

Improve model picker disabled states and layout


juliusmarminge Jun 10, 2026
3302ad7

Switch model picker to virtualized legend list


juliusmarminge Jun 10, 2026
f558f91

rm


juliusmarminge Jun 10, 2026
fac4c4a

Keep model picker favorites rows in sync


juliusmarminge Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3597,6 +3597,23 @@ export default function ChatView(props: ChatViewProps) {
 composerRef,
 ]);

 const getModelDisabledReason = useCallback(
 (instanceId: ProviderInstanceId, model: string): string | null => {
 if (!activeThread) {
 return null;
 }
 const reason = getStartedThreadModelChangeBlockReason({
 providers: providerStatuses,
 hasStartedSession: activeThread.session !== null,
 currentModelSelection: activeThread.modelSelection,
 currentProviderInstanceId: activeThread.session?.providerInstanceId ?? null,
 nextModelSelection: { instanceId, model },
 });
 return reason ? `${reason.description} Start a new thread to use this model.` : null;
 },
 [activeThread, providerStatuses],
 );

 const onProviderModelSelect = useCallback(
 (instanceId: ProviderInstanceId, model: string) => {
 if (!activeThread) return;
Expand DownExpand Up@@ -3915,6 +3932,7 @@ export default function ChatView(props: ChatViewProps) {
 onChangeActivePendingUserInputCustomAnswer
 }
 onProviderModelSelect={onProviderModelSelect}
 getModelDisabledReason={getModelDisabledReason}
 toggleInteractionMode={toggleInteractionMode}
 handleRuntimeModeChange={handleRuntimeModeChange}
 handleInteractionModeChange={handleInteractionModeChange}
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,7 @@ export interface ChatComposerProps {
 ) => void;

 onProviderModelSelect: (instanceId: ProviderInstanceId, model: string) => void;
 getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
 toggleInteractionMode: () => void;
 handleRuntimeModeChange: (mode: RuntimeMode) => void;
 handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -544,6 +545,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onPreviousActivePendingUserInputQuestion,
 onChangeActivePendingUserInputCustomAnswer,
 onProviderModelSelect,
 getModelDisabledReason,
 toggleInteractionMode,
 handleRuntimeModeChange,
 handleInteractionModeChange,
Expand DownExpand Up@@ -2328,6 +2330,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onOpenChange={(open) => {
 setIsComposerModelPickerOpen(open);
 }}
 getModelDisabledReason={getModelDisabledReason}
 onInstanceModelChange={onProviderModelSelect}
 />

Expand Down

141 changes: 79 additions & 62 deletions
apps/web/src/components/chat/ModelListRow.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import { memo } from "react";
import { StarIcon } from "lucide-react";
import { CheckIcon, StarIcon } from "lucide-react";
import {
 getDisplayModelName,
 getTriggerDisplayModelLabel,
Expand All@@ -27,97 +27,114 @@ export const ModelListRow = memo(function ModelListRow(props: {
 providerDisplayName: string;
 providerAccentColor?: string | undefined;
 isFavorite: boolean;
 isSelected: boolean;
 showProvider: boolean;
 preferShortName?: boolean;
 useTriggerLabel?: boolean;
 showNewBadge?: boolean;
 jumpLabel?: string | null;
 disabledReason?: string | null;
 onToggleFavorite: () => void;
}) {
 const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.driverKind] ?? null;
 const providerLabel = props.model.subProvider
 ? `${props.providerDisplayName} · ${props.model.subProvider}`
 : props.providerDisplayName;

return (
const row = (
 <ComboboxItem
 hideIndicator
 index={props.index}
 value={`${props.instanceId}:${props.model.slug}`}
 contentClassName="flex w-full items-start gap-2"
 disabled={Boolean(props.disabledReason)}
 contentClassName="flex w-full items-center gap-3"
 className={cn(
 "w-full cursor-pointer rounded px-3 py-2 transition-colors group",
 "data-highlighted:bg-muted data-selected:bg-accent data-selected:text-foreground",
 "group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2.5 transition-[background-color,box-shadow,color]",
 "data-highlighted:bg-muted/56 data-selected:bg-transparent data-selected:text-foreground data-selected:ring-0",
 props.disabledReason &&
 "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
 )}
 >
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className="mt-0.5 shrink-0 cursor-pointer opacity-40 transition-opacity group-hover:opacity-100"
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn("size-4", props.isFavorite && "fill-current text-yellow-500")}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>

 <div className="min-w-0 flex-1 text-left">
 <div className="flex items-center justify-between gap-2 min-w-0">
 <div className="text-xs font-medium leading-snug flex items-center gap-2 min-w-0">
 <span className="truncate">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </span>
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 <div className="flex min-w-0 items-center gap-2">
 <div className="min-w-0 truncate text-xs font-medium leading-snug">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </div>
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 shrink-0 rounded-sm px-1.5 text-[10px]">
 {props.jumpLabel}
 </Kbd>
 {props.isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 </div>
 {props.showProvider && (
 <div className="flex items-center gap-1 mt-0.5">
 <div className="mt-1 flex items-center gap-1.5">
 {ProviderIcon ? <ProviderIcon className="size-3 shrink-0" /> : null}
 {props.providerAccentColor ? (
 <span
 className="size-1.5 shrink-0 rounded-full"
 style={{ backgroundColor: props.providerAccentColor }}
 aria-hidden
 />
 ) : null}
 <span className="text-xs font-normal leading-snug text-muted-foreground/70 truncate">
 <span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
 {providerLabel}
 </span>
 </div>
 )}
 </div>

 <div className="flex shrink-0 items-center gap-1.5">
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
 ) : null}
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className={cn(
 "relative -mr-1 flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-64 transition-[background-color,color,opacity] hover:bg-background/70 hover:text-foreground hover:opacity-100 group-hover:opacity-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11",
 props.isFavorite && "text-foreground opacity-100",
 )}
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 disabled={Boolean(props.disabledReason)}
@cursorcursorBotJun 10, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Favorite star blocked on disabled rows
Medium Severity
Rows blocked by getModelDisabledReason still appear in the list, but the favorite control is disabled whenever disabledReason is set. Favoriting only updates settings and does not change the thread model, so users in a started thread cannot favorite other visible models they are blocked from selecting until they start a new thread.
Fix in CursorFix in Web
Reviewed by Cursor Bugbot for commit f0cb4c1. Configure here.
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn(
 "size-3.5 sm:size-3",
 props.isFavorite && "fill-current text-yellow-500",
 )}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>
 </div>
 </ComboboxItem>
 );

 if (!props.disabledReason) {
 return row;
 }

 return (
 <Tooltip>
 <TooltipTrigger render={row} />
 <TooltipPopup side="left" align="center" className="max-w-64 text-balance leading-snug">
 {props.disabledReason}
 </TooltipPopup>
 </Tooltip>
 );
});
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Model picker UI Improvements, Virtualize Model List#3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 5 commits into

from

Jun 10, 2026
 Merged


Model picker UI Improvements, Virtualize Model List
#3021
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4c02784

feat(web): redesign model picker rail, favorites, and locked-provider…


juliusmarminge Jun 9, 2026
f0cb4c1

Improve model picker disabled states and layout


juliusmarminge Jun 10, 2026
3302ad7

Switch model picker to virtualized legend list


juliusmarminge Jun 10, 2026
f558f91

rm


juliusmarminge Jun 10, 2026
fac4c4a

Keep model picker favorites rows in sync


juliusmarminge Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3597,6 +3597,23 @@ export default function ChatView(props: ChatViewProps) {
 composerRef,
 ]);

 const getModelDisabledReason = useCallback(
 (instanceId: ProviderInstanceId, model: string): string | null => {
 if (!activeThread) {
 return null;
 }
 const reason = getStartedThreadModelChangeBlockReason({
 providers: providerStatuses,
 hasStartedSession: activeThread.session !== null,
 currentModelSelection: activeThread.modelSelection,
 currentProviderInstanceId: activeThread.session?.providerInstanceId ?? null,
 nextModelSelection: { instanceId, model },
 });
 return reason ? `${reason.description} Start a new thread to use this model.` : null;
 },
 [activeThread, providerStatuses],
 );

 const onProviderModelSelect = useCallback(
 (instanceId: ProviderInstanceId, model: string) => {
 if (!activeThread) return;
Expand DownExpand Up@@ -3915,6 +3932,7 @@ export default function ChatView(props: ChatViewProps) {
 onChangeActivePendingUserInputCustomAnswer
 }
 onProviderModelSelect={onProviderModelSelect}
 getModelDisabledReason={getModelDisabledReason}
 toggleInteractionMode={toggleInteractionMode}
 handleRuntimeModeChange={handleRuntimeModeChange}
 handleInteractionModeChange={handleInteractionModeChange}
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,7 @@ export interface ChatComposerProps {
 ) => void;

 onProviderModelSelect: (instanceId: ProviderInstanceId, model: string) => void;
 getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
 toggleInteractionMode: () => void;
 handleRuntimeModeChange: (mode: RuntimeMode) => void;
 handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -544,6 +545,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onPreviousActivePendingUserInputQuestion,
 onChangeActivePendingUserInputCustomAnswer,
 onProviderModelSelect,
 getModelDisabledReason,
 toggleInteractionMode,
 handleRuntimeModeChange,
 handleInteractionModeChange,
Expand DownExpand Up@@ -2328,6 +2330,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onOpenChange={(open) => {
 setIsComposerModelPickerOpen(open);
 }}
 getModelDisabledReason={getModelDisabledReason}
 onInstanceModelChange={onProviderModelSelect}
 />

Expand Down

141 changes: 79 additions & 62 deletions
apps/web/src/components/chat/ModelListRow.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import { memo } from "react";
import { StarIcon } from "lucide-react";
import { CheckIcon, StarIcon } from "lucide-react";
import {
 getDisplayModelName,
 getTriggerDisplayModelLabel,
Expand All@@ -27,97 +27,114 @@ export const ModelListRow = memo(function ModelListRow(props: {
 providerDisplayName: string;
 providerAccentColor?: string | undefined;
 isFavorite: boolean;
 isSelected: boolean;
 showProvider: boolean;
 preferShortName?: boolean;
 useTriggerLabel?: boolean;
 showNewBadge?: boolean;
 jumpLabel?: string | null;
 disabledReason?: string | null;
 onToggleFavorite: () => void;
}) {
 const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.driverKind] ?? null;
 const providerLabel = props.model.subProvider
 ? `${props.providerDisplayName} · ${props.model.subProvider}`
 : props.providerDisplayName;

return (
const row = (
 <ComboboxItem
 hideIndicator
 index={props.index}
 value={`${props.instanceId}:${props.model.slug}`}
 contentClassName="flex w-full items-start gap-2"
 disabled={Boolean(props.disabledReason)}
 contentClassName="flex w-full items-center gap-3"
 className={cn(
 "w-full cursor-pointer rounded px-3 py-2 transition-colors group",
 "data-highlighted:bg-muted data-selected:bg-accent data-selected:text-foreground",
 "group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2.5 transition-[background-color,box-shadow,color]",
 "data-highlighted:bg-muted/56 data-selected:bg-transparent data-selected:text-foreground data-selected:ring-0",
 props.disabledReason &&
 "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
 )}
 >
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className="mt-0.5 shrink-0 cursor-pointer opacity-40 transition-opacity group-hover:opacity-100"
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn("size-4", props.isFavorite && "fill-current text-yellow-500")}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>

 <div className="min-w-0 flex-1 text-left">
 <div className="flex items-center justify-between gap-2 min-w-0">
 <div className="text-xs font-medium leading-snug flex items-center gap-2 min-w-0">
 <span className="truncate">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </span>
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 <div className="flex min-w-0 items-center gap-2">
 <div className="min-w-0 truncate text-xs font-medium leading-snug">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </div>
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 shrink-0 rounded-sm px-1.5 text-[10px]">
 {props.jumpLabel}
 </Kbd>
 {props.isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 </div>
 {props.showProvider && (
 <div className="flex items-center gap-1 mt-0.5">
 <div className="mt-1 flex items-center gap-1.5">
 {ProviderIcon ? <ProviderIcon className="size-3 shrink-0" /> : null}
 {props.providerAccentColor ? (
 <span
 className="size-1.5 shrink-0 rounded-full"
 style={{ backgroundColor: props.providerAccentColor }}
 aria-hidden
 />
 ) : null}
 <span className="text-xs font-normal leading-snug text-muted-foreground/70 truncate">
 <span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
 {providerLabel}
 </span>
 </div>
 )}
 </div>

 <div className="flex shrink-0 items-center gap-1.5">
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
 ) : null}
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className={cn(
 "relative -mr-1 flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-64 transition-[background-color,color,opacity] hover:bg-background/70 hover:text-foreground hover:opacity-100 group-hover:opacity-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11",
 props.isFavorite && "text-foreground opacity-100",
 )}
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 disabled={Boolean(props.disabledReason)}
@cursorcursorBotJun 10, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Favorite star blocked on disabled rows
Medium Severity
Rows blocked by getModelDisabledReason still appear in the list, but the favorite control is disabled whenever disabledReason is set. Favoriting only updates settings and does not change the thread model, so users in a started thread cannot favorite other visible models they are blocked from selecting until they start a new thread.
Fix in CursorFix in Web
Reviewed by Cursor Bugbot for commit f0cb4c1. Configure here.
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn(
 "size-3.5 sm:size-3",
 props.isFavorite && "fill-current text-yellow-500",
 )}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>
 </div>
 </ComboboxItem>
 );

 if (!props.disabledReason) {
 return row;
 }

 return (
 <Tooltip>
 <TooltipTrigger render={row} />
 <TooltipPopup side="left" align="center" className="max-w-64 text-balance leading-snug">
 {props.disabledReason}
 </TooltipPopup>
 </Tooltip>
 );
});
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Model picker UI Improvements, Virtualize Model List#3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 5 commits into

from

Jun 10, 2026
 Merged


Model picker UI Improvements, Virtualize Model List
#3021
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4c02784

feat(web): redesign model picker rail, favorites, and locked-provider…


juliusmarminge Jun 9, 2026
f0cb4c1

Improve model picker disabled states and layout


juliusmarminge Jun 10, 2026
3302ad7

Switch model picker to virtualized legend list


juliusmarminge Jun 10, 2026
f558f91

rm


juliusmarminge Jun 10, 2026
fac4c4a

Keep model picker favorites rows in sync


juliusmarminge Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3597,6 +3597,23 @@ export default function ChatView(props: ChatViewProps) {
 composerRef,
 ]);

 const getModelDisabledReason = useCallback(
 (instanceId: ProviderInstanceId, model: string): string | null => {
 if (!activeThread) {
 return null;
 }
 const reason = getStartedThreadModelChangeBlockReason({
 providers: providerStatuses,
 hasStartedSession: activeThread.session !== null,
 currentModelSelection: activeThread.modelSelection,
 currentProviderInstanceId: activeThread.session?.providerInstanceId ?? null,
 nextModelSelection: { instanceId, model },
 });
 return reason ? `${reason.description} Start a new thread to use this model.` : null;
 },
 [activeThread, providerStatuses],
 );

 const onProviderModelSelect = useCallback(
 (instanceId: ProviderInstanceId, model: string) => {
 if (!activeThread) return;
Expand DownExpand Up@@ -3915,6 +3932,7 @@ export default function ChatView(props: ChatViewProps) {
 onChangeActivePendingUserInputCustomAnswer
 }
 onProviderModelSelect={onProviderModelSelect}
 getModelDisabledReason={getModelDisabledReason}
 toggleInteractionMode={toggleInteractionMode}
 handleRuntimeModeChange={handleRuntimeModeChange}
 handleInteractionModeChange={handleInteractionModeChange}
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,7 @@ export interface ChatComposerProps {
 ) => void;

 onProviderModelSelect: (instanceId: ProviderInstanceId, model: string) => void;
 getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
 toggleInteractionMode: () => void;
 handleRuntimeModeChange: (mode: RuntimeMode) => void;
 handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -544,6 +545,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onPreviousActivePendingUserInputQuestion,
 onChangeActivePendingUserInputCustomAnswer,
 onProviderModelSelect,
 getModelDisabledReason,
 toggleInteractionMode,
 handleRuntimeModeChange,
 handleInteractionModeChange,
Expand DownExpand Up@@ -2328,6 +2330,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onOpenChange={(open) => {
 setIsComposerModelPickerOpen(open);
 }}
 getModelDisabledReason={getModelDisabledReason}
 onInstanceModelChange={onProviderModelSelect}
 />

Expand Down

141 changes: 79 additions & 62 deletions
apps/web/src/components/chat/ModelListRow.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import { memo } from "react";
import { StarIcon } from "lucide-react";
import { CheckIcon, StarIcon } from "lucide-react";
import {
 getDisplayModelName,
 getTriggerDisplayModelLabel,
Expand All@@ -27,97 +27,114 @@ export const ModelListRow = memo(function ModelListRow(props: {
 providerDisplayName: string;
 providerAccentColor?: string | undefined;
 isFavorite: boolean;
 isSelected: boolean;
 showProvider: boolean;
 preferShortName?: boolean;
 useTriggerLabel?: boolean;
 showNewBadge?: boolean;
 jumpLabel?: string | null;
 disabledReason?: string | null;
 onToggleFavorite: () => void;
}) {
 const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.driverKind] ?? null;
 const providerLabel = props.model.subProvider
 ? `${props.providerDisplayName} · ${props.model.subProvider}`
 : props.providerDisplayName;

return (
const row = (
 <ComboboxItem
 hideIndicator
 index={props.index}
 value={`${props.instanceId}:${props.model.slug}`}
 contentClassName="flex w-full items-start gap-2"
 disabled={Boolean(props.disabledReason)}
 contentClassName="flex w-full items-center gap-3"
 className={cn(
 "w-full cursor-pointer rounded px-3 py-2 transition-colors group",
 "data-highlighted:bg-muted data-selected:bg-accent data-selected:text-foreground",
 "group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2.5 transition-[background-color,box-shadow,color]",
 "data-highlighted:bg-muted/56 data-selected:bg-transparent data-selected:text-foreground data-selected:ring-0",
 props.disabledReason &&
 "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
 )}
 >
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className="mt-0.5 shrink-0 cursor-pointer opacity-40 transition-opacity group-hover:opacity-100"
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn("size-4", props.isFavorite && "fill-current text-yellow-500")}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>

 <div className="min-w-0 flex-1 text-left">
 <div className="flex items-center justify-between gap-2 min-w-0">
 <div className="text-xs font-medium leading-snug flex items-center gap-2 min-w-0">
 <span className="truncate">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </span>
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 <div className="flex min-w-0 items-center gap-2">
 <div className="min-w-0 truncate text-xs font-medium leading-snug">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </div>
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 shrink-0 rounded-sm px-1.5 text-[10px]">
 {props.jumpLabel}
 </Kbd>
 {props.isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 </div>
 {props.showProvider && (
 <div className="flex items-center gap-1 mt-0.5">
 <div className="mt-1 flex items-center gap-1.5">
 {ProviderIcon ? <ProviderIcon className="size-3 shrink-0" /> : null}
 {props.providerAccentColor ? (
 <span
 className="size-1.5 shrink-0 rounded-full"
 style={{ backgroundColor: props.providerAccentColor }}
 aria-hidden
 />
 ) : null}
 <span className="text-xs font-normal leading-snug text-muted-foreground/70 truncate">
 <span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
 {providerLabel}
 </span>
 </div>
 )}
 </div>

 <div className="flex shrink-0 items-center gap-1.5">
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
 ) : null}
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className={cn(
 "relative -mr-1 flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-64 transition-[background-color,color,opacity] hover:bg-background/70 hover:text-foreground hover:opacity-100 group-hover:opacity-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11",
 props.isFavorite && "text-foreground opacity-100",
 )}
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 disabled={Boolean(props.disabledReason)}
@cursorcursorBotJun 10, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Favorite star blocked on disabled rows
Medium Severity
Rows blocked by getModelDisabledReason still appear in the list, but the favorite control is disabled whenever disabledReason is set. Favoriting only updates settings and does not change the thread model, so users in a started thread cannot favorite other visible models they are blocked from selecting until they start a new thread.
Fix in CursorFix in Web
Reviewed by Cursor Bugbot for commit f0cb4c1. Configure here.
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn(
 "size-3.5 sm:size-3",
 props.isFavorite && "fill-current text-yellow-500",
 )}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>
 </div>
 </ComboboxItem>
 );

 if (!props.disabledReason) {
 return row;
 }

 return (
 <Tooltip>
 <TooltipTrigger render={row} />
 <TooltipPopup side="left" align="center" className="max-w-64 text-balance leading-snug">
 {props.disabledReason}
 </TooltipPopup>
 </Tooltip>
 );
});
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Model picker UI Improvements, Virtualize Model List#3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 5 commits into

from

Jun 10, 2026
 Merged


Model picker UI Improvements, Virtualize Model List
#3021
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4c02784

feat(web): redesign model picker rail, favorites, and locked-provider…


juliusmarminge Jun 9, 2026
f0cb4c1

Improve model picker disabled states and layout


juliusmarminge Jun 10, 2026
3302ad7

Switch model picker to virtualized legend list


juliusmarminge Jun 10, 2026
f558f91

rm


juliusmarminge Jun 10, 2026
fac4c4a

Keep model picker favorites rows in sync


juliusmarminge Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3597,6 +3597,23 @@ export default function ChatView(props: ChatViewProps) {
 composerRef,
 ]);

 const getModelDisabledReason = useCallback(
 (instanceId: ProviderInstanceId, model: string): string | null => {
 if (!activeThread) {
 return null;
 }
 const reason = getStartedThreadModelChangeBlockReason({
 providers: providerStatuses,
 hasStartedSession: activeThread.session !== null,
 currentModelSelection: activeThread.modelSelection,
 currentProviderInstanceId: activeThread.session?.providerInstanceId ?? null,
 nextModelSelection: { instanceId, model },
 });
 return reason ? `${reason.description} Start a new thread to use this model.` : null;
 },
 [activeThread, providerStatuses],
 );

 const onProviderModelSelect = useCallback(
 (instanceId: ProviderInstanceId, model: string) => {
 if (!activeThread) return;
Expand DownExpand Up@@ -3915,6 +3932,7 @@ export default function ChatView(props: ChatViewProps) {
 onChangeActivePendingUserInputCustomAnswer
 }
 onProviderModelSelect={onProviderModelSelect}
 getModelDisabledReason={getModelDisabledReason}
 toggleInteractionMode={toggleInteractionMode}
 handleRuntimeModeChange={handleRuntimeModeChange}
 handleInteractionModeChange={handleInteractionModeChange}
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,7 @@ export interface ChatComposerProps {
 ) => void;

 onProviderModelSelect: (instanceId: ProviderInstanceId, model: string) => void;
 getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
 toggleInteractionMode: () => void;
 handleRuntimeModeChange: (mode: RuntimeMode) => void;
 handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -544,6 +545,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onPreviousActivePendingUserInputQuestion,
 onChangeActivePendingUserInputCustomAnswer,
 onProviderModelSelect,
 getModelDisabledReason,
 toggleInteractionMode,
 handleRuntimeModeChange,
 handleInteractionModeChange,
Expand DownExpand Up@@ -2328,6 +2330,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onOpenChange={(open) => {
 setIsComposerModelPickerOpen(open);
 }}
 getModelDisabledReason={getModelDisabledReason}
 onInstanceModelChange={onProviderModelSelect}
 />

Expand Down

141 changes: 79 additions & 62 deletions
apps/web/src/components/chat/ModelListRow.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import { memo } from "react";
import { StarIcon } from "lucide-react";
import { CheckIcon, StarIcon } from "lucide-react";
import {
 getDisplayModelName,
 getTriggerDisplayModelLabel,
Expand All@@ -27,97 +27,114 @@ export const ModelListRow = memo(function ModelListRow(props: {
 providerDisplayName: string;
 providerAccentColor?: string | undefined;
 isFavorite: boolean;
 isSelected: boolean;
 showProvider: boolean;
 preferShortName?: boolean;
 useTriggerLabel?: boolean;
 showNewBadge?: boolean;
 jumpLabel?: string | null;
 disabledReason?: string | null;
 onToggleFavorite: () => void;
}) {
 const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.driverKind] ?? null;
 const providerLabel = props.model.subProvider
 ? `${props.providerDisplayName} · ${props.model.subProvider}`
 : props.providerDisplayName;

return (
const row = (
 <ComboboxItem
 hideIndicator
 index={props.index}
 value={`${props.instanceId}:${props.model.slug}`}
 contentClassName="flex w-full items-start gap-2"
 disabled={Boolean(props.disabledReason)}
 contentClassName="flex w-full items-center gap-3"
 className={cn(
 "w-full cursor-pointer rounded px-3 py-2 transition-colors group",
 "data-highlighted:bg-muted data-selected:bg-accent data-selected:text-foreground",
 "group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2.5 transition-[background-color,box-shadow,color]",
 "data-highlighted:bg-muted/56 data-selected:bg-transparent data-selected:text-foreground data-selected:ring-0",
 props.disabledReason &&
 "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
 )}
 >
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className="mt-0.5 shrink-0 cursor-pointer opacity-40 transition-opacity group-hover:opacity-100"
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn("size-4", props.isFavorite && "fill-current text-yellow-500")}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>

 <div className="min-w-0 flex-1 text-left">
 <div className="flex items-center justify-between gap-2 min-w-0">
 <div className="text-xs font-medium leading-snug flex items-center gap-2 min-w-0">
 <span className="truncate">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </span>
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 <div className="flex min-w-0 items-center gap-2">
 <div className="min-w-0 truncate text-xs font-medium leading-snug">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </div>
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 shrink-0 rounded-sm px-1.5 text-[10px]">
 {props.jumpLabel}
 </Kbd>
 {props.isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 </div>
 {props.showProvider && (
 <div className="flex items-center gap-1 mt-0.5">
 <div className="mt-1 flex items-center gap-1.5">
 {ProviderIcon ? <ProviderIcon className="size-3 shrink-0" /> : null}
 {props.providerAccentColor ? (
 <span
 className="size-1.5 shrink-0 rounded-full"
 style={{ backgroundColor: props.providerAccentColor }}
 aria-hidden
 />
 ) : null}
 <span className="text-xs font-normal leading-snug text-muted-foreground/70 truncate">
 <span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
 {providerLabel}
 </span>
 </div>
 )}
 </div>

 <div className="flex shrink-0 items-center gap-1.5">
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
 ) : null}
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className={cn(
 "relative -mr-1 flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-64 transition-[background-color,color,opacity] hover:bg-background/70 hover:text-foreground hover:opacity-100 group-hover:opacity-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11",
 props.isFavorite && "text-foreground opacity-100",
 )}
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 disabled={Boolean(props.disabledReason)}
@cursorcursorBotJun 10, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Favorite star blocked on disabled rows
Medium Severity
Rows blocked by getModelDisabledReason still appear in the list, but the favorite control is disabled whenever disabledReason is set. Favoriting only updates settings and does not change the thread model, so users in a started thread cannot favorite other visible models they are blocked from selecting until they start a new thread.
Fix in CursorFix in Web
Reviewed by Cursor Bugbot for commit f0cb4c1. Configure here.
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn(
 "size-3.5 sm:size-3",
 props.isFavorite && "fill-current text-yellow-500",
 )}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>
 </div>
 </ComboboxItem>
 );

 if (!props.disabledReason) {
 return row;
 }

 return (
 <Tooltip>
 <TooltipTrigger render={row} />
 <TooltipPopup side="left" align="center" className="max-w-64 text-balance leading-snug">
 {props.disabledReason}
 </TooltipPopup>
 </Tooltip>
 );
});
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Model picker UI Improvements, Virtualize Model List#3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 5 commits into

from

Jun 10, 2026
 Merged


Model picker UI Improvements, Virtualize Model List
#3021
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4c02784

feat(web): redesign model picker rail, favorites, and locked-provider…


juliusmarminge Jun 9, 2026
f0cb4c1

Improve model picker disabled states and layout


juliusmarminge Jun 10, 2026
3302ad7

Switch model picker to virtualized legend list


juliusmarminge Jun 10, 2026
f558f91

rm


juliusmarminge Jun 10, 2026
fac4c4a

Keep model picker favorites rows in sync


juliusmarminge Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3597,6 +3597,23 @@ export default function ChatView(props: ChatViewProps) {
 composerRef,
 ]);

 const getModelDisabledReason = useCallback(
 (instanceId: ProviderInstanceId, model: string): string | null => {
 if (!activeThread) {
 return null;
 }
 const reason = getStartedThreadModelChangeBlockReason({
 providers: providerStatuses,
 hasStartedSession: activeThread.session !== null,
 currentModelSelection: activeThread.modelSelection,
 currentProviderInstanceId: activeThread.session?.providerInstanceId ?? null,
 nextModelSelection: { instanceId, model },
 });
 return reason ? `${reason.description} Start a new thread to use this model.` : null;
 },
 [activeThread, providerStatuses],
 );

 const onProviderModelSelect = useCallback(
 (instanceId: ProviderInstanceId, model: string) => {
 if (!activeThread) return;
Expand DownExpand Up@@ -3915,6 +3932,7 @@ export default function ChatView(props: ChatViewProps) {
 onChangeActivePendingUserInputCustomAnswer
 }
 onProviderModelSelect={onProviderModelSelect}
 getModelDisabledReason={getModelDisabledReason}
 toggleInteractionMode={toggleInteractionMode}
 handleRuntimeModeChange={handleRuntimeModeChange}
 handleInteractionModeChange={handleInteractionModeChange}
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,7 @@ export interface ChatComposerProps {
 ) => void;

 onProviderModelSelect: (instanceId: ProviderInstanceId, model: string) => void;
 getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
 toggleInteractionMode: () => void;
 handleRuntimeModeChange: (mode: RuntimeMode) => void;
 handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -544,6 +545,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onPreviousActivePendingUserInputQuestion,
 onChangeActivePendingUserInputCustomAnswer,
 onProviderModelSelect,
 getModelDisabledReason,
 toggleInteractionMode,
 handleRuntimeModeChange,
 handleInteractionModeChange,
Expand DownExpand Up@@ -2328,6 +2330,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onOpenChange={(open) => {
 setIsComposerModelPickerOpen(open);
 }}
 getModelDisabledReason={getModelDisabledReason}
 onInstanceModelChange={onProviderModelSelect}
 />

Expand Down

141 changes: 79 additions & 62 deletions
apps/web/src/components/chat/ModelListRow.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import { memo } from "react";
import { StarIcon } from "lucide-react";
import { CheckIcon, StarIcon } from "lucide-react";
import {
 getDisplayModelName,
 getTriggerDisplayModelLabel,
Expand All@@ -27,97 +27,114 @@ export const ModelListRow = memo(function ModelListRow(props: {
 providerDisplayName: string;
 providerAccentColor?: string | undefined;
 isFavorite: boolean;
 isSelected: boolean;
 showProvider: boolean;
 preferShortName?: boolean;
 useTriggerLabel?: boolean;
 showNewBadge?: boolean;
 jumpLabel?: string | null;
 disabledReason?: string | null;
 onToggleFavorite: () => void;
}) {
 const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.driverKind] ?? null;
 const providerLabel = props.model.subProvider
 ? `${props.providerDisplayName} · ${props.model.subProvider}`
 : props.providerDisplayName;

return (
const row = (
 <ComboboxItem
 hideIndicator
 index={props.index}
 value={`${props.instanceId}:${props.model.slug}`}
 contentClassName="flex w-full items-start gap-2"
 disabled={Boolean(props.disabledReason)}
 contentClassName="flex w-full items-center gap-3"
 className={cn(
 "w-full cursor-pointer rounded px-3 py-2 transition-colors group",
 "data-highlighted:bg-muted data-selected:bg-accent data-selected:text-foreground",
 "group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2.5 transition-[background-color,box-shadow,color]",
 "data-highlighted:bg-muted/56 data-selected:bg-transparent data-selected:text-foreground data-selected:ring-0",
 props.disabledReason &&
 "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
 )}
 >
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className="mt-0.5 shrink-0 cursor-pointer opacity-40 transition-opacity group-hover:opacity-100"
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn("size-4", props.isFavorite && "fill-current text-yellow-500")}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>

 <div className="min-w-0 flex-1 text-left">
 <div className="flex items-center justify-between gap-2 min-w-0">
 <div className="text-xs font-medium leading-snug flex items-center gap-2 min-w-0">
 <span className="truncate">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </span>
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 <div className="flex min-w-0 items-center gap-2">
 <div className="min-w-0 truncate text-xs font-medium leading-snug">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </div>
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 shrink-0 rounded-sm px-1.5 text-[10px]">
 {props.jumpLabel}
 </Kbd>
 {props.isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 </div>
 {props.showProvider && (
 <div className="flex items-center gap-1 mt-0.5">
 <div className="mt-1 flex items-center gap-1.5">
 {ProviderIcon ? <ProviderIcon className="size-3 shrink-0" /> : null}
 {props.providerAccentColor ? (
 <span
 className="size-1.5 shrink-0 rounded-full"
 style={{ backgroundColor: props.providerAccentColor }}
 aria-hidden
 />
 ) : null}
 <span className="text-xs font-normal leading-snug text-muted-foreground/70 truncate">
 <span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
 {providerLabel}
 </span>
 </div>
 )}
 </div>

 <div className="flex shrink-0 items-center gap-1.5">
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
 ) : null}
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className={cn(
 "relative -mr-1 flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-64 transition-[background-color,color,opacity] hover:bg-background/70 hover:text-foreground hover:opacity-100 group-hover:opacity-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11",
 props.isFavorite && "text-foreground opacity-100",
 )}
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 disabled={Boolean(props.disabledReason)}
@cursorcursorBotJun 10, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Favorite star blocked on disabled rows
Medium Severity
Rows blocked by getModelDisabledReason still appear in the list, but the favorite control is disabled whenever disabledReason is set. Favoriting only updates settings and does not change the thread model, so users in a started thread cannot favorite other visible models they are blocked from selecting until they start a new thread.
Fix in CursorFix in Web
Reviewed by Cursor Bugbot for commit f0cb4c1. Configure here.
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn(
 "size-3.5 sm:size-3",
 props.isFavorite && "fill-current text-yellow-500",
 )}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>
 </div>
 </ComboboxItem>
 );

 if (!props.disabledReason) {
 return row;
 }

 return (
 <Tooltip>
 <TooltipTrigger render={row} />
 <TooltipPopup side="left" align="center" className="max-w-64 text-balance leading-snug">
 {props.disabledReason}
 </TooltipPopup>
 </Tooltip>
 );
});
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Model picker UI Improvements, Virtualize Model List#3021

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

juliusmarminge
merged 5 commits into

from

Jun 10, 2026
 Merged


Model picker UI Improvements, Virtualize Model List
#3021
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
4c02784

feat(web): redesign model picker rail, favorites, and locked-provider…


juliusmarminge Jun 9, 2026
f0cb4c1

Improve model picker disabled states and layout


juliusmarminge Jun 10, 2026
3302ad7

Switch model picker to virtualized legend list


juliusmarminge Jun 10, 2026
f558f91

rm


juliusmarminge Jun 10, 2026
fac4c4a

Keep model picker favorites rows in sync


juliusmarminge Jun 10, 2026

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 18 additions & 0 deletions
apps/web/src/components/ChatView.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3597,6 +3597,23 @@ export default function ChatView(props: ChatViewProps) {
 composerRef,
 ]);

 const getModelDisabledReason = useCallback(
 (instanceId: ProviderInstanceId, model: string): string | null => {
 if (!activeThread) {
 return null;
 }
 const reason = getStartedThreadModelChangeBlockReason({
 providers: providerStatuses,
 hasStartedSession: activeThread.session !== null,
 currentModelSelection: activeThread.modelSelection,
 currentProviderInstanceId: activeThread.session?.providerInstanceId ?? null,
 nextModelSelection: { instanceId, model },
 });
 return reason ? `${reason.description} Start a new thread to use this model.` : null;
 },
 [activeThread, providerStatuses],
 );

 const onProviderModelSelect = useCallback(
 (instanceId: ProviderInstanceId, model: string) => {
 if (!activeThread) return;
Expand DownExpand Up@@ -3915,6 +3932,7 @@ export default function ChatView(props: ChatViewProps) {
 onChangeActivePendingUserInputCustomAnswer
 }
 onProviderModelSelect={onProviderModelSelect}
 getModelDisabledReason={getModelDisabledReason}
 toggleInteractionMode={toggleInteractionMode}
 handleRuntimeModeChange={handleRuntimeModeChange}
 handleInteractionModeChange={handleInteractionModeChange}
Expand Down

3 changes: 3 additions & 0 deletions
apps/web/src/components/chat/ChatComposer.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -470,6 +470,7 @@ export interface ChatComposerProps {
 ) => void;

 onProviderModelSelect: (instanceId: ProviderInstanceId, model: string) => void;
 getModelDisabledReason: (instanceId: ProviderInstanceId, model: string) => string | null;
 toggleInteractionMode: () => void;
 handleRuntimeModeChange: (mode: RuntimeMode) => void;
 handleInteractionModeChange: (mode: ProviderInteractionMode) => void;
Expand DownExpand Up@@ -544,6 +545,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onPreviousActivePendingUserInputQuestion,
 onChangeActivePendingUserInputCustomAnswer,
 onProviderModelSelect,
 getModelDisabledReason,
 toggleInteractionMode,
 handleRuntimeModeChange,
 handleInteractionModeChange,
Expand DownExpand Up@@ -2328,6 +2330,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
 onOpenChange={(open) => {
 setIsComposerModelPickerOpen(open);
 }}
 getModelDisabledReason={getModelDisabledReason}
 onInstanceModelChange={onProviderModelSelect}
 />

Expand Down

141 changes: 79 additions & 62 deletions
apps/web/src/components/chat/ModelListRow.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
import { type ProviderDriverKind, type ProviderInstanceId } from "@t3tools/contracts";
import { memo } from "react";
import { StarIcon } from "lucide-react";
import { CheckIcon, StarIcon } from "lucide-react";
import {
 getDisplayModelName,
 getTriggerDisplayModelLabel,
Expand All@@ -27,97 +27,114 @@ export const ModelListRow = memo(function ModelListRow(props: {
 providerDisplayName: string;
 providerAccentColor?: string | undefined;
 isFavorite: boolean;
 isSelected: boolean;
 showProvider: boolean;
 preferShortName?: boolean;
 useTriggerLabel?: boolean;
 showNewBadge?: boolean;
 jumpLabel?: string | null;
 disabledReason?: string | null;
 onToggleFavorite: () => void;
}) {
 const ProviderIcon = PROVIDER_ICON_BY_PROVIDER[props.driverKind] ?? null;
 const providerLabel = props.model.subProvider
 ? `${props.providerDisplayName} · ${props.model.subProvider}`
 : props.providerDisplayName;

return (
const row = (
 <ComboboxItem
 hideIndicator
 index={props.index}
 value={`${props.instanceId}:${props.model.slug}`}
 contentClassName="flex w-full items-start gap-2"
 disabled={Boolean(props.disabledReason)}
 contentClassName="flex w-full items-center gap-3"
 className={cn(
 "w-full cursor-pointer rounded px-3 py-2 transition-colors group",
 "data-highlighted:bg-muted data-selected:bg-accent data-selected:text-foreground",
 "group relative w-full !min-w-0 max-w-full cursor-pointer rounded-md px-2 py-2.5 transition-[background-color,box-shadow,color]",
 "data-highlighted:bg-muted/56 data-selected:bg-transparent data-selected:text-foreground data-selected:ring-0",
 props.disabledReason &&
 "data-disabled:pointer-events-auto data-disabled:cursor-not-allowed data-disabled:hover:bg-transparent",
 )}
 >
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className="mt-0.5 shrink-0 cursor-pointer opacity-40 transition-opacity group-hover:opacity-100"
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn("size-4", props.isFavorite && "fill-current text-yellow-500")}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>

 <div className="min-w-0 flex-1 text-left">
 <div className="flex items-center justify-between gap-2 min-w-0">
 <div className="text-xs font-medium leading-snug flex items-center gap-2 min-w-0">
 <span className="truncate">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </span>
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 <div className="flex min-w-0 items-center gap-2">
 <div className="min-w-0 truncate text-xs font-medium leading-snug">
 {props.useTriggerLabel
 ? getTriggerDisplayModelLabel(props.model)
 : getDisplayModelName(
 props.model,
 props.preferShortName ? { preferShortName: true } : undefined,
 )}
 </div>
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 shrink-0 rounded-sm px-1.5 text-[10px]">
 {props.jumpLabel}
 </Kbd>
 {props.isSelected ? <CheckIcon className="size-3.5 shrink-0 text-blue-400" /> : null}
 {props.showNewBadge ? (
 <span
 className="shrink-0 rounded border border-amber-500/35 bg-amber-500/15 px-0.5 py-px text-[10px] font-bold uppercase leading-none tracking-wide text-amber-800 dark:border-amber-400/30 dark:bg-amber-400/12 dark:text-amber-200"
 aria-label="New model"
 >
 New
 </span>
 ) : null}
 </div>
 {props.showProvider && (
 <div className="flex items-center gap-1 mt-0.5">
 <div className="mt-1 flex items-center gap-1.5">
 {ProviderIcon ? <ProviderIcon className="size-3 shrink-0" /> : null}
 {props.providerAccentColor ? (
 <span
 className="size-1.5 shrink-0 rounded-full"
 style={{ backgroundColor: props.providerAccentColor }}
 aria-hidden
 />
 ) : null}
 <span className="text-xs font-normal leading-snug text-muted-foreground/70 truncate">
 <span className="truncate text-xs font-normal leading-snug text-muted-foreground/70">
 {providerLabel}
 </span>
 </div>
 )}
 </div>

 <div className="flex shrink-0 items-center gap-1.5">
 {props.jumpLabel ? (
 <Kbd className="h-4 min-w-0 rounded-sm px-1.5 text-[10px]">{props.jumpLabel}</Kbd>
 ) : null}
 <Tooltip>
 <TooltipTrigger
 render={
 <button
 className={cn(
 "relative -mr-1 flex size-4 shrink-0 cursor-pointer items-center justify-center rounded-md text-muted-foreground/70 opacity-64 transition-[background-color,color,opacity] hover:bg-background/70 hover:text-foreground hover:opacity-100 group-hover:opacity-100 pointer-coarse:after:absolute pointer-coarse:after:size-full pointer-coarse:after:min-h-11 pointer-coarse:after:min-w-11",
 props.isFavorite && "text-foreground opacity-100",
 )}
 onClick={(event) => {
 event.stopPropagation();
 props.onToggleFavorite();
 }}
 onKeyDown={(event) => {
 event.stopPropagation();
 }}
 disabled={Boolean(props.disabledReason)}
@cursorcursorBotJun 10, 2026

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Favorite star blocked on disabled rows
Medium Severity
Rows blocked by getModelDisabledReason still appear in the list, but the favorite control is disabled whenever disabledReason is set. Favoriting only updates settings and does not change the thread model, so users in a started thread cannot favorite other visible models they are blocked from selecting until they start a new thread.
Fix in CursorFix in Web
Reviewed by Cursor Bugbot for commit f0cb4c1. Configure here.
 type="button"
 aria-label={props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 >
 <StarIcon
 className={cn(
 "size-3.5 sm:size-3",
 props.isFavorite && "fill-current text-yellow-500",
 )}
 />
 </button>
 }
 />
 <TooltipPopup side="top" align="center">
 {props.isFavorite ? "Remove from favorites" : "Add to favorites"}
 </TooltipPopup>
 </Tooltip>
 </div>
 </ComboboxItem>
 );

 if (!props.disabledReason) {
 return row;
 }

 return (
 <Tooltip>
 <TooltipTrigger render={row} />
 <TooltipPopup side="left" align="center" className="max-w-64 text-balance leading-snug">
 {props.disabledReason}
 </TooltipPopup>
 </Tooltip>
 );
});
Loading
Loading