Qualify chat model names with family (#254661)

aeschli · web-flow · commit d6b261f44406 · 2025-07-08T09:06:45.000-07:00
chat models in prompts: qualify name with family
diff --git a/src/vs/workbench/api/common/extHostLanguageModels.ts b/src/vs/workbench/api/common/extHostLanguageModels.ts
@@ -26,7 +26,6 @@ import * as typeConvert from './extHostTypeConverters.js';
 import * as extHostTypes from './extHostTypes.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../contrib/chat/common/modelPicker/modelPickerWidget.js';
 
 export interface IExtHostLanguageModels extends ExtHostLanguageModels { }
 
@@ -200,7 +199,7 @@ export class ExtHostLanguageModels implements ExtHostLanguageModelsShape {
 			targetExtensions: metadata.extensions,
 			isDefault: metadata.isDefault,
 			isUserSelectable: metadata.isUserSelectable,
-			modelPickerCategory: metadata.category ?? DEFAULT_MODEL_PICKER_CATEGORY,
+			modelPickerCategory: metadata.category,
 			capabilities: metadata.capabilities,
 		});
 
diff --git a/src/vs/workbench/contrib/chat/browser/chatInputPart.ts b/src/vs/workbench/contrib/chat/browser/chatInputPart.ts
@@ -453,7 +453,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 			const mode = this._currentModeObservable.read(r);
 			const model = mode.model?.read(r);
 			if (model) {
-				this.switchModelByName(model);
+				this.switchModelByQualifiedName(model);
 			}
 		}));
 	}
@@ -518,9 +518,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge
 		}
 	}
 
