Ensure claude code respects model picker (#4614) (#4626)

* Ensure claude code respects model picker

* Update src/extension/chatSessions/claude/node/test/claudeCodeModels.spec.ts



---------

Co-authored-by: Logan Ramos <loganramos@microsoft.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: 3 people

package-lock.json

@@ -2,7 +2,7 @@
 	"name": "copilot-chat",
 	"displayName": "GitHub Copilot Chat",
 	"description": "AI chat features powered by Copilot",
-	"version": "0.41.0",
+	"version": "0.41.1",
 	"build": "1",
 	"internalAIKey": "1058ec22-3c95-4951-8443-f26c1f325911",
 	"completionsCoreVersion": "1.378.1799",

package.json

@@ -37,6 +37,10 @@ export interface IClaudeCodeModels {
 	getDefaultModel(): Promise<string>;
 	setDefaultModel(modelId: string | undefined): Promise<void>;
 	getModels(): Promise<ClaudeCodeModelInfo[]>;
+	/**
+	 * Gets the filtered list of Claude chat endpoints that support the Messages API.
+	 */
+	getEndpoints(): Promise<IChatEndpoint[]>;
 	/**
 	 * Maps an SDK model ID to the best matching endpoint model ID.
 	 * SDK model IDs are raw Anthropic API model IDs (e.g., 'claude-opus-4-5-20251101').
@@ -151,6 +155,10 @@ export class ClaudeCodeModels extends Disposable implements IClaudeCodeModels {
 		return endpoints.map(e => ({ id: e.model, name: e.name, multiplier: e.multiplier }));
 	}
 
+	public async getEndpoints(): Promise<IChatEndpoint[]> {
+		return this._getEndpoints();
+	}
+
 	private async _fetchAvailableEndpoints(): Promise<IChatEndpoint[]> {
 		try {
 			const endpoints = await this.endpointProvider.getAllChatEndpoints();
@@ -159,6 +167,7 @@ export class ClaudeCodeModels extends Disposable implements IClaudeCodeModels {
 			// and use the Messages API (required for Claude Code)
 			const claudeEndpoints = endpoints.filter(e =>
 				e.supportsToolCalls &&
+				e.showInModelPicker &&
 				(e.family?.toLowerCase().includes('claude') || e.model?.toLowerCase().includes('claude')) &&
 				e.apiType === 'messages'
 			);

src/extension/chatSessions/claude/node/claudeCodeModels.ts

@@ -9,7 +9,7 @@ import { Raw } from '@vscode/prompt-tsx';
 import * as http from 'http';
 import { IChatMLFetcher, Source } from '../../../../platform/chat/common/chatMLFetcher';
 import { ChatLocation, ChatResponse } from '../../../../platform/chat/common/commonTypes';
-import { CustomModel, EndpointEditToolName, IEndpointProvider } from '../../../../platform/endpoint/common/endpointProvider';
+import { CustomModel, EndpointEditToolName } from '../../../../platform/endpoint/common/endpointProvider';
 import { AnthropicMessagesProcessor } from '../../../../platform/endpoint/node/messagesApi';
 import { ILogService } from '../../../../platform/log/common/logService';
 import { FinishedCallback, OptionalChatRequestParams } from '../../../../platform/networking/common/fetch';
@@ -26,6 +26,7 @@ import { Disposable, toDisposable } from '../../../../util/vs/base/common/lifecy
 import { SSEParser } from '../../../../util/vs/base/common/sseParser';
 import { generateUuid } from '../../../../util/vs/base/common/uuid';
 import { IInstantiationService } from '../../../../util/vs/platform/instantiation/common/instantiation';
+import { IClaudeCodeModels } from './claudeCodeModels';
 import { IClaudeSessionStateService } from './claudeSessionStateService';
 
 /**
@@ -75,10 +76,10 @@ export class ClaudeLanguageModelServer extends Disposable {
 
 	constructor(
 		@ILogService private readonly logService: ILogService,
-		@IEndpointProvider private readonly endpointProvider: IEndpointProvider,
 		@IClaudeSessionStateService private readonly sessionStateService: IClaudeSessionStateService,
 		@IRequestLogger private readonly requestLogger: IRequestLogger,
 		@IInstantiationService private readonly instantiationService: IInstantiationService,
+		@IClaudeCodeModels private readonly claudeCodeModels: IClaudeCodeModels,
 	) {
 		super();
 		this.config = {
@@ -155,9 +156,7 @@ export class ClaudeLanguageModelServer extends Disposable {
 		try {
 			const requestBody: AnthropicMessagesRequest = JSON.parse(bodyString);
 
-			const allEndpoints = await this.endpointProvider.getAllChatEndpoints();
-			// Filter to only endpoints that support the Messages API and are eligible for model picker (i.e. not hidden)
-			const endpoints = allEndpoints.filter(e => e.apiType === 'messages' && e.showInModelPicker);
+			const endpoints = await this.claudeCodeModels.getEndpoints();
 			if (endpoints.length === 0) {
 				this.error('No Claude models with Messages API available');
 				this.sendErrorResponse(res, 404, 'not_found_error', 'No Claude models with Messages API available');

src/extension/chatSessions/claude/node/claudeLanguageModelServer.ts

@@ -269,17 +269,17 @@ describe('ClaudeCodeModels', () => {
 			expect(models).toHaveLength(0);
 		});
 
-		it('does not filter by showInModelPicker', async () => {
+		it('does filter by showInModelPicker', async () => {
 			const service = createServiceWithEndpoints([
 				createMockEndpoint({ model: 'claude-sonnet-4-model', name: 'Claude Sonnet 4', family: 'claude-sonnet-4', showInModelPicker: true }),
 				createMockEndpoint({ model: 'claude-hidden', name: 'Claude Hidden', family: 'claude-hidden-1', showInModelPicker: false }),
 			]);
 
 			const models = await service.getModels();
 
-			expect(models).toHaveLength(2);
+			expect(models).toHaveLength(1);
 			const modelIds = models.map(m => m.id).sort();
-			expect(modelIds).toEqual(['claude-hidden', 'claude-sonnet-4-model']);
+			expect(modelIds).toEqual(['claude-sonnet-4-model']);
 		});
 	});