Fixes ai enabled setting checks

Author: d13

contributions.json

@@ -25,7 +25,7 @@
 		},
 		"gitlens.ai.explainBranch": {
 			"label": "Explain Branch (Preview)...",
-			"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
+			"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
 		},
 		"gitlens.ai.explainBranch:graph": {
 			"label": "Explain Branch (Preview)",
@@ -115,7 +115,7 @@
 		},
 		"gitlens.ai.explainWip": {
 			"label": "Explain Working Changes (Preview)...",
-			"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
+			"commandPalette": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
 		},
 		"gitlens.ai.explainWip:graph": {
 			"label": "Explain Working Changes (Preview)",
@@ -136,7 +136,7 @@
 			"menus": {
 				"view/item/context": [
 					{
-						"when": "viewItem =~ /gitlens:(worktree|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
+						"when": "viewItem =~ /gitlens:(worktree|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
 						"group": "3_gitlens_ai",
 						"order": 1
 					}

package.json

@@ -10469,7 +10469,7 @@
 				},
 				{
 					"command": "gitlens.ai.explainBranch",
-					"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
+					"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
 				},
 				{
 					"command": "gitlens.ai.explainBranch:graph",
@@ -10505,7 +10505,7 @@
 				},
 				{
 					"command": "gitlens.ai.explainWip",
-					"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled"
+					"when": "gitlens:enabled && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled"
 				},
 				{
 					"command": "gitlens.ai.explainWip:graph",
@@ -17976,7 +17976,7 @@
 				},
 				{
 					"command": "gitlens.ai.explainWip:views",
-					"when": "viewItem =~ /gitlens:(worktree|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled",
+					"when": "viewItem =~ /gitlens:(worktree|uncommitted)\\b/ && !listMultiSelection && !gitlens:readonly && !gitlens:untrusted && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
 					"group": "3_gitlens_ai@1"
 				},
 				{

src/commands/git/stash.ts

@@ -14,6 +14,7 @@ import type { AIModel } from '../../plus/ai/models/model';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
 import type { FlagsQuickPickItem } from '../../quickpicks/items/flags';
 import { createFlagsQuickPickItem } from '../../quickpicks/items/flags';
+import { configuration } from '../../system/-webview/configuration';
 import { getContext } from '../../system/-webview/context';
 import { formatPath } from '../../system/-webview/formatPath';
 import { getLoggableName, Logger } from '../../system/logger';
@@ -638,9 +639,10 @@ export class StashGitCommand extends QuickCommand<State> {
 			placeholder: 'Please provide a stash message',
 			value: state.message,
 			prompt: 'Enter stash message',
-			buttons: getContext('gitlens:gk:organization:ai:enabled')
-				? [QuickInputButtons.Back, generateMessageButton]
-				: [QuickInputButtons.Back],
+			buttons:
+				getContext('gitlens:gk:organization:ai:enabled') && configuration.get('ai.enabled')
+					? [QuickInputButtons.Back, generateMessageButton]
+					: [QuickInputButtons.Back],
 			// Needed to clear any validation errors because of AI generation
 			validate: (_value: string | undefined): [boolean, string | undefined] => [true, undefined],
 			onDidClickButton: async (input, button) => {

src/webviews/apps/plus/home/components/branch-card.ts

@@ -993,6 +993,8 @@ export class GlBranchCard extends GlBranchCardBase {
 	protected getBranchActions(): TemplateResult[] {
 		const actions = [];
 
+		const aiEnabled = this._homeState.orgSettings.ai && this._homeState.aiEnabled;
+
 		if (this.branch.worktree) {
 			actions.push(
 				html`<action-item
@@ -1002,29 +1004,31 @@ export class GlBranchCard extends GlBranchCardBase {
 				></action-item>`,
 			);
 
-			const hasWip =
-				this.wip?.workingTreeState != null
-					? this.wip.workingTreeState.added +
-							this.wip.workingTreeState.changed +
-							this.wip.workingTreeState.deleted >
-					  0
-					: false;
-			if (hasWip) {
-				actions.push(
-					html`<action-item
-						label="Explain Working Changes (Preview)"
-						icon="sparkle"
-						href=${this.createCommandLink('gitlens.ai.explainWip:home')}
-					></action-item>`,
-				);
-			} else {
-				actions.push(
-					html`<action-item
-						label="Explain Branch (Preview)"
-						icon="sparkle"
-						href=${this.createCommandLink('gitlens.ai.explainBranch:home')}
-					></action-item>`,
-				);
+			if (aiEnabled) {
+				const hasWip =
+					this.wip?.workingTreeState != null
+						? this.wip.workingTreeState.added +
+								this.wip.workingTreeState.changed +
+								this.wip.workingTreeState.deleted >
+						  0
+						: false;
+				if (hasWip) {
+					actions.push(
+						html`<action-item
+							label="Explain Working Changes (Preview)"
+							icon="sparkle"
+							href=${this.createCommandLink('gitlens.ai.explainWip:home')}
+						></action-item>`,
+					);
+				} else {
+					actions.push(
+						html`<action-item
+							label="Explain Branch (Preview)"
+							icon="sparkle"
+							href=${this.createCommandLink('gitlens.ai.explainBranch:home')}
+						></action-item>`,
+					);
+				}
 			}
 		} else {
 			actions.push(
@@ -1034,13 +1038,16 @@ export class GlBranchCard extends GlBranchCardBase {
 					href=${this.createCommandLink('gitlens.home.switchToBranch')}
 				></action-item>`,
 			);
-			actions.push(
-				html`<action-item
-					label="Explain Branch (Preview)"
-					icon="sparkle"
-					href=${this.createCommandLink('gitlens.ai.explainBranch:home')}
-				></action-item>`,
-			);
+
+			if (aiEnabled) {
+				actions.push(
+					html`<action-item
+						label="Explain Branch (Preview)"
+						icon="sparkle"
+						href=${this.createCommandLink('gitlens.ai.explainBranch:home')}
+					></action-item>`,
+				);
+			}
 		}
 
 		// branch actions

src/webviews/home/homeWebview.ts

@@ -736,7 +736,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 	}
 
 	private onContextChanged(key: keyof ContextKeys) {
-		if (key === 'gitlens:gk:organization:drafts:enabled') {
+		if (['gitlens:gk:organization:ai:enabled', 'gitlens:gk:organization:drafts:enabled'].includes(key)) {
 			this.notifyDidChangeOrgSettings();
 		}
 	}