Skip to content

sessions: use compare icon for model comparisons #342960

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
Megan Rogge (meganrogge) merged 1 commit into from
Oct 20, 2026
Merged

sessions: use compare icon for model comparisons #342960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/vs/base/common/codicons.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const codiconsDerived = {
debugBreakpointPending: register('debug-breakpoint-pending', 0xebd9),
chatImport: register('chat-import', 0xec86),
chatExport: register('chat-export', 0xec87),
compare: register('compare', 0xecfa),

} as const;

Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/chat/browser/widget/input/modelPicker/modelPickerTabbedWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ export class TabbedModelPicker extends Disposable {
// Grouped with Search at the end of the tab bar, away from the provider tabs.
actions.push({
id: 'comparison',
icon: Codicon.trophy,
icon: Codicon.compare,
tooltip: this._labelWithKeybinding(comparison.label, comparison.startCommandId),
alignEnd: true,
useManagedHover: true,
Expand Down
2 changes: 1 addition & 1 deletion src/vs/workbench/contrib/chat/browser/widget/input/modelPicker/modelPickerWidget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ export class ModelPickerWidget extends Disposable {
const nameChildren: (HTMLElement | string)[] = [];
const compact = this._compact?.get() ?? false;
const minimal = this._minimal?.get() ?? false;
const modelIcon = comparisonSummary ? Codicon.trophy : shownModel
const modelIcon = comparisonSummary ? Codicon.compare : shownModel
? (this._delegate.getPresentationOptions().showModelIcon
? getCompactModelPickerIcon(shownModel)
: shownModel.metadata.statusIcon ? getCompactCodicon(shownModel.metadata.statusIcon) : undefined)
Expand Down
24 changes: 12 additions & 12 deletions ...orkbench/contrib/chat/test/browser/widget/input/modelPicker/modelPickerActionItem.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ suite('ModelPickerActionItem', () => {
});
const label = () => ({
text: domNode.querySelector('.model-picker-name .chat-input-picker-label')?.textContent,
trophy: !!domNode.querySelector('.codicon-trophy'),
compare: !!domNode.querySelector('.codicon-compare'),
ariaLabel: domNode.querySelector('.model-picker-name')?.getAttribute('aria-label'),
});
const initial = label();
Expand All @@ -333,15 +333,15 @@ suite('ModelPickerActionItem', () => {
const dismissed = label();
summary.set(undefined, undefined);
assert.deepStrictEqual({ initial, duringSetup, committed, dismissed, reset: label() }, {
initial: { text: 'First', trophy: false, ariaLabel: 'Models, First' },
duringSetup: { text: 'First', trophy: false, ariaLabel: 'Models, First' },
committed: { text: undefined, trophy: true, ariaLabel: 'Models, 3 Attempts' },
dismissed: { text: undefined, trophy: true, ariaLabel: 'Models, 3 Attempts' },
reset: { text: 'First', trophy: false, ariaLabel: 'Models, First' },
initial: { text: 'First', compare: false, ariaLabel: 'Models, First' },
duringSetup: { text: 'First', compare: false, ariaLabel: 'Models, First' },
committed: { text: undefined, compare: true, ariaLabel: 'Models, 3 Attempts' },
dismissed: { text: undefined, compare: true, ariaLabel: 'Models, 3 Attempts' },
reset: { text: 'First', compare: false, ariaLabel: 'Models, First' },
});
});

test('composer uses one trophy and preserves variant names in its accessible label and hover', () => {
test('composer uses one compare icon and preserves variant names in its accessible label and hover', () => {
const model = createModel('First');
const { domNode, getHoverContents } = renderPicker(model, {
compact: true,
Expand All @@ -355,13 +355,13 @@ suite('ModelPickerActionItem', () => {

assert.deepStrictEqual({
label: domNode.querySelector('.chat-input-picker-label')?.textContent,
trophies: domNode.querySelectorAll('.model-picker-name > .codicon-trophy').length,
compareIcons: domNode.querySelectorAll('.model-picker-name > .codicon-compare').length,
icons: domNode.querySelectorAll('.model-picker-name > .codicon').length,
ariaLabel: domNode.querySelector('.model-picker-name')?.getAttribute('aria-label'),
hover: getHoverContents(),
}, {
label: undefined,
trophies: 1,
compareIcons: 1,
icons: 1,
ariaLabel: 'Models, First, First Max',
hover: 'Models • First, First Max',
Expand All @@ -374,7 +374,7 @@ suite('ModelPickerActionItem', () => {
{ name: 'minimal', compact: false, minimal: true, showModelIcon: true },
{ name: 'without model icons', compact: false, minimal: false, showModelIcon: false },
]) {
test(`composer uses one trophy for a distinct-model comparison (${presentation.name})`, () => {
test(`composer uses one compare icon for a distinct-model comparison (${presentation.name})`, () => {
const first = createModel('First');
const second = createModel('Second');
const { domNode } = renderPicker(first, {
Expand All @@ -390,12 +390,12 @@ suite('ModelPickerActionItem', () => {
});

assert.deepStrictEqual({
trophies: domNode.querySelectorAll('.model-picker-name > .codicon-trophy').length,
compareIcons: domNode.querySelectorAll('.model-picker-name > .codicon-compare').length,
icons: domNode.querySelectorAll('.model-picker-name > .codicon').length,
label: domNode.querySelector('.chat-input-picker-label')?.textContent,
ariaLabel: domNode.querySelector('.model-picker-name')?.getAttribute('aria-label'),
}, {
trophies: 1,
compareIcons: 1,
icons: 1,
label: undefined,
ariaLabel: 'Models, First, Second',
Expand Down
10 changes: 5 additions & 5 deletions ...kbench/contrib/chat/test/browser/widget/input/modelPicker/modelPickerTabbedWidget.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,7 @@ suite('TabbedModelPicker', () => {
const { popup } = createPicker({ comparison });
assert.deepStrictEqual({
hint: !!popup.querySelector('.tabbed-action-list-footer'),
toggle: !!popup.querySelector('[aria-label="Compare Models"] .codicon-trophy'),
toggle: !!popup.querySelector('[aria-label="Compare Models"] .codicon-compare'),
}, { hint: showHint === true, toggle: true });
});
}
Expand Down Expand Up @@ -911,7 +911,7 @@ suite('TabbedModelPicker', () => {
const toggle = element(popup, '[aria-label="Compare Models"]');
const style = dom.getWindow(toggle).getComputedStyle(toggle);
return {
trophy: !!toggle.querySelector('.codicon-trophy'), pressed: toggle.getAttribute('aria-pressed'),
compare: !!toggle.querySelector('.codicon-compare'), pressed: toggle.getAttribute('aria-pressed'),
background: style.backgroundColor, border: style.borderColor,
width: toggle.offsetWidth, height: toggle.offsetHeight,
};
Expand All @@ -933,9 +933,9 @@ suite('TabbedModelPicker', () => {
initialToggle, activeToggle, inactiveToggle: toggleState(),
}, {
rows: initialModels, height: initialRows,
initialToggle: { trophy: true, pressed: 'false', background: 'rgba(0, 0, 0, 0)', border: 'rgba(0, 0, 0, 0)', width: 28, height: 28 },
activeToggle: { trophy: true, pressed: 'true', background: 'rgb(10, 20, 30)', border: 'rgb(40, 50, 60)', width: 28, height: 28 },
inactiveToggle: { trophy: true, pressed: 'false', background: 'rgba(0, 0, 0, 0)', border: 'rgba(0, 0, 0, 0)', width: 28, height: 28 },
initialToggle: { compare: true, pressed: 'false', background: 'rgba(0, 0, 0, 0)', border: 'rgba(0, 0, 0, 0)', width: 28, height: 28 },
activeToggle: { compare: true, pressed: 'true', background: 'rgb(10, 20, 30)', border: 'rgb(40, 50, 60)', width: 28, height: 28 },
inactiveToggle: { compare: true, pressed: 'false', background: 'rgba(0, 0, 0, 0)', border: 'rgba(0, 0, 0, 0)', width: 28, height: 28 },
});
element(popup, '[aria-label="Compare Models"]').click();
element(popup, '.model-picker-comparison-done').click();
Expand Down
Loading