Skip to content

fixes #297159 #298200

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
isidorn merged 2 commits into from
Feb 27, 2026
+9 −15
Merged

fixes #297159 #298200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26c4eac
fixes #297159
isidorn Feb 27, 2026
a9c55d7
update tests
isidorn Feb 27, 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
14 changes: 3 additions & 11 deletions src/vs/workbench/contrib/chat/browser/widget/input/chatModelPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@ export function buildModelPickerItems(
}

// Render promoted section: available first, then sorted alphabetically by name
let hasShownActionLink = false;
if (promotedItems.length > 0) {
promotedItems.sort((a, b) => {
const aAvail = a.kind === 'available' ? 0 : 1;
Expand All @@ -283,11 +282,7 @@ export function buildModelPickerItems(
if (item.kind === 'available') {
items.push(createModelItem(createModelAction(item.model, selectedModelId, onSelect), item.model));
} else {
const showActionLink = item.reason === 'upgrade' ? !hasShownActionLink : true;
if (showActionLink && item.reason === 'upgrade') {
hasShownActionLink = true;
}
items.push(createUnavailableModelItem(item.id, item.entry, item.reason, manageSettingsUrl, updateStateType, undefined, showActionLink));
items.push(createUnavailableModelItem(item.id, item.entry, item.reason, manageSettingsUrl, updateStateType));
}
}
}
Expand Down Expand Up @@ -336,7 +331,7 @@ export function buildModelPickerItems(
for (const model of otherModels) {
const entry = controlModels[model.metadata.id] ?? controlModels[model.identifier];
if (entry?.minVSCodeVersion && !isVersionAtLeast(currentVSCodeVersion, entry.minVSCodeVersion)) {
items.push(createUnavailableModelItem(model.metadata.id, entry, 'update', manageSettingsUrl, updateStateType, ModelPickerSection.Other, true));
items.push(createUnavailableModelItem(model.metadata.id, entry, 'update', manageSettingsUrl, updateStateType, ModelPickerSection.Other));
} else {
items.push(createModelItem(createModelAction(model, selectedModelId, onSelect, ModelPickerSection.Other), model));
}
Expand Down Expand Up @@ -398,14 +393,11 @@ function createUnavailableModelItem(
manageSettingsUrl: string | undefined,
updateStateType: StateType,
section?: string,
showActionLink: boolean = true,
): IActionListItem<IActionWidgetDropdownAction> {
let description: string | MarkdownString | undefined;

if (reason === 'upgrade') {
description = showActionLink
? new MarkdownString(localize('chat.modelPicker.upgradeLink', "[Upgrade your plan](command:workbench.action.chat.upgradePlan \" \")"), { isTrusted: true })
: undefined;
description = new MarkdownString(localize('chat.modelPicker.upgradeLink', "[Upgrade your plan](command:workbench.action.chat.upgradePlan \" \")"), { isTrusted: true });
} else if (reason === 'update') {
description = localize('chat.modelPicker.updateDescription', "Update VS Code");
} else {
Expand Down
10 changes: 6 additions & 4 deletions src/vs/workbench/contrib/chat/test/browser/widget/input/chatModelPicker.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,7 @@ suite('buildModelPickerItems', () => {
assert.strictEqual(unavailable.group?.icon?.id, Codicon.blank.id);
});

test('anonymous user sees upgrade description only on first unavailable model', () => {
test('anonymous user sees upgrade description on each unavailable model', () => {
const auto = createAutoModel();
const items = callBuild([auto], {
recentModelIds: ['model-a', 'model-b'],
Expand All @@ -596,10 +596,11 @@ suite('buildModelPickerItems', () => {
assert.strictEqual(disabledItems.length, 2);
assert.ok(disabledItems[0].description instanceof MarkdownString);
assert.ok(disabledItems[0].description.value.includes('Upgrade'));
assert.strictEqual(disabledItems[1].description, undefined);
assert.ok(disabledItems[1].description instanceof MarkdownString);
assert.ok(disabledItems[1].description.value.includes('Upgrade'));
});

test('free user sees upgrade description only on first unavailable model', () => {
test('free user sees upgrade description on each unavailable model', () => {
const auto = createAutoModel();
const items = callBuild([auto], {
recentModelIds: ['model-a', 'model-b'],
Expand All @@ -614,7 +615,8 @@ suite('buildModelPickerItems', () => {
assert.strictEqual(disabledItems.length, 2);
assert.ok(disabledItems[0].description instanceof MarkdownString);
assert.ok(disabledItems[0].description.value.includes('Upgrade'));
assert.strictEqual(disabledItems[1].description, undefined);
assert.ok(disabledItems[1].description instanceof MarkdownString);
assert.ok(disabledItems[1].description.value.includes('Upgrade'));
});

test('anonymous user model selection triggers onSelect normally', () => {
Expand Down
Loading