Skip to content

[pull] main from microsoft:main #831

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
pull merged 2 commits into from
Jan 18, 2026
Merged

[pull] main from microsoft:main #831

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
434f92e
Chat - fix working set secondary text button height (#288704)
lszomoru Jan 18, 2026
df2c074
fix skipping models from other vendors (#288713)
sandy081 Jan 18, 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
3 changes: 1 addition & 2 deletions src/vs/workbench/contrib/chat/browser/widget/media/chat.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1020,14 +1020,13 @@ have to be updated for changes to the rules above, or to support more deeply nes

.interactive-session .chat-editing-session .chat-editing-session-actions .monaco-button.secondary.monaco-text-button.codicon {
cursor: pointer;
padding: 3px;
padding: 2px;
border-radius: 4px;
display: inline-flex;
}

.interactive-session .chat-editing-session .chat-editing-session-actions .monaco-button.secondary.monaco-text-button {
background-color: var(--vscode-button-secondaryBackground);
border: 1px solid var(--vscode-button-border);
color: var(--vscode-button-secondaryForeground);
}

Expand Down
10 changes: 8 additions & 2 deletions src/vs/workbench/contrib/chat/common/languageModels.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,14 @@ export class LanguageModelsService implements ILanguageModelsService {
allModels.push(...models);
const modelIdentifiers = [];
for (const m of models) {
// Special case for copilot models - they are all user selectable unless marked otherwise
if (vendorId === 'copilot' && (m.metadata.isUserSelectable || this._modelPickerUserPreferences[m.identifier] === true)) {
if (vendorId === 'copilot') {
// Special case for copilot models - they are all user selectable unless marked otherwise
if (m.metadata.isUserSelectable || this._modelPickerUserPreferences[m.identifier] === true) {
modelIdentifiers.push(m.identifier);
} else {
this._logService.trace(`[LM] Skipping model ${m.identifier} from model picker as it is not user selectable.`);
}
} else {
modelIdentifiers.push(m.identifier);
}
}
Expand Down
Loading