Skip to content

Commit 8e889c1

Browse files
axosoft-ramintaxosoft-ramint
committed
Improves command naming and UX
1 parent c823663 commit 8e889c1

File tree

9 files changed

+75
-46
lines changed

9 files changed

+75
-46
lines changed

‎contributions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4570,7 +4570,7 @@
45704570
}
45714571
},
45724572
"gitlens.switchAIModel": {
4573-
"label": "Switch AI Model",
4573+
"label": "Switch AI Provider/Model",
45744574
"commandPalette": "gitlens:enabled && gitlens:gk:organization:ai:enabled"
45754575
},
45764576
"gitlens.switchMode": {

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7705,7 +7705,7 @@
77057705
},
77067706
{
77077707
"command": "gitlens.switchAIModel",
7708-
"title": "Switch AI Model",
7708+
"title": "Switch AI Provider/Model",
77097709
"category": "GitLens"
77107710
},
77117711
{

‎src/constants.ai.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ export const primaryAIProviders = ['gitkraken', 'vscode'] as const satisfies rea
1313

1414
export type AIProviderAndModel = `${string}:${string}`;
1515
export type SupportedAIModels = `${Exclude<AIProviders, AIPrimaryProviders>}:${string}` | AIPrimaryProviders;
16+
17+
export const aiProviderDataDisclaimer =
18+
'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‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const enum SyncedStorageKeys {
2525
}
2626

