Falls to AI provider selection when the selected provider becomes disabled

(#4300, #4338)

Author: sergeibbb

src/plus/ai/aiProviderService.ts

@@ -325,12 +325,18 @@ export class AIProviderService implements Disposable {
 
 		let chosenProviderId: AIProviders | undefined;
 		let chosenModel: AIModel | undefined;
+		const orgAiConf = getOrgAIConfig();
 
 		if (!options?.force) {
-			const vsCodeModels = await this.getModels('vscode');
-			if (vsCodeModels.length !== 0) {
-				chosenProviderId = 'vscode';
-			} else if ((await this.container.subscription.getSubscription()).account?.verified) {
+			if (isProviderEnabledByOrg('vscode', orgAiConf)) {
+				const vsCodeModels = await this.getModels('vscode');
+				if (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);
@@ -422,6 +428,12 @@ export class AIProviderService implements Disposable {
 			providerId = model.provider.id;
 		}
 
+		if (providerId && !isProviderEnabledByOrg(providerId)) {
+			this._provider = undefined;
+			this._model = undefined;
+			return undefined;
+		}
+
 		let changed = false;
 
 		if (providerId !== this._provider?.id) {