Prevents older ide versions throwing errors due to McpProvider

Author: d13

src/container.ts

@@ -274,11 +274,6 @@ export class Container {
 			this._disposables.push(cliIntegration);
 		}
 
-		const mcpProvider = getMcpProvider(this);
-		if (mcpProvider != null) {
-			this._disposables.push(mcpProvider);
-		}
-
 		this._disposables.push(
 			configuration.onDidChange(e => {
 				if (configuration.changed(e, 'terminalLinks.enabled')) {
@@ -327,6 +322,7 @@ export class Container {
 
 		this._ready = true;
 		await this.registerGitProviders();
+		await this.registerMcpProvider();
 		queueMicrotask(() => this._onReady.fire());
 	}
 
@@ -341,6 +337,14 @@ export class Container {
 		void this._git.registrationComplete();
 	}
 
+	@log()
+	private async registerMcpProvider(): Promise<void> {
+		const mcpProvider = await getMcpProvider(this);
+		if (mcpProvider != null) {
+			this._disposables.push(mcpProvider);
+		}
+	}
+
 	private onAnyConfigurationChanged(e: ConfigurationChangeEvent) {
 		if (!configuration.changedAny(e, extensionPrefix)) return;
 

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

@@ -1,11 +1,10 @@
 import type { Event, McpServerDefinition } from 'vscode';
-import { version as codeVersion, Disposable, env, EventEmitter, lm, McpStdioServerDefinition, window } from 'vscode';
+import { Disposable, env, EventEmitter, lm, McpStdioServerDefinition, window } from 'vscode';
 import type { Container } from '../../../../container';
 import type { StorageChangeEvent } from '../../../../system/-webview/storage';
 import { getHostAppName } from '../../../../system/-webview/vscode';
 import { debounce } from '../../../../system/function/debounce';
 import { Logger } from '../../../../system/logger';
-import { satisfies } from '../../../../system/version';
 import { run } from '../../git/shell';
 import { getPlatform } from '../../platform';
 import { toMcpInstallProvider } from './utils';
@@ -15,25 +14,13 @@ const CLIProxyMCPConfigOutputs = {
 };
 
 export class McpProvider implements Disposable {
-	static #instance: McpProvider | undefined;
-
-	static create(container: Container): McpProvider | undefined {
-		if (!satisfies(codeVersion, '>= 1.101.0') || !lm.registerMcpServerDefinitionProvider) return undefined;
-
-		if (this.#instance == null) {
-			this.#instance = new McpProvider(container);
-		}
-
-		return this.#instance;
-	}
-
 	private readonly _disposable: Disposable;
 	private readonly _onDidChangeMcpServerDefinitions = new EventEmitter<void>();
 	get onDidChangeMcpServerDefinitions(): Event<void> {
 		return this._onDidChangeMcpServerDefinitions.event;
 	}
 
-	private constructor(private readonly container: Container) {
+	constructor(private readonly container: Container) {
 		this._disposable = Disposable.from(
 			this.container.storage.onDidChange(e => this.checkStorage(e)),
 			lm.registerMcpServerDefinitionProvider('gitlens.mcpProvider', {

src/env/node/providers.ts

@@ -2,6 +2,7 @@ import type { Container } from '../../container';
 import type { GitCommandOptions } from '../../git/commandOptions';
 import type { GitProvider } from '../../git/gitProvider';
 import type { RepositoryLocationProvider } from '../../git/location/repositorylocationProvider';
+import { supportsMcpRegistration } from '../../plus/gk/utils/-webview/mcp.utils';
 import type { SharedGkStorageLocationProvider } from '../../plus/repos/sharedGkStorageLocationProvider';
 import type { GkWorkspacesSharedStorageProvider } from '../../plus/workspaces/workspacesSharedStorageProvider';
 import { configuration } from '../../system/-webview/configuration';
@@ -14,7 +15,7 @@ import { GkCliIntegrationProvider } from './gk/cli/integration';
 import { LocalRepositoryLocationProvider } from './gk/localRepositoryLocationProvider';
 import { LocalSharedGkStorageLocationProvider } from './gk/localSharedGkStorageLocationProvider';
 import { LocalGkWorkspacesSharedStorageProvider } from './gk/localWorkspacesSharedStorageProvider';
-import { McpProvider } from './gk/mcp/integration';
+import type { McpProvider } from './gk/mcp/integration';
 
 let gitInstance: Git | undefined;
 function ensureGit(container: Container) {
@@ -73,6 +74,11 @@ export function getGkCliIntegrationProvider(container: Container): GkCliIntegrat
 	return new GkCliIntegrationProvider(container);
 }
 
-export function getMcpProvider(container: Container): McpProvider | undefined {
-	return McpProvider.create(container);
+export async function getMcpProvider(container: Container): Promise<McpProvider | undefined> {
+	if (!supportsMcpRegistration()) return undefined;
+
+	// Older versions of VS Code do not support the classes used in the MCP integration, so we need to dynamically import
+	const mcpModule = await import(/* webpackChunkName: "mcp" */ './gk/mcp/integration');
+
+	return new mcpModule.McpProvider(container);
 }

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

@@ -1,6 +1,8 @@
+import { lm, version } from 'vscode';
 import { getPlatform, isWeb } from '@env/platform';
 import type { Container } from '../../../../container';
 import { getHostAppName } from '../../../../system/-webview/vscode';
+import { satisfies } from '../../../../system/version';
 
 export async function isMcpBannerEnabled(container: Container): Promise<boolean> {
 	// Check if running on web
@@ -22,3 +24,7 @@ export async function isMcpBannerEnabled(container: Container): Promise<boolean>
 
 	return hostAppName != null && supportedApps.includes(hostAppName);
 }
+
+export function supportsMcpRegistration(): boolean {
+	return satisfies(version, '>= 1.101.0') && lm.registerMcpServerDefinitionProvider != null;
+}