Improves command naming and UX

Author: axosoft-ramint

contributions.json

@@ -4570,7 +4570,7 @@
 			}
 		},
 		"gitlens.switchAIModel": {
-			"label": "Switch AI Model",
+			"label": "Switch AI Provider/Model",
 			"commandPalette": "gitlens:enabled && gitlens:gk:organization:ai:enabled"
 		},
 		"gitlens.switchMode": {

package.json

@@ -7705,7 +7705,7 @@
 			},
 			{
 				"command": "gitlens.switchAIModel",
-				"title": "Switch AI Model",
+				"title": "Switch AI Provider/Model",
 				"category": "GitLens"
 			},
 			{

src/constants.ai.ts

@@ -13,3 +13,6 @@ export const primaryAIProviders = ['gitkraken', 'vscode'] as const satisfies rea
 
 export type AIProviderAndModel = `${string}:${string}`;
 export type SupportedAIModels = `${Exclude<AIProviders, AIPrimaryProviders>}:${string}` | AIPrimaryProviders;
+
+export const aiProviderDataDisclaimer =
+	'GitLens AI features can send code snippets, diffs and other context to your selected AI provider for analysis. This may contain sensitive information.';

src/constants.storage.ts

@@ -25,7 +25,7 @@ export const enum SyncedStorageKeys {
 }
 
 export type DeprecatedGlobalStorage = {
-	/** @deprecated use `confirm:ai:tos:${AIProviders}` */
+	/** @deprecated use `confirm:ai:tos` */
 	'confirm:sendToOpenAI': boolean;
 	/** @deprecated */
 	'home:actions:completed': ('dismissed:welcome' | 'opened:scm')[];
@@ -54,10 +54,14 @@ export type DeprecatedGlobalStorage = {
 } & {
 	/** @deprecated */
 	[key in `disallow:connection:${string}`]: any;
+} & {
+	/** @deprecated use `confirm:ai:tos` */
+	[key in `confirm:ai:tos:${AIProviders}`]: boolean;
 };
 
 export type GlobalStorage = {
 	avatars: [string, StoredAvatar][];
+	'confirm:ai:tos': boolean;
 	repoVisibility: [string, StoredRepoVisibilityInfo][];
 	'deepLinks:pending': StoredDeepLinkContext;
 	pendingWhatsNewOnFocus: boolean;
@@ -82,8 +86,6 @@ export type GlobalStorage = {
 	'views:scm:grouped:welcome:dismissed': boolean;
 	'integrations:configured': StoredIntegrationConfigurations;
 } & { [key in `plus:preview:${FeaturePreviews}:usages`]: StoredFeaturePreviewUsagePeriod[] } & {
-	[key in `confirm:ai:tos:${AIProviders}`]: boolean;
-} & {
 	[key in `provider:authentication:skip:${string}`]: boolean;
 } & { [key in `gk:${string}:checkin`]: Stored<StoredGKCheckInResponse> } & {
 	[key in `gk:${string}:organizations`]: Stored<StoredOrganization[]>;
@@ -122,17 +124,21 @@ export interface StoredPromo {
 }
 
 export type DeprecatedWorkspaceStorage = {
-	/** @deprecated use `confirm:ai:tos:${AIProviders}` */
+	/** @deprecated use `confirm:ai:tos` */
 	'confirm:sendToOpenAI': boolean;
 	/** @deprecated */
 	'graph:banners:dismissed': Record<string, boolean>;
 	/** @deprecated */
 	'views:searchAndCompare:keepResults': boolean;
+} & {
+	/** @deprecated use `confirm:ai:tos` */
+	[key in `confirm:ai:tos:${AIProviders}`]: boolean;
 };
 
 export type WorkspaceStorage = {
 	assumeRepositoriesOnStartup?: boolean;
 	'branch:comparisons': StoredBranchComparisons;
+	'confirm:ai:tos': boolean;
 	'gitComandPalette:usage': StoredRecentUsage;
 	gitPath: string;
 	'graph:columns': Record<string, StoredGraphColumn>;
@@ -145,7 +151,7 @@ export type WorkspaceStorage = {
 	'views:repositories:autoRefresh': boolean;
 	'views:searchAndCompare:pinned': StoredSearchAndCompareItems;
 	'views:scm:grouped:selected': GroupableTreeViewTypes;
-} & { [key in `confirm:ai:tos:${AIProviders}`]: boolean } & {
+} & {
 	[key in `connected:${Integration['key']}`]: boolean;
 };
 

src/plus/ai/aiProviderService.ts

@@ -1,7 +1,7 @@
 import type { CancellationToken, Disposable, Event, MessageItem, ProgressOptions } from 'vscode';
 import { env, EventEmitter, ThemeIcon, window } from 'vscode';
 import type { AIPrimaryProviders, AIProviderAndModel, AIProviders, SupportedAIModels } from '../../constants.ai';
-import { primaryAIProviders } from '../../constants.ai';
+import { aiProviderDataDisclaimer, primaryAIProviders } from '../../constants.ai';
 import type { AIGenerateDraftEventData, Source, TelemetryEvents } from '../../constants.telemetry';
 import type { Container } from '../../container';
 import { CancellationError } from '../../errors';
@@ -11,7 +11,7 @@ import type { GitRevisionReference } from '../../git/models/reference';
 import type { Repository } from '../../git/models/repository';
 import { uncommitted, uncommittedStaged } from '../../git/models/revision';
 import { assertsCommitHasFullDetails } from '../../git/utils/commit.utils';
-import { showAIModelPicker, showAIProviderPicker } from '../../quickpicks/aiPicker';
+import { showAIModelPicker, showAIProviderPicker } from '../../quickpicks/aiModelPicker';
 import { configuration } from '../../system/-webview/configuration';
 import type { Storage } from '../../system/-webview/storage';
 import { supportedInVSCodeVersion } from '../../system/-webview/vscode';
@@ -127,6 +127,14 @@ export class AIProviderService implements Disposable {
 		return this._provider?.id;
 	}
 
+	get supportedProviders(): readonly AIProviders[] {
+		return [..._supportedProviderTypes.keys()];
+	}
+
+	get currentModelName(): string | undefined {
+		return this._model?.name;
+	}
+
 	private getConfiguredModel(): AIModelDescriptor | undefined {
 		const qualifiedModelId = configuration.get('ai.model') ?? undefined;
 		if (qualifiedModelId == null) return undefined;
@@ -240,6 +248,7 @@ export class AIProviderService implements Disposable {
 			source,
 		);
 
+		await showAIProviderToS(this.container.storage);
 		return model;
 	}
 
@@ -553,12 +562,7 @@ export class AIProviderService implements Disposable {
 			progress?: ProgressOptions;
 		},
 	): Promise<AIRequestResult | undefined> {
-		const { confirmed, model } = await getModelAndConfirmAIProviderToS(
-			'diff',
-			source,
-			this,
-			this.container.storage,
-		);
+		const { confirmed, model } = await getModelAndConfirmAIProviderToS(source, this, this.container.storage);
 		if (model == null) {
 			options?.generating?.cancel();
 			return undefined;
@@ -716,8 +720,30 @@ export class AIProviderService implements Disposable {
 	}
 }
 
+async function showAIProviderToS(storage: Storage): Promise<void> {
+	const confirmed = storage.get(`confirm:ai:tos`, false) || storage.getWorkspace(`confirm:ai:tos`, false);
+	if (confirmed) return;
+
+	const acceptWorkspace: MessageItem = { title: 'Always for this Workspace' };
+	const acceptAlways: MessageItem = { title: 'Always' };
+
+	const result = await window.showInformationMessage(
+		aiProviderDataDisclaimer,
+		{ modal: true },
+		acceptWorkspace,
+		acceptAlways,
+	);
+
+	if (result === acceptWorkspace || result == null) {
+		void storage.storeWorkspace(`confirm:ai:tos`, true).catch();
+	}
+
+	if (result === acceptAlways) {
+		void storage.store(`confirm:ai:tos`, true).catch();
+	}
+}
+
 async function getModelAndConfirmAIProviderToS(
-	confirmationType: 'data' | 'diff',
 	source: Source,
 	service: AIProviderService,
 	storage: Storage,
@@ -726,9 +752,7 @@ async function getModelAndConfirmAIProviderToS(
 	while (true) {
 		if (model == null) return { confirmed: false, model: model };
 
-		const confirmed =
-			storage.get(`confirm:ai:tos:${model.provider.id}`, false) ||
-			storage.getWorkspace(`confirm:ai:tos:${model.provider.id}`, false);
+		const confirmed = storage.get(`confirm:ai:tos`, false) || storage.getWorkspace(`confirm:ai:tos`, false);
 		if (confirmed) return { confirmed: true, model: model };
 
 		const accept: MessageItem = { title: 'Continue' };
@@ -738,11 +762,7 @@ async function getModelAndConfirmAIProviderToS(
 		const decline: MessageItem = { title: 'Cancel', isCloseAffordance: true };
 
 		const result = await window.showInformationMessage(
-			`GitLens AI features require sending ${
-				confirmationType === 'data' ? 'data' : 'a diff of the code changes'
-			} to ${
-				model.provider.name
-			} for analysis. This may contain sensitive information.\n\nDo you want to continue?`,
+			`${aiProviderDataDisclaimer}\n\nDo you want to continue?`,
 			{ modal: true },
 			accept,
 			switchModel,
@@ -759,12 +779,12 @@ async function getModelAndConfirmAIProviderToS(
 		if (result === accept) return { confirmed: true, model: model };
 
 		if (result === acceptWorkspace) {
-			void storage.storeWorkspace(`confirm:ai:tos:${model.provider.id}`, true).catch();
+			void storage.storeWorkspace(`confirm:ai:tos`, true).catch();
 			return { confirmed: true, model: model };
 		}
 
 		if (result === acceptAlways) {
-			void storage.store(`confirm:ai:tos:${model.provider.id}`, true).catch();
+			void storage.store(`confirm:ai:tos`, true).catch();
 			return { confirmed: true, model: model };
 		}
 

src/quickpicks/aiModelPicker.ts

@@ -3,7 +3,7 @@ import { QuickPickItemKind, ThemeIcon, window } from 'vscode';
 import type { AIProviders } from '../constants.ai';
 import type { Container } from '../container';
 import type { AIModel, AIModelDescriptor } from '../plus/ai/models/model';
-import { configuration } from '../system/-webview/configuration';
+import { isSubscriptionPaidPlan } from '../plus/gk/utils/subscription.utils';
 import { getQuickPickIgnoreFocusOut } from '../system/-webview/vscode';
 
 export interface ModelQuickPickItem extends QuickPickItem {
@@ -41,14 +41,12 @@ export async function showAIProviderPicker(
 	current?: AIModelDescriptor,
 ): Promise<ProviderQuickPickItem | undefined> {
 	const providers: Map<AIProviders, boolean> = new Map();
-	const models = await container.ai.getModels();
-	let currentModelName: string | undefined;
-	if (configuration.getAny('gitkraken.ai.enabled', undefined, false)) {
-		providers.set('gitkraken', true);
-	}
+	const supportedProviders = container.ai.supportedProviders;
+	const currentModelName = container.ai.currentModelName;
+	const subscription = await container.subscription.getSubscription();
+	const hasPaidPlan = isSubscriptionPaidPlan(subscription?.plan?.effective.id) && subscription?.account?.verified;
 
-	for (const model of models) {
-		const provider = model.provider.id;
+	for (const provider of supportedProviders) {
 		if (providers.has(provider)) continue;
 
 		providers.set(
@@ -57,10 +55,6 @@ export async function showAIProviderPicker(
 				? true
 				: (await container.storage.getSecret(`gitlens.${provider}.key`)) != null,
 		);
-
-		if (current != null && model.provider.id === current.provider && model.id === current.model) {
-			currentModelName = model.name;
-		}
 	}
 
 	const quickpick = window.createQuickPick<ProviderQuickPickItem>();
@@ -118,14 +112,14 @@ export async function showAIProviderPicker(
 						p === current?.provider && currentModelName
 							? `      ${currentModelName}`
 							: p === 'gitkraken'
-							  ? '      Models provided by GitKraken'
+							  ? `      Models provided by GitKraken${hasPaidPlan ? ' (included in your plan)' : ''}`
 							  : undefined,
 					buttons: !isPrimaryProvider(p)
 						? providers.get(p)
 							? [ClearAIKeyButton]
 							: [ConfigureAIKeyButton]
 						: undefined,
-					description: !isPrimaryProvider(p) && providers.get(p) ? 'Configured' : undefined,
+					description: !isPrimaryProvider(p) && providers.get(p) ? '  (configured)' : undefined,
 				} satisfies ProviderQuickPickItem);
 			}
 

src/webviews/apps/commitDetails/components/gl-commit-details.ts

@@ -439,9 +439,12 @@ export class GlCommitDetails extends GlDetailsBase {
 		return html`
 			<webview-pane collapsable data-region="explain-pane">
 				<span slot="title">Explain (AI)</span>
-				<span slot="subtitle"><code-icon icon="beaker" size="12"></code-icon></span>
 				<action-nav slot="actions">
-					<action-item data-action="switch-ai" label="Switch AI Model" icon="hubot"></action-item>
+					<action-item
+						data-action="switch-ai"
+						label="Switch AI Provider/Model"
+						icon="arrow-swap"
+					></action-item>
 				</action-nav>
 
 				<div class="section">

src/webviews/apps/plus/patchDetails/components/gl-draft-details.ts

@@ -201,9 +201,12 @@ export class GlDraftDetails extends GlTreeBase {
 		return html`
 			<webview-pane collapsable data-region="explain-pane">
 				<span slot="title">Explain (AI)</span>
-				<span slot="subtitle"><code-icon icon="beaker" size="12"></code-icon></span>
 				<action-nav slot="actions">
-					<action-item data-action="switch-ai" label="Switch AI Model" icon="hubot"></action-item>
+					<action-item
+						data-action="switch-ai"
+						label="Switch AI Provider/Model"
+						icon="arrow-swap"
+					></action-item>
 				</action-nav>
 
 				<div class="section">

src/webviews/apps/plus/shared/components/integrations-chip.ts

@@ -368,8 +368,8 @@ export class GLIntegrationsChip extends LitElement {
 									source: 'home',
 									detail: 'integrations',
 								})}"
-								tooltip="Switch AI Model"
-								aria-label="Switch AI Model"
+								tooltip="Switch AI Provider/Model"
+								aria-label="Switch AI Provider/Model"
 								><code-icon icon="arrow-swap"></code-icon
 							></gl-button>
 						</span>`