Add provider ordering hint for chat model picker

package.json

@@ -3034,6 +3034,15 @@
 							"onExp"
 						]
 					},
+					"github.copilot.chat.modelPickerVendorOrdering": {
+						"type": "boolean",
+						"default": false,
+						"markdownDescription": "Enable vendor-prioritized ordering in the model picker (OpenAI → Anthropic → Gemini → others).",
+						"tags": [
+							"experimental",
+							"onExp"
+						]
+					},
 					"github.copilot.chat.customInstructionsInSystemMessage": {
 						"type": "boolean",
 						"default": true,
@@ -6400,5 +6409,5 @@
 		"node-gyp": "npm:node-gyp@10.3.1",
 		"zod": "3.25.76"
 	},
-	"vscodeCommit": "20b24833bc088c84b778ee89be4c17f15660441a"
+	"vscodeCommit": "b564ded0d644b449fc29633a7c571452b18d3350"
 }

src/extension/conversation/vscode-node/languageModelAccess.ts

@@ -11,7 +11,7 @@
 import { IBlockedExtensionService } from '../../../platform/chat/common/blockedExtensionService';
 import { ChatFetchResponseType, ChatLocation, getErrorDetailsFromChatFetchError } from '../../../platform/chat/common/commonTypes';
 import { getTextPart } from '../../../platform/chat/common/globalStringUtils';
-import { IConfigurationService } from '../../../platform/configuration/common/configurationService';
+import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService';
 import { EmbeddingType, getWellKnownEmbeddingTypeInfo, IEmbeddingsComputer } from '../../../platform/embeddings/common/embeddingsComputer';
 import { IEndpointProvider } from '../../../platform/endpoint/common/endpointProvider';
 import { CustomDataPartMimeTypes } from '../../../platform/endpoint/common/endpointTypes';
@@ -159,6 +159,24 @@
 	return undefined;
 }
 
+/**
+ * Returns a numeric priority for ordering in the model picker.
+ * Lower values appear first. Top-level featuring remains controlled by
+ * VS Code's models control manifest; this priority only affects ordering.
+ */
+function getVendorPriority(modelProvider: string): number {
+	switch (modelProvider.toLowerCase()) {
+		case 'openai':
+			return 0;
+		case 'anthropic':
+			return 1;
+		case 'google':
+			return 2;
+		default:
+			return 3;
+	}
+}
+
 export class LanguageModelAccess extends Disposable implements IExtensionContribution {
 
 	readonly id = 'languageModelAccess';
@@ -180,6 +198,7 @@
 		@IVSCodeExtensionContext private readonly _vsCodeExtensionContext: IVSCodeExtensionContext,
 		@IAutomodeService private readonly _automodeService: IAutomodeService,
 		@IExperimentationService private readonly _expService: IExperimentationService,
+		@IConfigurationService private readonly _configurationService: IConfigurationService,
 	) {
 		super();
 
@@ -236,6 +255,7 @@
 		}
 
 		const models: vscode.LanguageModelChatInformation[] = [];
+		const vendorOrderingEnabled = this._configurationService.getConfig(ConfigKey.ModelPickerVendorOrdering);
 		const allEndpoints = await this._endpointProvider.getAllChatEndpoints();
 		const chatEndpoints = allEndpoints.filter(e => e.showInModelPicker || e.model === 'gpt-4o-mini');
 		const autoEndpoint = await this._automodeService.resolveAutoModeEndpoint(undefined, allEndpoints);
@@ -338,6 +358,7 @@
 					[ApiChatLocation.Editor]: endpoint instanceof AutoChatEndpoint, // inline chat gets 'Auto' by default
 				},
 				isUserSelectable: endpoint.showInModelPicker,
+				vendorPriority: vendorOrderingEnabled && !(endpoint instanceof AutoChatEndpoint) ? getVendorPriority(endpoint.modelProvider) : undefined,
 				capabilities: {
 					imageInput: endpoint instanceof AutoChatEndpoint ? true : endpoint.supportsVision,
 					toolCalling: endpoint.supportsToolCalls,

src/platform/configuration/common/configurationService.ts

@@ -876,6 +876,9 @@ export namespace ConfigKey {
 
 	export const RateLimitAutoSwitchToAuto = defineSetting<boolean>('chat.rateLimitAutoSwitchToAuto', ConfigType.Simple, false, vBoolean());
 
+	/** Enable vendor-prioritized ordering in the model picker */
+	export const ModelPickerVendorOrdering = defineSetting<boolean>('chat.modelPickerVendorOrdering', ConfigType.Simple, false, vBoolean());
+
 	/** Use the Messages API instead of Chat Completions when supported */
 	export const UseAnthropicMessagesApi = defineSetting<boolean | undefined>('chat.anthropic.useMessagesApi', ConfigType.ExperimentBased, true);
 	/** Context editing mode for Anthropic Messages API. 'off' disables context editing. */