2727
export type DeprecatedGlobalStorage = {
28-
/** @deprecated use `confirm:ai:tos:${AIProviders}` */
28+
/** @deprecated use `confirm:ai:tos` */
2929
'confirm:sendToOpenAI': boolean;
3030
/** @deprecated */
3131
'home:actions:completed': ('dismissed:welcome' | 'opened:scm')[];
@@ -54,10 +54,14 @@ export type DeprecatedGlobalStorage = {
5454
} & {
5555
/** @deprecated */
5656
[key in `disallow:connection:${string}`]: any;
57+
} & {
58+
/** @deprecated use `confirm:ai:tos` */
59+
[key in `confirm:ai:tos:${AIProviders}`]: boolean;
5760
};
5861

5962
export type GlobalStorage = {
6063
avatars: [string, StoredAvatar][];
64+
'confirm:ai:tos': boolean;
6165
repoVisibility: [string, StoredRepoVisibilityInfo][];
6266
'deepLinks:pending': StoredDeepLinkContext;
6367
pendingWhatsNewOnFocus: boolean;
@@ -82,8 +86,6 @@ export type GlobalStorage = {
8286
'views:scm:grouped:welcome:dismissed': boolean;
8387
'integrations:configured': StoredIntegrationConfigurations;
8488
} & { [key in `plus:preview:${FeaturePreviews}:usages`]: StoredFeaturePreviewUsagePeriod[] } & {
85-
[key in `confirm:ai:tos:${AIProviders}`]: boolean;
86-
} & {
8789
[key in `provider:authentication:skip:${string}`]: boolean;
8890
} & { [key in `gk:${string}:checkin`]: Stored<StoredGKCheckInResponse> } & {
8991
[key in `gk:${string}:organizations`]: Stored<StoredOrganization[]>;
@@ -122,17 +124,21 @@ export interface StoredPromo {
122124
}
123125

124126
export type DeprecatedWorkspaceStorage = {
125-
/** @deprecated use `confirm:ai:tos:${AIProviders}` */
127+
/** @deprecated use `confirm:ai:tos` */
126128
'confirm:sendToOpenAI': boolean;
127129
/** @deprecated */
128130
'graph:banners:dismissed': Record<string, boolean>;
129131
/** @deprecated */
130132
'views:searchAndCompare:keepResults': boolean;
133+
} & {
134+
/** @deprecated use `confirm:ai:tos` */
135+
[key in `confirm:ai:tos:${AIProviders}`]: boolean;
131136
};
132137

133138
export type WorkspaceStorage = {
134139
assumeRepositoriesOnStartup?: boolean;
135140
'branch:comparisons': StoredBranchComparisons;
141+
'confirm:ai:tos': boolean;
136142
'gitComandPalette:usage': StoredRecentUsage;
137143
gitPath: string;
138144
'graph:columns': Record<string, StoredGraphColumn>;
@@ -145,7 +151,7 @@ export type WorkspaceStorage = {
145151
'views:repositories:autoRefresh': boolean;
146152
'views:searchAndCompare:pinned': StoredSearchAndCompareItems;
147153
'views:scm:grouped:selected': GroupableTreeViewTypes;
148-
} & { [key in `confirm:ai:tos:${AIProviders}`]: boolean } & {
154+
} & {
149155
[key in `connected:${Integration['key']}`]: boolean;
150156
};
151157

‎src/plus/ai/aiProviderService.ts‎

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { CancellationToken, Disposable, Event, MessageItem, ProgressOptions } from 'vscode';
22
import { env, EventEmitter, ThemeIcon, window } from 'vscode';
33
import type { AIPrimaryProviders, AIProviderAndModel, AIProviders, SupportedAIModels } from '../../constants.ai';
4-
import { primaryAIProviders } from '../../constants.ai';
4+
import { aiProviderDataDisclaimer, primaryAIProviders } from '../../constants.ai';
55
import type { AIGenerateDraftEventData, Source, TelemetryEvents } from '../../constants.telemetry';
66
import type { Container } from '../../container';
77
import { CancellationError } from '../../errors';
@@ -11,7 +11,7 @@ import type { GitRevisionReference } from '../../git/models/reference';
1111
import type { Repository } from '../../git/models/repository';
1212
import { uncommitted, uncommittedStaged } from '../../git/models/revision';
1313
import { assertsCommitHasFullDetails } from '../../git/utils/commit.utils';
14-
import { showAIModelPicker, showAIProviderPicker } from '../../quickpicks/aiPicker';
14+
import { showAIModelPicker, showAIProviderPicker } from '../../quickpicks/aiModelPicker';
1515
import { configuration } from '../../system/-webview/configuration';
1616
import type { Storage } from '../../system/-webview/storage';
1717
import { supportedInVSCodeVersion } from '../../system/-webview/vscode';
@@ -127,6 +127,14 @@ export class AIProviderService implements Disposable {
127127
return this._provider?.id;
128128
}
129129

130+
get supportedProviders(): readonly AIProviders[] {
131+
return [..._supportedProviderTypes.keys()];
132+
}
133+
134+
get currentModelName(): string | undefined {
135+
return this._model?.name;
136+
}
137+
130138
private getConfiguredModel(): AIModelDescriptor | undefined {
131139
const qualifiedModelId = configuration.get('ai.model') ?? undefined;
132140
if (qualifiedModelId == null) return undefined;
@@ -240,6 +248,7 @@ export class AIProviderService implements Disposable {
240248
source,
241249
);
242250

251+
await showAIProviderToS(this.container.storage);
243252
return model;
244253
}
245254

@@ -553,12 +562,7 @@ export class AIProviderService implements Disposable {
553562
progress?: ProgressOptions;
554563
},
555564
): Promise<AIRequestResult | undefined> {
556-
const { confirmed, model } = await getModelAndConfirmAIProviderToS(
557-
'diff',
558-
source,
559-
this,
560-
this.container.storage,
561-
);
565+
const { confirmed, model } = await getModelAndConfirmAIProviderToS(source, this, this.container.storage);
562566
if (model == null) {
563567
options?.generating?.cancel();
564568
return undefined;
@@ -716,8 +720,30 @@ export class AIProviderService implements Disposable {
716720
}
717721
}
718722

723+
async function showAIProviderToS(storage: Storage): Promise<void> {
724+
const confirmed = storage.get(`confirm:ai:tos`, false) || storage.getWorkspace(`confirm:ai:tos`, false);
725+
if (confirmed) return;
726+
727+
const acceptWorkspace: MessageItem = { title: 'Always for this Workspace' };
728+
const acceptAlways: MessageItem = { title: 'Always' };
729+
730+
const result = await window.showInformationMessage(
731+
aiProviderDataDisclaimer,
732+
{ modal: true },
733+
acceptWorkspace,
734+
acceptAlways,
735+
);
736+
737+
if (result === acceptWorkspace || result == null) {
738+
void storage.storeWorkspace(`confirm:ai:tos`, true).catch();
739+
}
740+
741+
if (result === acceptAlways) {
742+
void storage.store(`confirm:ai:tos`, true).catch();
743+
}
744+
}
745+
719746
async function getModelAndConfirmAIProviderToS(
720-
confirmationType: 'data' | 'diff',
721747
source: Source,
722748
service: AIProviderService,
723749
storage: Storage,
@@ -726,9 +752,7 @@ async function getModelAndConfirmAIProviderToS(
726752
while (true) {
727753
if (model == null) return { confirmed: false, model: model };
728754

729-
const confirmed =
730-
storage.get(`confirm:ai:tos:${model.provider.id}`, false) ||
731-
storage.getWorkspace(`confirm:ai:tos:${model.provider.id}`, false);
755+
const confirmed = storage.get(`confirm:ai:tos`, false) || storage.getWorkspace(`confirm:ai:tos`, false);
732756
if (confirmed) return { confirmed: true, model: model };
733757

734758
const accept: MessageItem = { title: 'Continue' };
@@ -738,11 +762,7 @@ async function getModelAndConfirmAIProviderToS(
738762
const decline: MessageItem = { title: 'Cancel', isCloseAffordance: true };
739763

740764
const result = await window.showInformationMessage(
741-
`GitLens AI features require sending ${
742-
confirmationType === 'data' ? 'data' : 'a diff of the code changes'
743-
} to ${
744-
model.provider.name
745-
} for analysis. This may contain sensitive information.\n\nDo you want to continue?`,
765+
`${aiProviderDataDisclaimer}\n\nDo you want to continue?`,
746766
{ modal: true },
747767
accept,
748768
switchModel,
@@ -759,12 +779,12 @@ async function getModelAndConfirmAIProviderToS(
759779
if (result === accept) return { confirmed: true, model: model };
760780

761781
if (result === acceptWorkspace) {
762-
void storage.storeWorkspace(`confirm:ai:tos:${model.provider.id}`, true).catch();
782+
void storage.storeWorkspace(`confirm:ai:tos`, true).catch();
763783
return { confirmed: true, model: model };
764784
}
765785

766786
if (result === acceptAlways) {
767-
void storage.store(`confirm:ai:tos:${model.provider.id}`, true).catch();
787+
void storage.store(`confirm:ai:tos`, true).catch();
768788
return { confirmed: true, model: model };
769789
}
770790

‎src/quickpicks/aiModelPicker.ts‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { QuickPickItemKind, ThemeIcon, window } from 'vscode';
33
import type { AIProviders } from '../constants.ai';
44
import type { Container } from '../container';
55
import type { AIModel, AIModelDescriptor } from '../plus/ai/models/model';
6-
import { configuration } from '../system/-webview/configuration';
6+
import { isSubscriptionPaidPlan } from '../plus/gk/utils/subscription.utils';
77
import { getQuickPickIgnoreFocusOut } from '../system/-webview/vscode';
88

99
export interface ModelQuickPickItem extends QuickPickItem {
@@ -41,14 +41,12 @@ export async function showAIProviderPicker(
4141
current?: AIModelDescriptor,
4242
): Promise<ProviderQuickPickItem | undefined> {
4343
const providers: Map<AIProviders, boolean> = new Map();
44-
const models = await container.ai.getModels();
45-
let currentModelName: string | undefined;
46-
if (configuration.getAny('gitkraken.ai.enabled', undefined, false)) {
47-
providers.set('gitkraken', true);
48-
}
44+
const supportedProviders = container.ai.supportedProviders;
45+
const currentModelName = container.ai.currentModelName;
46+
const subscription = await container.subscription.getSubscription();
47+
const hasPaidPlan = isSubscriptionPaidPlan(subscription?.plan?.effective.id) && subscription?.account?.verified;
4948

50-
for (const model of models) {
51-
const provider = model.provider.id;
49+
for (const provider of supportedProviders) {
5250
if (providers.has(provider)) continue;
5351

5452
providers.set(
@@ -57,10 +55,6 @@ export async function showAIProviderPicker(
5755
? true
5856
: (await container.storage.getSecret(`gitlens.${provider}.key`)) != null,
5957
);
60-
61-
if (current != null && model.provider.id === current.provider && model.id === current.model) {
62-
currentModelName = model.name;
63-
}
6458
}
6559

6660
const quickpick = window.createQuickPick<ProviderQuickPickItem>();
@@ -118,14 +112,14 @@ export async function showAIProviderPicker(
118112
p === current?.provider && currentModelName
119113
? ` ${currentModelName}`
120114
: p === 'gitkraken'
121-
? ' Models provided by GitKraken'
115+
? ` Models provided by GitKraken${hasPaidPlan ? ' (included in your plan)' : ''}`
122116
: undefined,
123117
buttons: !isPrimaryProvider(p)
124118
? providers.get(p)
125119
? [ClearAIKeyButton]
126120
: [ConfigureAIKeyButton]
127121
: undefined,
128-
description: !isPrimaryProvider(p) && providers.get(p) ? 'Configured' : undefined,
122+
description: !isPrimaryProvider(p) && providers.get(p) ? ' (configured)' : undefined,
129123
} satisfies ProviderQuickPickItem);
130124
}
131125

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,9 +439,12 @@ export class GlCommitDetails extends GlDetailsBase {
439439
return html`
440440
<webview-pane collapsable data-region="explain-pane">
441441
<span slot="title">Explain (AI)</span>
442-
<span slot="subtitle"><code-icon icon="beaker" size="12"></code-icon></span>
443442
<action-nav slot="actions">
444-
<action-item data-action="switch-ai" label="Switch AI Model" icon="hubot"></action-item>
443+
<action-item
444+
data-action="switch-ai"
445+
label="Switch AI Provider/Model"
446+
icon="arrow-swap"
447+
></action-item>
445448
</action-nav>
446449
447450
<div class="section">

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,12 @@ export class GlDraftDetails extends GlTreeBase {
201201
return html`
202202
<webview-pane collapsable data-region="explain-pane">
203203
<span slot="title">Explain (AI)</span>
204-
<span slot="subtitle"><code-icon icon="beaker" size="12"></code-icon></span>
205204
<action-nav slot="actions">
206-
<action-item data-action="switch-ai" label="Switch AI Model" icon="hubot"></action-item>
205+
<action-item
206+
data-action="switch-ai"
207+
label="Switch AI Provider/Model"
208+
icon="arrow-swap"
209+
></action-item>
207210
</action-nav>
208211
209212
<div class="section">

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,8 +368,8 @@ export class GLIntegrationsChip extends LitElement {
368368
source: 'home',
369369
detail: 'integrations',
370370
})}"
371-
tooltip="Switch AI Model"
372-
aria-label="Switch AI Model"
371+
tooltip="Switch AI Provider/Model"
372+
aria-label="Switch AI Provider/Model"
373373
><code-icon icon="arrow-swap"></code-icon
374374
></gl-button>
375375
</span>`

0 commit comments

Comments
 (0)