Adds utility function to ensure AI features

Author: d13

src/plus/ai/aiProviderService.ts

@@ -37,7 +37,6 @@ import { assertsCommitHasFullDetails } from '../../git/utils/commit.utils';
 import { showAIModelPicker, showAIProviderPicker } from '../../quickpicks/aiModelPicker';
 import { Directive, isDirective } from '../../quickpicks/items/directive';
 import { configuration } from '../../system/-webview/configuration';
-import { getContext } from '../../system/-webview/context';
 import type { Storage } from '../../system/-webview/storage';
 import { debounce } from '../../system/function/debounce';
 import { map } from '../../system/iterable';
@@ -66,6 +65,7 @@ import type {
 	PromptTemplateType,
 } from './models/promptTemplates';
 import type { AIChatMessage, AIProvider, AIRequestResult } from './models/provider';
+import { ensureAccess } from './utils/-webview/ai.utils';
 import { getLocalPromptTemplate, resolvePrompt } from './utils/-webview/prompt.utils';
 
 export interface AIResult {
@@ -468,24 +468,8 @@ export class AIProviderService implements Disposable {
 		return model;
 	}
 
-	private async ensureAccess(): Promise<boolean> {
-		const aiEnabled = configuration.get('ai.enabled');
-		if (aiEnabled === false) {
-			await window.showErrorMessage(`AI features have been disabled via GitLens settings.`);
-			return false;
-		}
-
-		const orgEnabled = getContext('gitlens:gk:organization:ai:enabled');
-		if (orgEnabled === false) {
-			await window.showErrorMessage(`AI features have been disabled for your organization.`);
-			return false;
-		}
-
-		return true;
-	}
-
 	private async ensureFeatureAccess(feature: AIFeatures, source: Source): Promise<boolean> {
-		if (!(await this.ensureAccess())) return false;
+		if (!(await ensureAccess())) return false;
 
 		if (feature === 'generate-commitMessage') return true;
 		if (

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

@@ -4,6 +4,7 @@ import type { AIProviders } from '../../../../constants.ai';
 import type { Container } from '../../../../container';
 import { createDirectiveQuickPickItem, Directive } from '../../../../quickpicks/items/directive';
 import { configuration } from '../../../../system/-webview/configuration';
+import { getContext } from '../../../../system/-webview/context';
 import { openSettingsEditor } from '../../../../system/-webview/vscode/editors';
 import { formatNumeric } from '../../../../system/date';
 import { getPossessiveForm, pluralize } from '../../../../system/string';
@@ -166,3 +167,54 @@ export function showPromptTruncationWarning(model: AIModel): void {
 export function isAzureUrl(url: string): boolean {
 	return url.includes('.azure.com');
 }
+
+export async function ensureAccess(options?: { showPicker?: boolean }): Promise<boolean> {
+	const showPicker = options?.showPicker ?? false;
+
+	if (!getContext('gitlens:gk:organization:ai:enabled', true)) {
+		if (showPicker) {
+			await window.showQuickPick([{ label: 'OK' }], {
+				title: 'AI is Disabled',
+				placeHolder: 'GitLens AI features have been disabled by your GitKraken admin',
+				canPickMany: false,
+			});
+		} else {
+			await window.showErrorMessage(`AI features have been disabled by your GitKraken admin.`);
+		}
+
+		return false;
+	}
+
+	if (!configuration.get('ai.enabled')) {
+		let reenable = false;
+		if (showPicker) {
+			const enable = { label: 'Re-enable AI Features' };
+			const pick = await window.showQuickPick([{ label: 'OK' }, enable], {
+				title: 'AI is Disabled',
+				placeHolder: 'GitLens AI features have been disabled via settings',
+				canPickMany: false,
+			});
+			if (pick === enable) {
+				reenable = true;
+			}
+		} else {
+			const enable = { title: 'Re-enable AI Features' };
+			const result = await window.showErrorMessage(
+				`AI features have been disabled via GitLens settings.`,
+				enable,
+			);
+			if (result === enable) {
+				reenable = true;
+			}
+		}
+
+		if (reenable) {
+			await configuration.updateEffective('ai.enabled', true);
+			return true;
+		}
+
+		return false;
+	}
+
+	return true;
+}

src/quickpicks/aiModelPicker.ts

@@ -3,9 +3,8 @@ import { QuickInputButtons, ThemeIcon, window } from 'vscode';
 import type { AIProviders } from '../constants.ai';
 import type { Container } from '../container';
 import type { AIModel, AIModelDescriptor, AIProviderDescriptorWithConfiguration } from '../plus/ai/models/model';
+import { ensureAccess } from '../plus/ai/utils/-webview/ai.utils';
 import { isSubscriptionPaidPlan } from '../plus/gk/utils/subscription.utils';
-import { configuration } from '../system/-webview/configuration';
-import { getContext } from '../system/-webview/context';
 import { getQuickPickIgnoreFocusOut } from '../system/-webview/vscode';
 import { getSettledValue } from '../system/promise';
 import { createQuickPickSeparator } from './items/common';
@@ -34,25 +33,7 @@ export async function showAIProviderPicker(
 	container: Container,
 	current: AIModelDescriptor | undefined,
 ): Promise<ProviderQuickPickItem | undefined> {
-	if (!configuration.get('ai.enabled')) {
-		await window.showQuickPick([{ label: 'OK' }], {
-			title: 'AI is Disabled',
-			placeHolder: 'GitLens AI features have been disabled via settings',
-			canPickMany: false,
-		});
-
-		return undefined;
-	}
-
-	if (!getContext('gitlens:gk:organization:ai:enabled', true)) {
-		await window.showQuickPick([{ label: 'OK' }], {
-			title: 'AI is Disabled',
-			placeHolder: 'GitLens AI features have been disabled by your GitKraken admin',
-			canPickMany: false,
-		});
-
-		return undefined;
-	}
+	if (!(await ensureAccess({ showPicker: true }))) return undefined;
 
 	const [providersResult, modelResult, subscriptionResult] = await Promise.allSettled([
 		container.ai.getProvidersConfiguration(),
@@ -150,25 +131,7 @@ export async function showAIModelPicker(
 	provider: AIProviders,
 	current?: AIModelDescriptor,
 ): Promise<ModelQuickPickItem | Directive | undefined> {
-	if (!configuration.get('ai.enabled')) {
-		await window.showQuickPick([{ label: 'OK' }], {
-			title: 'AI is Disabled',
-			placeHolder: 'GitLens AI features have been disabled via settings',
-			canPickMany: false,
-		});
-
-		return undefined;
-	}
-
-	if (!getContext('gitlens:gk:organization:ai:enabled', true)) {
-		await window.showQuickPick([{ label: 'OK' }], {
-			title: 'AI is Disabled',
-			placeHolder: 'GitLens AI features have been disabled by your GitKraken admin',
-			canPickMany: false,
-		});
-
-		return undefined;
-	}
+	if (!(await ensureAccess({ showPicker: true }))) return undefined;
 
 	const models = (await container.ai.getModels(provider)) ?? [];