-	public switchModelByName(modelName: string): boolean {
+	public switchModelByQualifiedName(qualifiedModelName: string): boolean {
 		const models = this.getModels();
-		const model = models.find(m => m.metadata.name === modelName);
+		const model = models.find(m => ILanguageModelChatMetadata.asQualifiedName(m.metadata) === qualifiedModelName);
 		if (model) {
 			this.setCurrentLanguageModel(model);
 			return true;
diff --git a/src/vs/workbench/contrib/chat/browser/chatWidget.ts b/src/vs/workbench/contrib/chat/browser/chatWidget.ts
@@ -1116,9 +1116,9 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		}
 
 		this.inputPart.setChatMode(this.inlineInputPart.currentModeKind);
-		const currentModelName = this.inlineInputPart.selectedLanguageModel?.metadata.name;
-		if (currentModelName) {
-			this.inputPart.switchModelByName(currentModelName);
+		const currentModel = this.inlineInputPart.selectedLanguageModel;
+		if (currentModel) {
+			this.inputPart.switchModel(currentModel.metadata);
 		}
 
 		const isInput = this.configurationService.getValue<string>('chat.editRequests') === 'input';
@@ -1952,7 +1952,7 @@ export class ChatWidget extends Disposable implements IChatWidget {
 		}
 
 		if (model !== undefined) {
-			this.input.switchModelByName(model);
+			this.input.switchModelByQualifiedName(model);
 		}
 	}
 
diff --git a/src/vs/workbench/contrib/chat/browser/modelPicker/modelPickerActionItem.ts b/src/vs/workbench/contrib/chat/browser/modelPicker/modelPickerActionItem.ts
@@ -19,6 +19,7 @@ import { getFlatActionBarActions } from '../../../../../platform/actions/browser
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
 import { ChatEntitlement, IChatEntitlementService } from '../../common/chatEntitlementService.js';
 import { IKeybindingService } from '../../../../../platform/keybinding/common/keybinding.js';
+import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../common/modelPicker/modelPickerWidget.js';
 
 export interface IModelPickerDelegate {
 	readonly onDidChangeModel: Event<ILanguageModelChatMetadataAndIdentifier>;
@@ -35,7 +36,7 @@ function modelDelegateToWidgetActionsProvider(delegate: IModelPickerDelegate): I
 					id: model.metadata.id,
 					enabled: true,
 					checked: model.metadata.id === delegate.getCurrentModel()?.metadata.id,
-					category: model.metadata.modelPickerCategory,
+					category: model.metadata.modelPickerCategory || DEFAULT_MODEL_PICKER_CATEGORY,
 					class: undefined,
 					description: model.metadata.cost,
 					tooltip: model.metadata.description ?? model.metadata.name,
diff --git a/src/vs/workbench/contrib/chat/common/languageModels.ts b/src/vs/workbench/contrib/chat/common/languageModels.ts
@@ -134,7 +134,7 @@ export interface ILanguageModelChatMetadata {
 
 	readonly isDefault?: boolean;
 	readonly isUserSelectable?: boolean;
-	readonly modelPickerCategory: { label: string; order: number };
+	readonly modelPickerCategory: { label: string; order: number } | undefined;
 	readonly auth?: {
 		readonly providerLabel: string;
 		readonly accountLabel?: string;
@@ -151,6 +151,14 @@ export namespace ILanguageModelChatMetadata {
 		const supportsToolsAgent = typeof metadata.capabilities?.agentMode === 'undefined' || metadata.capabilities.agentMode;
 		return supportsToolsAgent && !!metadata.capabilities?.toolCalling;
 	}
+
+	export function asQualifiedName(metadata: ILanguageModelChatMetadata): string {
+		if (metadata.modelPickerCategory === undefined) {
+			// in the others category
+			return `${metadata.name} (${metadata.family})`;
+		}
+		return metadata.name;
+	}
 }
 
 export interface ILanguageModelChatResponse {
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderAutocompletion.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderAutocompletion.ts
@@ -228,7 +228,7 @@ export class PromptHeaderAutocompletion extends Disposable implements Completion
 			const metadata = this.languageModelsService.lookupLanguageModel(model);
 			if (metadata && metadata.isUserSelectable !== false) {
 				if (!agentModeOnly || ILanguageModelChatMetadata.suitableForAgentMode(metadata)) {
-					result.push(metadata.name);
+					result.push(ILanguageModelChatMetadata.asQualifiedName(metadata));
 				}
 			}
 		}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderDiagnosticsProvider.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderDiagnosticsProvider.ts
@@ -123,7 +123,7 @@ class PromptHeaderDiagnosticsProvider extends ProviderInstanceBase {
 	findModelByName(languageModes: string[], modelName: string): ILanguageModelChatMetadata | undefined {
 		for (const model of languageModes) {
 			const metadata = this.languageModelsService.lookupLanguageModel(model);
-			if (metadata && metadata.isUserSelectable !== false && metadata.name === modelName) {
+			if (metadata && metadata.isUserSelectable !== false && ILanguageModelChatMetadata.asQualifiedName(metadata) === modelName) {
 				return metadata;
 			}
 		}
diff --git a/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderHovers.ts b/src/vs/workbench/contrib/chat/common/promptSyntax/languageProviders/promptHeaderHovers.ts
@@ -12,7 +12,7 @@ import { Hover, HoverContext, HoverProvider } from '../../../../../../editor/com
 import { ITextModel } from '../../../../../../editor/common/model.js';
 import { ILanguageFeaturesService } from '../../../../../../editor/common/services/languageFeatures.js';
 import { localize } from '../../../../../../nls.js';
-import { ILanguageModelsService } from '../../languageModels.js';
+import { ILanguageModelChatMetadata, ILanguageModelsService } from '../../languageModels.js';
 import { ILanguageModelToolsService, ToolSet } from '../../languageModelToolsService.js';
 import { InstructionsHeader } from '../parsers/promptHeader/instructionsHeader.js';
 import { PromptModelMetadata } from '../parsers/promptHeader/metadata/model.js';
@@ -156,7 +156,7 @@ export class PromptHeaderHoverProvider extends Disposable implements HoverProvid
 		if (modelName) {
 			for (const id of this.languageModelsService.getLanguageModelIds()) {
 				const meta = this.languageModelsService.lookupLanguageModel(id);
-				if (meta && meta.name === modelName) {
+				if (meta && ILanguageModelChatMetadata.asQualifiedName(meta) === modelName) {
 					const lines: string[] = [];
 					lines.push(baseMessage + '\n');
 					lines.push(localize('modelName', '- Name: {0}', meta.name));
diff --git a/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts b/src/vs/workbench/contrib/chat/test/common/languageModels.test.ts
@@ -51,8 +51,8 @@ suite('LanguageModels', function () {
 				name: 'Pretty Name',
 				vendor: 'test-vendor',
 				family: 'test-family',
-				modelPickerCategory: DEFAULT_MODEL_PICKER_CATEGORY,
 				version: 'test-version',
+				modelPickerCategory: undefined,
 				id: 'test-id',
 				maxInputTokens: 100,
 				maxOutputTokens: 100,
@@ -72,7 +72,7 @@ suite('LanguageModels', function () {
 				vendor: 'test-vendor',
 				family: 'test2-family',
 				version: 'test2-version',
-				modelPickerCategory: DEFAULT_MODEL_PICKER_CATEGORY,
+				modelPickerCategory: undefined,
 				id: 'test-id',
 				maxInputTokens: 100,
 				maxOutputTokens: 100,

Original file line number	Diff line number	Diff line change
`@@ -453,7 +453,7 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge`
`453`	`453`	`const mode = this._currentModeObservable.read(r);`
`454`	`454`	`const model = mode.model?.read(r);`
`455`	`455`	`if (model) {`
`456`		`- this.switchModelByName(model);`
	`456`	`+ this.switchModelByQualifiedName(model);`
`457`	`457`	`}`
`458`	`458`	`}));`
`459`	`459`	`}`
`@@ -518,9 +518,9 @@ export class ChatInputPart extends Disposable implements IHistoryNavigationWidge`
`518`	`518`	`}`
`519`	`519`	`}`
`520`	`520`
`521`		`- public switchModelByName(modelName: string): boolean {`
	`521`	`+ public switchModelByQualifiedName(qualifiedModelName: string): boolean {`
`522`	`522`	`const models = this.getModels();`
`523`		`- const model = models.find(m => m.metadata.name === modelName);`
	`523`	`+ const model = models.find(m => ILanguageModelChatMetadata.asQualifiedName(m.metadata) === qualifiedModelName);`
`524`	`524`	`if (model) {`
`525`	`525`	`this.setCurrentLanguageModel(model);`
`526`	`526`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -1116,9 +1116,9 @@ export class ChatWidget extends Disposable implements IChatWidget {`
`1116`	`1116`	`}`
`1117`	`1117`
`1118`	`1118`	`this.inputPart.setChatMode(this.inlineInputPart.currentModeKind);`
`1119`		`- const currentModelName = this.inlineInputPart.selectedLanguageModel?.metadata.name;`
`1120`		`- if (currentModelName) {`
`1121`		`- this.inputPart.switchModelByName(currentModelName);`
	`1119`	`+ const currentModel = this.inlineInputPart.selectedLanguageModel;`
	`1120`	`+ if (currentModel) {`
	`1121`	`+ this.inputPart.switchModel(currentModel.metadata);`
`1122`	`1122`	`}`
`1123`	`1123`
`1124`	`1124`	`const isInput = this.configurationService.getValue<string>('chat.editRequests') === 'input';`
`@@ -1952,7 +1952,7 @@ export class ChatWidget extends Disposable implements IChatWidget {`
`1952`	`1952`	`}`
`1953`	`1953`
`1954`	`1954`	`if (model !== undefined) {`
`1955`		`- this.input.switchModelByName(model);`
	`1955`	`+ this.input.switchModelByQualifiedName(model);`
`1956`	`1956`	`}`
`1957`	`1957`	`}`
`1958`	`1958`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ export class PromptHeaderAutocompletion extends Disposable implements Completion`
`228`	`228`	`const metadata = this.languageModelsService.lookupLanguageModel(model);`
`229`	`229`	`if (metadata && metadata.isUserSelectable !== false) {`
`230`	`230`	`if (!agentModeOnly \|\| ILanguageModelChatMetadata.suitableForAgentMode(metadata)) {`
`231`		`- result.push(metadata.name);`
	`231`	`+ result.push(ILanguageModelChatMetadata.asQualifiedName(metadata));`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ class PromptHeaderDiagnosticsProvider extends ProviderInstanceBase {`
`123`	`123`	`findModelByName(languageModes: string[], modelName: string): ILanguageModelChatMetadata \| undefined {`
`124`	`124`	`for (const model of languageModes) {`
`125`	`125`	`const metadata = this.languageModelsService.lookupLanguageModel(model);`
`126`		`- if (metadata && metadata.isUserSelectable !== false && metadata.name === modelName) {`
	`126`	`+ if (metadata && metadata.isUserSelectable !== false && ILanguageModelChatMetadata.asQualifiedName(metadata) === modelName) {`
`127`	`127`	`return metadata;`
`128`	`128`	`}`
`129`	`129`	`}`