Improves AI provider/model fallback handling

Author: eamodio

src/plus/ai/aiProviderService.ts

@@ -327,57 +327,92 @@ export class AIProviderService implements Disposable {
 		return modelResults.flatMap(m => getSettledValue(m, []));
 	}
 
+	private async getBestFallbackModel(): Promise<AIModel | undefined> {
+		let model: AIModel | undefined;
+		let models: readonly AIModel[];
+
+		const orgAIConfig = getOrgAIConfig();
+		// First, use Copilot GPT 4.1 or first model
+		if (isProviderEnabledByOrg('vscode', orgAIConfig)) {
+			try {
+				models = await this.getModels('vscode');
+				if (models.length) {
+					model = models.find(m => m.id === 'copilot:gpt-4.1') ?? models[0];
+					if (model != null) return model;
+				}
+			} catch {}
+		}
+
+		// Second, use the GitKraken AI default or first model
+		if (isProviderEnabledByOrg('gitkraken', orgAIConfig)) {
+			try {
+				const subscription = await this.container.subscription.getSubscription();
+				if (subscription.account?.verified) {
+					models = await this.getModels('gitkraken');
+
+					model = models.find(m => m.default) ?? models[0];
+					if (model != null) return model;
+				}
+			} catch {}
+		}
+
+		return model;
+	}
+
 	async getModel(options?: { force?: boolean; silent?: boolean }, source?: Source): Promise<AIModel | undefined> {
 		const cfg = this.getConfiguredModel();
 		if (!options?.force && cfg?.provider != null && cfg?.model != null) {
 			const model = await this.getOrUpdateModel(cfg.provider, cfg.model);
 			if (model != null) return model;
 		}
 
-		if (options?.silent) return undefined;
-
-		let chosenProviderId: AIProviders | undefined;
 		let chosenModel: AIModel | undefined;
-		const orgAiConf = getOrgAIConfig();
-
-		if (!options?.force) {
-			const vsCodeModels = await this.getModels('vscode');
-			if (isProviderEnabledByOrg('vscode', orgAiConf) && vsCodeModels.length !== 0) {
-				chosenProviderId = 'vscode';
-			} else if (
-				isProviderEnabledByOrg('gitkraken', orgAiConf) &&
-				(await this.container.subscription.getSubscription()).account?.verified
-			) {
-				chosenProviderId = 'gitkraken';
-				const gitkrakenModels = await this.getModels('gitkraken');
-				chosenModel = gitkrakenModels.find(m => m.default);
+		let chosenProviderId: AIProviders | undefined;
+		const fallbackModel = lazy(() => this.getBestFallbackModel());
+
+		if (!options?.silent) {
+			if (!options?.force) {
+				chosenModel = await fallbackModel.value;
+				chosenProviderId = chosenModel?.provider.id;
 			}
-		}
 
-		while (true) {
-			chosenProviderId ??= (await showAIProviderPicker(this.container, cfg))?.provider;
-			if (chosenProviderId == null) return;
+			while (true) {
+				chosenProviderId ??= (await showAIProviderPicker(this.container, cfg))?.provider;
+				if (chosenProviderId == null) {
+					chosenModel = undefined;
+					break;
+				}
+
+				const provider = supportedAIProviders.get(chosenProviderId);
+				if (provider == null) {
+					chosenModel = undefined;
+					break;
+				}
 
-			const provider = supportedAIProviders.get(chosenProviderId);
-			if (provider == null) return;
+				if (!(await this.ensureProviderConfigured(provider, false))) {
+					chosenModel = undefined;
+				}
 
-			if (!(await this.ensureProviderConfigured(provider, false))) return;
+				if (chosenModel == null) {
+					const result = await showAIModelPicker(this.container, chosenProviderId, cfg);
+					if (result == null || (isDirective(result) && result !== Directive.Back)) {
+						chosenModel = undefined;
+						break;
+					}
+					if (result === Directive.Back) {
+						chosenProviderId = undefined;
+						continue;
+					}
 
-			if (chosenModel == null) {
-				const result = await showAIModelPicker(this.container, chosenProviderId, cfg);
-				if (result == null || (isDirective(result) && result !== Directive.Back)) return;
-				if (result === Directive.Back) {
-					chosenProviderId = undefined;
-					continue;
+					chosenModel = result.model;
 				}
 
-				chosenModel = result.model;
+				break;
 			}
-
-			break;
 		}
 
-		const model = await this.getOrUpdateModel(chosenModel);
+		chosenModel ??= await fallbackModel.value;
+		const model = chosenModel == null ? undefined : await this.getOrUpdateModel(chosenModel);
 
 		this.container.telemetry.sendEvent(
 			'ai/switchModel',
@@ -391,7 +426,9 @@ export class AIProviderService implements Disposable {
 			source,
 		);
 
-		void (await showConfirmAIProviderToS(this.container.storage));
+		if (model != null) {
+			void (await showConfirmAIProviderToS(this.container.storage));
+		}
 		return model;
 	}
 

src/plus/ai/utils/-webview/ai.utils.ts

@@ -189,15 +189,15 @@ export function getOrgAIConfig(): OrgAIConfig {
 	};
 }
 
-export function getOrgAIProviderOfType(type: AIProviders, orgAiConfig?: OrgAIConfig): OrgAIProvider {
-	orgAiConfig ??= getOrgAIConfig();
-	if (!orgAiConfig.aiEnabled) return { type: type, enabled: false };
-	if (!orgAiConfig.enforceAiProviders) return { type: type, enabled: true };
-	return orgAiConfig.aiProviders[type] ?? { type: type, enabled: false };
+export function getOrgAIProviderOfType(type: AIProviders, orgAIConfig?: OrgAIConfig): OrgAIProvider {
+	orgAIConfig ??= getOrgAIConfig();
+	if (!orgAIConfig.aiEnabled) return { type: type, enabled: false };
+	if (!orgAIConfig.enforceAiProviders) return { type: type, enabled: true };
+	return orgAIConfig.aiProviders[type] ?? { type: type, enabled: false };
 }
 
-export function isProviderEnabledByOrg(type: AIProviders, orgAiConfig?: OrgAIConfig): boolean {
-	return getOrgAIProviderOfType(type, orgAiConfig).enabled;
+export function isProviderEnabledByOrg(type: AIProviders, orgAIConfig?: OrgAIConfig): boolean {
+	return getOrgAIProviderOfType(type, orgAIConfig).enabled;
 }
 
 /**

src/quickpicks/aiModelPicker.ts

@@ -137,10 +137,11 @@ export async function showAIModelPicker(
 
 	const items: Array<ModelQuickPickItem | DirectiveQuickPickItem> = [];
 
-	if (models.length === 0 && provider === 'ollama') {
+	if (!models.length) {
 		items.push({
 			label: 'No models found',
-			description: 'Please install a model or check your Ollama server configuration',
+			description:
+				provider === 'ollama' ? 'Please install a model or check your Ollama server configuration' : undefined,
 			iconPath: new ThemeIcon('error'),
 			directive: Directive.Noop,
 		} satisfies ModelQuickPickItem | DirectiveQuickPickItem);