Updates checks for cli and mcp auto installation

Author: d13

src/env/node/gk/cli/integration.ts

@@ -5,7 +5,10 @@ import { urls } from '../../../../constants';
 import type { Source, Sources } from '../../../../constants.telemetry';
 import type { Container } from '../../../../container';
 import type { SubscriptionChangeEvent } from '../../../../plus/gk/subscriptionService';
-import { supportsMcpExtensionRegistration } from '../../../../plus/gk/utils/-webview/mcp.utils';
+import {
+	mcpExtensionRegistrationAllowed,
+	supportsMcpExtensionRegistration,
+} from '../../../../plus/gk/utils/-webview/mcp.utils';
 import { registerCommand } from '../../../../system/-webview/command';
 import { configuration } from '../../../../system/-webview/configuration';
 import { getHostAppName } from '../../../../system/-webview/vscode';
@@ -58,8 +61,7 @@ export class GkCliIntegrationProvider implements Disposable {
 
 		this.onConfigurationChanged();
 
-		// TODO: Remove this experimental setting for production release
-		if (configuration.get('gitkraken.cli.autoInstall.enabled')) {
+		if (mcpExtensionRegistrationAllowed()) {
 			const cliInstall = this.container.storage.get('gk:cli:install');
 			if (!cliInstall || (cliInstall.status === 'attempted' && cliInstall.attempts < 5)) {
 				setTimeout(

src/plus/gk/utils/-webview/mcp.utils.ts

@@ -1,12 +1,13 @@
 import { lm, version } from 'vscode';
 import { getPlatform, isWeb } from '@env/platform';
 import type { Container } from '../../../../container';
+import { configuration } from '../../../../system/-webview/configuration';
 import { getHostAppName } from '../../../../system/-webview/vscode';
 import { satisfies } from '../../../../system/version';
 
 export async function isMcpBannerEnabled(container: Container, showAutoRegistration = false): Promise<boolean> {
 	// Check if running on web or automatically registrable
-	if (isWeb || (!showAutoRegistration && supportsMcpExtensionRegistration())) {
+	if (isWeb || (!showAutoRegistration && mcpExtensionRegistrationAllowed())) {
 		return false;
 	}
 
@@ -32,3 +33,12 @@ export function supportsMcpExtensionRegistration(): boolean {
 
 	return satisfies(version, '>= 1.101.0') && lm.registerMcpServerDefinitionProvider != null;
 }
+
+export function mcpExtensionRegistrationAllowed(): boolean {
+	// TODO: Remove experimental setting for production release
+	return (
+		configuration.get('ai.enabled') &&
+		configuration.get('gitkraken.cli.autoInstall.enabled') &&
+		supportsMcpExtensionRegistration()
+	);
+}

src/webviews/home/homeWebview.ts

@@ -51,7 +51,7 @@ import type { AIModelChangeEvent } from '../../plus/ai/aiProviderService';
 import { showPatchesView } from '../../plus/drafts/actions';
 import type { Subscription } from '../../plus/gk/models/subscription';
 import type { SubscriptionChangeEvent } from '../../plus/gk/subscriptionService';
-import { isMcpBannerEnabled, supportsMcpExtensionRegistration } from '../../plus/gk/utils/-webview/mcp.utils';
+import { isMcpBannerEnabled, mcpExtensionRegistrationAllowed } from '../../plus/gk/utils/-webview/mcp.utils';
 import { isAiAllAccessPromotionActive } from '../../plus/gk/utils/-webview/promo.utils';
 import { isSubscriptionTrialOrPaidFromState } from '../../plus/gk/utils/subscription.utils';
 import type { ConfiguredIntegrationsChangeEvent } from '../../plus/integrations/authentication/configuredIntegrationService';
@@ -807,7 +807,7 @@ export class HomeWebviewProvider implements WebviewProvider<State, State, HomeWe
 	}
 
 	private getMcpCanAutoRegister() {
-		return supportsMcpExtensionRegistration();
+		return mcpExtensionRegistrationAllowed();
 	}
 
 	private getIntegrationBannerCollapsed() {