Adds provideMcpServerDefinitions

Author: d13

src/container.ts

@@ -233,11 +233,6 @@ export class Container {
 		this._disposables.push((this._statusBarController = new StatusBarController(this)));
 		this._disposables.push((this._codeLensController = new GitCodeLensController(this)));
 
-		const mcpProvider = getMcpProvider(this);
-		if (mcpProvider != null) {
-			this._disposables.push(mcpProvider);
-		}
-
 		const webviews = new WebviewsController(this);
 		this._disposables.push(webviews);
 		this._disposables.push((this._views = new Views(this, webviews)));
@@ -279,6 +274,11 @@ 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')) {

src/env/browser/providers.ts

@@ -42,3 +42,7 @@ export function getSupportedWorkspacesStorageProvider(
 export function getGkCliIntegrationProvider(_container: Container): undefined {
 	return undefined;
 }
+
+export function getMcpProvider(_container: Container): undefined {
+	return undefined;
+}

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

@@ -15,6 +15,7 @@ import { getLogScope } from '../../../../system/logger.scope';
 import { compare } from '../../../../system/version';
 import { run } from '../../git/shell';
 import { getPlatform, isWeb } from '../../platform';
+import { toMcpInstallProvider } from '../mcp/utils';
 import { CliCommandHandlers } from './commands';
 import type { IpcServer } from './ipcServer';
 import { createIpcServer } from './ipcServer';
@@ -731,16 +732,3 @@ class CLIInstallError extends Error {
 		return message;
 	}
 }
-
-function toMcpInstallProvider(appHostName: string | undefined): string | undefined {
-	switch (appHostName) {
-		case 'code':
-			return 'vscode';
-		case 'code-insiders':
-			return 'vscode-insiders';
-		case 'code-exploration':
-			return 'vscode-exploration';
-		default:
-			return appHostName;
-	}
-}

src/env/node/gk/mcp.ts

@@ -0,0 +1,112 @@
+import type { Event, McpServerDefinition } from 'vscode';
+import {
+	version as codeVersion,
+	Disposable,
+	env,
+	EventEmitter,
+	lm,
+	McpStdioServerDefinition,
+	Uri,
+	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 { satisfies } from '../../../../system/version';
+import { getPlatform } from '../../platform';
+import { toMcpInstallProvider } from './utils';
+
+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) {
+		this._disposable = Disposable.from(
+			this.container.storage.onDidChange(e => this.checkStorage(e)),
+			lm.registerMcpServerDefinitionProvider('gitlens.mcpProvider', {
+				onDidChangeMcpServerDefinitions: this._onDidChangeMcpServerDefinitions.event,
+				provideMcpServerDefinitions: () => this.provideMcpServerDefinitions(),
+			}),
+		);
+
+		this.checkStorage();
+	}
+
+	private checkStorage(e?: StorageChangeEvent): void {
+		if (e != null && !(e.keys as string[]).includes('gk:cli:install')) return;
+		this._onDidChangeMcpServerDefinitions.fire();
+	}
+
+	private async provideMcpServerDefinitions(): Promise<McpServerDefinition[]> {
+		const config = await this.getMcpConfiguration();
+		if (config == null) {
+			return [];
+		}
+
+		const serverDefinition = new McpStdioServerDefinition(
+			config.name,
+			config.command,
+			config.args,
+			{},
+			config.version,
+		);
+
+		this.notifyServerProvided();
+
+		return [serverDefinition];
+	}
+
+	private async getMcpConfiguration(): Promise<
+		{ name: string; type: string; command: string; args: string[]; version?: string } | undefined
+	> {
+		const cliInstall = this.container.storage.get('gk:cli:install');
+		const cliPath = this.container.storage.get('gk:cli:path');
+
+		if (cliInstall?.status !== 'completed' || !cliPath) {
+			return undefined;
+		}
+
+		const platform = getPlatform();
+		const executable = platform === 'windows' ? 'gk.exe' : 'gk';
+		const command = Uri.joinPath(Uri.file(cliPath), executable);
+
+		const appName = toMcpInstallProvider(await getHostAppName());
+		const args = ['mcp', `--host=${appName}`, '--source=gitlens', `--scheme=${env.uriScheme}`];
+		return {
+			name: 'GitKraken MCP Server',
+			type: 'stdio',
+			command: command.fsPath,
+			args: args,
+			version: cliInstall.version,
+		};
+	}
+
+	dispose(): void {
+		this._disposable.dispose();
+		this._onDidChangeMcpServerDefinitions.dispose();
+	}
+
+	private _notifyServerProvided = false;
+	private notifyServerProvided = debounce(() => {
+		if (this._notifyServerProvided) return;
+
+		void window.showInformationMessage('GitLens can now automatically configure the GitKraken MCP server for you');
+		this._notifyServerProvided = true;
+	}, 250);
+}

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

@@ -0,0 +1,12 @@
+export function toMcpInstallProvider(appHostName: string | undefined): string | undefined {
+	switch (appHostName) {
+		case 'code':
+			return 'vscode';
+		case 'code-insiders':
+			return 'vscode-insiders';
+		case 'code-exploration':
+			return 'vscode-exploration';
+		default:
+			return appHostName;
+	}
+}

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

@@ -14,7 +14,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';
+import { McpProvider } from './gk/mcp/integration';
 
 let gitInstance: Git | undefined;
 function ensureGit(container: Container) {