Skip to content

Commit bae077f

Browse files
d13d13
committed
Adds setting to disable AI features
1 parent 117d3aa commit bae077f

File tree

18 files changed

+127
-61
lines changed

18 files changed

+127
-61
lines changed

‎contributions.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
},
2626
"gitlens.ai.explainCommit": {
2727
"label": "Explain Commit...",
28-
"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
28+
"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
2929
"menus": {
3030
"view/item/context": [
3131
{
32-
"when": "viewItem =~ /gitlens:commit\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
32+
"when": "viewItem =~ /gitlens:commit\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
3333
"group": "3_gitlens_ai",
3434
"order": 1
3535
}
@@ -38,11 +38,11 @@
3838
},
3939
"gitlens.ai.explainStash": {
4040
"label": "Explain Stash (Preview)...",
41-
"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
41+
"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
4242
"menus": {
4343
"view/item/context": [
4444
{
45-
"when": "viewItem =~ /gitlens:stash\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
45+
"when": "viewItem =~ /gitlens:stash\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
4646
"group": "3_gitlens_ai",
4747
"order": 1
4848
}
@@ -51,11 +51,11 @@
5151
},
5252
"gitlens.ai.generateChangelog": {
5353
"label": "Generate Changelog (Preview)...",
54-
"commandPalette": "gitlens:enabled && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
54+
"commandPalette": "gitlens:enabled && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
5555
},
5656
"gitlens.ai.generateCommitMessage": {
5757
"label": "Generate Commit Message",
58-
"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled"
58+
"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
5959
},
6060
"gitlens.annotations.nextChange": {
6161
"label": "Next Change",
@@ -1367,7 +1367,7 @@
13671367
"menus": {
13681368
"webview/context": [
13691369
{
1370-
"when": "webviewItem =~ /gitlens:(branch|tag)\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
1370+
"when": "webviewItem =~ /gitlens:(branch|tag)\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
13711371
"group": "1_gitlens_actions_3",
13721372
"order": 100
13731373
}
@@ -1379,7 +1379,7 @@
13791379
"menus": {
13801380
"webview/context": [
13811381
{
1382-
"when": "webviewItem == gitlens:wip && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled",
1382+
"when": "webviewItem == gitlens:wip && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
13831383
"group": "1_gitlens",
13841384
"order": 2
13851385
}
@@ -1993,7 +1993,7 @@
19931993
"menus": {
19941994
"webview/context": [
19951995
{
1996-
"when": "webviewItem =~ /gitlens:commit\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
1996+
"when": "webviewItem =~ /gitlens:commit\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
19971997
"group": "1_gitlens_actions_3",
19981998
"order": 1
19991999
}
@@ -2005,7 +2005,7 @@
20052005
"menus": {
20062006
"webview/context": [
20072007
{
2008-
"when": "webviewItem =~ /gitlens:stash\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
2008+
"when": "webviewItem =~ /gitlens:stash\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
20092009
"group": "1_gitlens_actions_3",
20102010
"order": 1
20112011
}
@@ -3459,7 +3459,7 @@
34593459
},
34603460
"gitlens.resetAIKey": {
34613461
"label": "Reset Stored AI Keys...",
3462-
"commandPalette": "gitlens:enabled && gitlens:gk:organization:ai:enabled"
3462+
"commandPalette": "gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
34633463
},
34643464
"gitlens.resetViewsLayout": {
34653465
"label": "Reset Views Layout",
@@ -3491,19 +3491,19 @@
34913491
"menus": {
34923492
"git.commit": [
34933493
{
3494-
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled && config.gitlens.menus.scmRepository.generateCommitMessage",
3494+
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled && config.gitlens.menus.scmRepository.generateCommitMessage",
34953495
"group": "4_gitlens",
34963496
"order": 2
34973497
}
34983498
],
34993499
"scm/title": [
35003500
{
3501-
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled && config.gitlens.menus.scmRepositoryInline.generateCommitMessage",
3501+
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled && config.gitlens.menus.scmRepositoryInline.generateCommitMessage",
35023502
"group": "navigation",
35033503
"order": -3
35043504
},
35053505
{
3506-
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled && config.gitlens.menus.scmRepository.generateCommitMessage",
3506+
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled && config.gitlens.menus.scmRepository.generateCommitMessage",
35073507
"group": "2_gitlens",
35083508
"order": 2
35093509
}
@@ -4463,7 +4463,7 @@
44634463
},
44644464
"gitlens.switchAIModel": {
44654465
"label": "Switch AI Provider/Model",
4466-
"commandPalette": "gitlens:enabled && gitlens:gk:organization:ai:enabled"
4466+
"commandPalette": "gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
44674467
},
44684468
"gitlens.switchMode": {
44694469
"label": "Switch Mode",
@@ -4777,12 +4777,12 @@
47774777
"menus": {
47784778
"view/item/context": [
47794779
{
4780-
"when": "viewItem =~ /gitlens:compare:results:commits\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
4780+
"when": "viewItem =~ /gitlens:compare:results:commits\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
47814781
"group": "inline",
47824782
"order": 98
47834783
},
47844784
{
4785-
"when": "viewItem =~ /gitlens:compare:results:commits\\b/ && !listMultiSelection && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
4785+
"when": "viewItem =~ /gitlens:compare:results:commits\\b/ && !listMultiSelection && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
47864786
"group": "4_gitlens_actions",
47874787
"order": 2
47884788
}
@@ -4795,7 +4795,7 @@
47954795
"menus": {
47964796
"view/item/context": [
47974797
{
4798-
"when": "viewItem =~ /gitlens:(branch|tag)\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
4798+
"when": "viewItem =~ /gitlens:(branch|tag)\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
47994799
"group": "1_gitlens_actions_3",
48004800
"order": 100
48014801
}

‎package.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4194,12 +4194,12 @@
41944194
"preview"
41954195
]
41964196
},
4197-
"gitlens.ai.generateCommitMessage.enabled": {
4197+
"gitlens.ai.enabled": {
41984198
"type": "boolean",
41994199
"default": true,
4200-
"markdownDescription": "Specifies whether to enable GitLens' AI-powered, on-demand commit message generation",
4200+
"markdownDescription": "Specifies whether to enable GitLens' AI-powered features",
42014201
"scope": "window",
4202-
"order": 210,
4202+
"order": 2,
42034203
"tags": [
42044204
"preview"
42054205
]
@@ -10402,19 +10402,19 @@
1040210402
},
1040310403
{
1040410404
"command": "gitlens.ai.explainCommit",
10405-
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
10405+
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
1040610406
},
1040710407
{
1040810408
"command": "gitlens.ai.explainStash",
10409-
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
10409+
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
1041010410
},
1041110411
{
1041210412
"command": "gitlens.ai.generateChangelog",
10413-
"when": "gitlens:enabled && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
10413+
"when": "gitlens:enabled && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
1041410414
},
1041510415
{
1041610416
"command": "gitlens.ai.generateCommitMessage",
10417-
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled"
10417+
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
1041810418
},
1041910419
{
1042010420
"command": "gitlens.annotations.nextChange",
@@ -11434,7 +11434,7 @@
1143411434
},
1143511435
{
1143611436
"command": "gitlens.resetAIKey",
11437-
"when": "gitlens:enabled && gitlens:gk:organization:ai:enabled"
11437+
"when": "gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
1143811438
},
1143911439
{
1144011440
"command": "gitlens.revealCommitInView",
@@ -11682,7 +11682,7 @@
1168211682
},
1168311683
{
1168411684
"command": "gitlens.switchAIModel",
11685-
"when": "gitlens:enabled && gitlens:gk:organization:ai:enabled"
11685+
"when": "gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
1168611686
},
1168711687
{
1168811688
"command": "gitlens.switchMode",
@@ -13810,7 +13810,7 @@
1381013810
},
1381113811
{
1381213812
"command": "gitlens.scm.ai.generateCommitMessage",
13813-
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled && config.gitlens.menus.scmRepository.generateCommitMessage",
13813+
"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled && config.gitlens.menus.scmRepository.generateCommitMessage",
1381413814
"group": "4_gitlens@2"
1381513815
},
1381613816
{
@@ -16068,7 +16068,7 @@
1606816068
"scm/title": [
1606916069
{
1607016070
"command": "gitlens.scm.ai.generateCommitMessage",
16071-
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled && config.gitlens.menus.scmRepositoryInline.generateCommitMessage",
16071+
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled && config.gitlens.menus.scmRepositoryInline.generateCommitMessage",
1607216072
"group": "navigation@-3"
1607316073
},
1607416074
{
@@ -16088,7 +16088,7 @@
1608816088
},
1608916089
{
1609016090
"command": "gitlens.scm.ai.generateCommitMessage",
16091-
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled && config.gitlens.menus.scmRepository.generateCommitMessage",
16091+
"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled && config.gitlens.menus.scmRepository.generateCommitMessage",
1609216092
"group": "2_gitlens@2"
1609316093
},
1609416094
{
@@ -16358,7 +16358,7 @@
1635816358
},
1635916359
{
1636016360
"command": "gitlens.views.ai.generateChangelogFrom",
16361-
"when": "viewItem =~ /gitlens:(branch|tag)\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
16361+
"when": "viewItem =~ /gitlens:(branch|tag)\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
1636216362
"group": "1_gitlens_actions_3@100"
1636316363
},
1636416364
{
@@ -16634,7 +16634,7 @@
1663416634
},
1663516635
{
1663616636
"command": "gitlens.ai.explainCommit",
16637-
"when": "viewItem =~ /gitlens:commit\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
16637+
"when": "viewItem =~ /gitlens:commit\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
1663816638
"group": "3_gitlens_ai@1"
1663916639
},
1664016640
{
@@ -16824,7 +16824,7 @@
1682416824
},
1682516825
{
1682616826
"command": "gitlens.views.ai.generateChangelog",
16827-
"when": "viewItem =~ /gitlens:compare:results:commits\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
16827+
"when": "viewItem =~ /gitlens:compare:results:commits\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
1682816828
"group": "inline@98"
1682916829
},
1683016830
{
@@ -16840,7 +16840,7 @@
1684016840
},
1684116841
{
1684216842
"command": "gitlens.views.ai.generateChangelog",
16843-
"when": "viewItem =~ /gitlens:compare:results:commits\\b/ && !listMultiSelection && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
16843+
"when": "viewItem =~ /gitlens:compare:results:commits\\b/ && !listMultiSelection && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
1684416844
"group": "4_gitlens_actions@2"
1684516845
},
1684616846
{
@@ -17695,7 +17695,7 @@
1769517695
},
1769617696
{
1769717697
"command": "gitlens.ai.explainStash",
17698-
"when": "viewItem =~ /gitlens:stash\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
17698+
"when": "viewItem =~ /gitlens:stash\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
1769917699
"group": "3_gitlens_ai@1"
1770017700
},
1770117701
{
@@ -20035,7 +20035,7 @@
2003520035
},
2003620036
{
2003720037
"command": "gitlens.graph.ai.generateChangelogFrom",
20038-
"when": "webviewItem =~ /gitlens:(branch|tag)\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
20038+
"when": "webviewItem =~ /gitlens:(branch|tag)\\b/ && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
2003920039
"group": "1_gitlens_actions_3@100"
2004020040
},
2004120041
{
@@ -20165,7 +20165,7 @@
2016520165
},
2016620166
{
2016720167
"command": "gitlens.graph.explainCommit",
20168-
"when": "webviewItem =~ /gitlens:commit\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
20168+
"when": "webviewItem =~ /gitlens:commit\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
2016920169
"group": "1_gitlens_actions_3@1"
2017020170
},
2017120171
{
@@ -20330,7 +20330,7 @@
2033020330
},
2033120331
{
2033220332
"command": "gitlens.graph.explainStash",
20333-
"when": "webviewItem =~ /gitlens:stash\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
20333+
"when": "webviewItem =~ /gitlens:stash\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
2033420334
"group": "1_gitlens_actions_3@1"
2033520335
},
2033620336
{
@@ -20380,7 +20380,7 @@
2038020380
},
2038120381
{
2038220382
"command": "gitlens.graph.ai.generateCommitMessage",
20383-
"when": "webviewItem == gitlens:wip && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.generateCommitMessage.enabled",
20383+
"when": "webviewItem == gitlens:wip && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
2038420384
"group": "1_gitlens@2"
2038520385
},
2038620386
{

‎src/config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,7 @@ export interface AdvancedConfig {
210210
}
211211

212212
interface AIConfig {
213+
readonly enabled: boolean;
213214
readonly azure: {
214215
readonly url: string | null;
215216
};

‎src/plus/ai/aiProviderService.ts‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -468,18 +468,28 @@ export class AIProviderService implements Disposable {
468468
return model;
469469
}
470470

471-
private async ensureOrgAccess(): Promise<boolean> {
471+
async ensureAccess(silent = false): Promise<boolean> {
472+
const aiEnabled = configuration.get('ai.enabled');
473+
if (aiEnabled === false) {
474+
if (!silent) {
475+
await window.showErrorMessage(`AI features have been disabled via GitLens settings.`);
476+
}
477+
return false;
478+
}
479+
472480
const orgEnabled = getContext('gitlens:gk:organization:ai:enabled');
473481
if (orgEnabled === false) {
474-
await window.showErrorMessage(`AI features have been disabled for your organization.`);
482+
if (!silent) {
483+
await window.showErrorMessage(`AI features have been disabled for your organization.`);
484+
}
475485
return false;
476486
}
477487

478488
return true;
479489
}
480490

481491
private async ensureFeatureAccess(feature: AIFeatures, source: Source): Promise<boolean> {
482-
if (!(await this.ensureOrgAccess())) return false;
492+
if (!(await this.ensureAccess())) return false;
483493

484494
if (feature === 'generate-commitMessage') return true;
485495
if (

‎src/quickpicks/aiModelPicker.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type { AIProviders } from '../constants.ai';
44
import type { Container } from '../container';
55
import type { AIModel, AIModelDescriptor, AIProviderDescriptorWithConfiguration } from '../plus/ai/models/model';
66
import { isSubscriptionPaidPlan } from '../plus/gk/utils/subscription.utils';
7+
import { configuration } from '../system/-webview/configuration';
78
import { getContext } from '../system/-webview/context';
89
import { getQuickPickIgnoreFocusOut } from '../system/-webview/vscode';
910
import { getSettledValue } from '../system/promise';
@@ -33,6 +34,16 @@ export async function showAIProviderPicker(
3334
container: Container,
3435
current: AIModelDescriptor | undefined,
3536
): Promise<ProviderQuickPickItem | undefined> {
37+
if (!configuration.get('ai.enabled')) {
38+
await window.showQuickPick([{ label: 'OK' }], {
39+
title: 'AI is Disabled',
40+
placeHolder: 'GitLens AI features have been disabled via settings',
41+
canPickMany: false,
42+
});
43+
44+
return undefined;
45+
}
46+
3647
if (!getContext('gitlens:gk:organization:ai:enabled', true)) {
3748
await window.showQuickPick([{ label: 'OK' }], {
3849
title: 'AI is Disabled',
@@ -139,6 +150,16 @@ export async function showAIModelPicker(
139150
provider: AIProviders,
140151
current?: AIModelDescriptor,
141152
): Promise<ModelQuickPickItem | Directive | undefined> {
153+
if (!configuration.get('ai.enabled')) {
154+
await window.showQuickPick([{ label: 'OK' }], {
155+
title: 'AI is Disabled',
156+
placeHolder: 'GitLens AI features have been disabled via settings',
157+
canPickMany: false,
158+
});
159+
160+
return undefined;
161+
}
162+
142163
if (!getContext('gitlens:gk:organization:ai:enabled', true)) {
143164
await window.showQuickPick([{ label: 'OK' }], {
144165
title: 'AI is Disabled',

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ export class GlCommitDetails extends GlDetailsBase {
169169
)}
170170
</div>
171171
${when(
172-
this.state?.orgSettings.ai !== false,
172+
this.state?.orgSettings.ai !== false && this.state?.preferences.aiEnabled !== false,
173173
() => html`
174174
<div class="message-block-actions">
175175
<gl-action-chip

0 commit comments

Comments
 (0)