mcp: add status indicator for mcp tools, discovery setting (microsoft#243402)

connor4312 · web-flow · commit 4560f083af9d · 2025-03-13T00:32:31.000+01:00
The tool indicator in chat now has: - A "refresh" action if there are new MCP servers with undiscovered tools (clicking starts the servers) - An error if any tool fails to start (clicking opens the first failing tool options quickpick) - A loading indicator while they're starting (clicking opens output) This also adds a `chat.mpc.discovery.enabled` setting, off by default for now, to configure whether filesystem discovery is enabled. I expect to turn this on as we gain confidence with the feature. Refs microsoft#243229
diff --git a/src/vs/workbench/contrib/chat/browser/chat.contribution.ts b/src/vs/workbench/contrib/chat/browser/chat.contribution.ts
@@ -101,7 +101,7 @@ import { ChatStatusBarEntry } from './chatStatus.js';
 import product from '../../../../platform/product/common/product.js';
 import { Event } from '../../../../base/common/event.js';
 import { ChatEditingNotebookFileSystemProviderContrib } from './chatEditing/notebook/chatEditingNotebookFileSystemProvider.js';
-import { mcpConfigurationSection, mcpSchemaExampleServers } from '../../mcp/common/mcpConfiguration.js';
+import { mcpConfigurationSection, mcpDiscoverySection, mcpSchemaExampleServers } from '../../mcp/common/mcpConfiguration.js';
 import { mcpSchemaId } from '../../../services/configuration/common/configuration.js';
 import { ChatTransferService, IChatTransferService } from '../common/chatTransferService.js';
 import { ChatTransferContribution } from './actions/chatTransfer.js';
@@ -213,6 +213,11 @@ configurationRegistry.registerConfiguration({
 			description: nls.localize('workspaceConfig.mcp.description', "Model Context Protocol server configurations"),
 			$ref: mcpSchemaId
 		},
+		[mcpDiscoverySection]: {
+			type: 'boolean',
+			default: false,
+			description: nls.localize('mpc.discovery.enabled', "Enable discovery of Model Context Protocol servers on the machine."),
+		},
 		[PromptsConfig.CONFIG_KEY]: {
 			type: 'boolean',
 			title: nls.localize(
diff --git a/src/vs/workbench/contrib/chat/browser/media/chat.css b/src/vs/workbench/contrib/chat/browser/media/chat.css
@@ -1149,6 +1149,45 @@ have to be updated for changes to the rules above, or to support more deeply nes
 	gap: 5px;
 }
 
+.action-item.chat-mcp {
+	display: flex !important;
+
+	&.chat-mcp-has-action .action-label {
+		border-top-right-radius: 0;
+		border-bottom-right-radius: 0;
+		border-right: 0;
+	}
+
+	.chat-mcp-action {
+		align-self: stretch;
+		padding: 0 2px;
+		border-radius: 0;
+		outline: 0;
+		border: 0;
+		border-top-right-radius: 4px;
+		border-bottom-right-radius: 4px;
+		background: var(--vscode-button-background);
+		cursor: pointer;
+
+		.codicon {
+			width: fit-content;
+			color: var(--vscode-button-foreground);
+		}
+
+		.codicon::before {
+			font-size: 14px;
+		}
+
+		&.chat-mcp-action-error {
+			background: var(--vscode-activityErrorBadge-background);
+
+			.codicon {
+				color: var(--vscode-activityErrorBadge-foreground);
+			}
+		}
+	}
+}
+
 .action-item.chat-attached-context-attachment.chat-add-files .action-label.codicon::before {
 	font: normal normal normal 16px/1 codicon;
 }
diff --git a/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts b/src/vs/workbench/contrib/mcp/browser/mcpCommands.ts
@@ -3,15 +3,16 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import './media/mcp.css';
-import { reset } from '../../../../base/browser/dom.js';
+import { addDisposableListener, EventType, h, reset } from '../../../../base/browser/dom.js';
 import { renderLabelWithIcons } from '../../../../base/browser/ui/iconLabel/iconLabels.js';
+import { assertNever } from '../../../../base/common/assert.js';
 import { Codicon } from '../../../../base/common/codicons.js';
 import { diffSets, groupBy } from '../../../../base/common/collections.js';
 import { Event } from '../../../../base/common/event.js';
-import { KeyMod, KeyCode } from '../../../../base/common/keyCodes.js';
+import { KeyCode, KeyMod } from '../../../../base/common/keyCodes.js';
 import { Disposable, DisposableStore } from '../../../../base/common/lifecycle.js';
 import { autorun, derived, transaction } from '../../../../base/common/observable.js';
+import { ThemeIcon } from '../../../../base/common/themables.js';
 import { assertType } from '../../../../base/common/types.js';
 import { ILocalizedString, localize, localize2 } from '../../../../nls.js';
 import { IActionViewItemService } from '../../../../platform/actions/browser/actionViewItemService.js';
@@ -22,12 +23,14 @@ import { ContextKeyExpr } from '../../../../platform/contextkey/common/contextke
 import { IInstantiationService, ServicesAccessor } from '../../../../platform/instantiation/common/instantiation.js';
 import { KeybindingWeight } from '../../../../platform/keybinding/common/keybindingsRegistry.js';
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
+import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { CHAT_CATEGORY } from '../../chat/browser/actions/chatActions.js';
 import { ChatAgentLocation } from '../../chat/common/chatAgents.js';
 import { ChatContextKeys } from '../../chat/common/chatContextKeys.js';
 import { McpContextKeys } from '../common/mcpContextKeys.js';
-import { IMcpServer, IMcpService, IMcpTool, McpConnectionState } from '../common/mcpTypes.js';
+import { IMcpServer, IMcpService, IMcpTool, McpConnectionState, McpServerToolsState } from '../common/mcpTypes.js';
+import './media/mcp.css';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -65,7 +68,7 @@ export class ListMcpServerCommand extends Action2 {
 					...servers.map(server => ({
 						id: server.definition.id,
 						label: server.definition.label,
-						description: McpConnectionState.toString(server.state.read(reader)),
+						description: McpConnectionState.toString(server.connectionState.read(reader)),
 					})),
 				];
 			});
@@ -117,7 +120,7 @@ export class McpServerOptionsCommand extends Action2 {
 		}
 
 		const items: ActionItem[] = [];
-		const serverState = server.state.get();
+		const serverState = server.connectionState.get();
 
 		// Only show start when server is stopped or in error state
 		if (McpConnectionState.canBeStarted(serverState.state)) {
@@ -230,14 +233,14 @@ export class AttachMCPToolsAction extends Action2 {
 			}
 			picks.push({
 				type: 'separator',
-				label: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.state.get()))
+				label: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.connectionState.get()))
 			});
 
 			const item: ServerPick = {
 				server,
 				type: 'item',
 				label: `${server.definition.label}`,
-				description: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.state.get())),
+				description: localize('desc', "MCP Server - {0}", McpConnectionState.toString(server.connectionState.get())),
 				picked: tools.some(tool => tool.enabled.get()),
 				toolPicks: []
 			};
@@ -340,10 +343,17 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 	constructor(
 		@IActionViewItemService actionViewItemService: IActionViewItemService,
 		@IMcpService mcpService: IMcpService,
-		@IInstantiationService instaService: IInstantiationService
+		@IInstantiationService instaService: IInstantiationService,
+		@ICommandService commandService: ICommandService,
 	) {
 		super();
 
+		const enum DisplayedState {
+			None,
+			NewTools,
+			Error,
+			Refreshing,
+		}
 
 		const toolsCount = derived(r => {
 			let count = 0;
@@ -358,6 +368,30 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 			return { count, enabled };
 		});
 
+		const displayedState = derived(reader => {
+			const servers = mcpService.servers.read(reader);
+			const serversPerState: IMcpServer[][] = [];
+			for (const server of servers) {
+				let thisState = DisplayedState.None;
+				switch (server.toolsState.read(reader)) {
+					case McpServerToolsState.Unknown:
+						thisState = server.connectionState.read(reader).state === McpConnectionState.Kind.Error ? DisplayedState.Error : DisplayedState.NewTools;
+						break;
+					case McpServerToolsState.RefreshingFromUnknown:
+						thisState = DisplayedState.Refreshing;
+						break;
+					case McpServerToolsState.Cached:
+						thisState = server.connectionState.read(reader).state === McpConnectionState.Kind.Error ? DisplayedState.Error : DisplayedState.None;
+						break;
+				}
+
+				serversPerState[thisState] ??= [];
+				serversPerState[thisState].push(server);
+			}
+
+			const maxState = (serversPerState.length - 1) as DisplayedState;
+			return { state: maxState, servers: serversPerState[maxState] };
+		});
 
 		this._store.add(actionViewItemService.register(MenuId.ChatInputAttachmentToolbar, AttachMCPToolsAction.id, (action, options) => {
 			if (!(action instanceof MenuItemAction)) {
@@ -371,6 +405,73 @@ export class AttachMCPToolsActionRendering extends Disposable implements IWorkbe
 					this.options.label = true;
 					container.classList.add('chat-mcp');
 					super.render(container);
+
+					const action = h('button.chat-mcp-action', [h('span@icon')]);
+
+					this._register(autorun(r => {
+						const { state, servers } = displayedState.read(r);
+						const { root, icon } = action;
+						this.updateTooltip();
+						container.classList.toggle('chat-mcp-has-action', state !== DisplayedState.None);
+
+						if (state === DisplayedState.None) {
+							root.remove();
+							return;
+						}
+
+						if (!root.parentElement) {
+							container.appendChild(root);
+						}
+
+						root.ariaLabel = this.getLabelForState({ state, servers });
+						root.className = 'chat-mcp-action';
+						icon.className = '';
+						if (state === DisplayedState.NewTools) {
+							root.classList.add('chat-mcp-action-new');
+							icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.refresh));
+						} else if (state === DisplayedState.Error) {
+							root.classList.add('chat-mcp-action-error');
+							icon.classList.add(...ThemeIcon.asClassNameArray(Codicon.warning));
+						} else if (state === DisplayedState.Refreshing) {
+							root.classList.add('chat-mcp-action-refreshing');
+							icon.classList.add(...ThemeIcon.asClassNameArray(spinningLoading));
+						} else {
+							assertNever(state);
+						}
+					}));
+
+					this._register(addDisposableListener(action.root, EventType.CLICK, e => {
+						e.preventDefault();
+						e.stopPropagation();
+
+						const { state, servers } = displayedState.get();
+						if (state === DisplayedState.NewTools) {
+							servers.forEach(server => server.start());
+						} else if (state === DisplayedState.Refreshing) {
+							servers.at(-1)?.showOutput();
+						} else if (state === DisplayedState.Error) {
+							const server = servers.at(-1);
+							if (server) {
+								commandService.executeCommand(McpServerOptionsCommand.id, server.definition.id);
+							}
+						}
+					}));
+				}
+
+				protected override getTooltip(): string {
+					return this.getLabelForState() || super.getTooltip();
+				}
+
+				private getLabelForState({ state, servers } = displayedState.get()) {
+					if (state === DisplayedState.NewTools) {
+						return localize('mcp.newTools', "New tools available ({0})", servers.length);
+					} else if (state === DisplayedState.Error) {
+						return localize('mcp.toolError', "Error loading {0} tool(s)", servers.length);
+					} else if (state === DisplayedState.Refreshing) {
+						return localize('mcp.toolRefresh', "Discovering tools...");
+					} else {
+						return null;
+					}
 				}
 
 				protected override updateLabel(): void {
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts
@@ -119,8 +119,10 @@ export class ConfigMcpDiscovery extends Disposable implements IMcpDiscovery {
 				continue;
 			}
 
+
 			if (!nextDefinitions.length) {
 				src.disposable.clear();
+				src.serverDefinitions.set(nextDefinitions, undefined);
 			} else {
 				src.serverDefinitions.set(nextDefinitions, undefined);
 				src.disposable.value ??= this._mcpRegistry.registerCollection({
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts
@@ -6,15 +6,18 @@
 import { RunOnceScheduler } from '../../../../../base/common/async.js';
 import { Disposable, MutableDisposable } from '../../../../../base/common/lifecycle.js';
 import { Schemas } from '../../../../../base/common/network.js';
-import { observableValue } from '../../../../../base/common/observable.js';
+import { autorunWithStore, IObservable, observableValue } from '../../../../../base/common/observable.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
 import { INativeMcpDiscoveryData } from '../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js';
+import { observableConfigValue } from '../../../../../platform/observable/common/platformObservableUtils.js';
 import { StorageScope } from '../../../../../platform/storage/common/storage.js';
 import { Dto } from '../../../../services/extensions/common/proxyIdentifier.js';
+import { mcpDiscoverySection } from '../mcpConfiguration.js';
 import { IMcpRegistry } from '../mcpRegistryTypes.js';
 import { McpCollectionDefinition, McpCollectionSortOrder, McpServerDefinition } from '../mcpTypes.js';
 import { IMcpDiscovery } from './mcpDiscovery.js';
@@ -26,6 +29,7 @@ import { ClaudeDesktopMpcDiscoveryAdapter, NativeMpcDiscoveryAdapter } from './n
  */
 export abstract class FilesystemMpcDiscovery extends Disposable implements IMcpDiscovery {
 	private readonly adapters: readonly NativeMpcDiscoveryAdapter[];
+	private _fsDiscoveryEnabled: IObservable<boolean>;
 	private suffix = '';
 
 	constructor(
@@ -34,12 +38,15 @@ export abstract class FilesystemMpcDiscovery extends Disposable implements IMcpD
 		@IFileService private readonly fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMcpRegistry private readonly mcpRegistry: IMcpRegistry,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
 		super();
 		if (remoteAuthority) {
 			this.suffix = ' ' + localize('onRemoteLabel', ' on {0}', labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority));
 		}
 
+		this._fsDiscoveryEnabled = observableConfigValue(mcpDiscoverySection, false, configurationService);
+
 		this.adapters = [
 			instantiationService.createInstance(ClaudeDesktopMpcDiscoveryAdapter, remoteAuthority)
 		];
@@ -97,10 +104,17 @@ export abstract class FilesystemMpcDiscovery extends Disposable implements IMcpD
 				}
 			};
 
-			const watcher = this._register(this.fileService.createWatcher(file, { recursive: false, excludes: [] }));
-			const throttler = this._register(new RunOnceScheduler(updateFile, 500));
-			this._register(watcher.onDidChange(() => throttler.schedule()));
-			updateFile();
+			this._register(autorunWithStore((reader, store) => {
+				if (!this._fsDiscoveryEnabled.read(reader)) {
+					collectionRegistration.clear();
+					return;
+				}
+
+				const throttler = store.add(new RunOnceScheduler(updateFile, 500));
+				const watcher = store.add(this.fileService.createWatcher(file, { recursive: false, excludes: [] }));
+				store.add(watcher.onDidChange(() => throttler.schedule()));
+				updateFile();
+			}));
 		}
 	}
 }
diff --git a/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts b/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpRemoteDiscovery.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { ProxyChannel } from '../../../../../base/parts/ipc/common/ipc.js';
+import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
@@ -24,8 +25,9 @@ export class RemoteNativeMpcDiscovery extends FilesystemMpcDiscovery {
 		@IFileService fileService: IFileService,
 		@IInstantiationService instantiationService: IInstantiationService,
 		@IMcpRegistry mcpRegistry: IMcpRegistry,
+		@IConfigurationService configurationService: IConfigurationService,
 	) {
-		super(remoteAgent.getConnection()?.remoteAuthority || null, labelService, fileService, instantiationService, mcpRegistry);
+		super(remoteAgent.getConnection()?.remoteAuthority || null, labelService, fileService, instantiationService, mcpRegistry, configurationService);
 	}
 
 	public override async start() {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts b/src/vs/workbench/contrib/mcp/common/mcpConfiguration.ts
@@ -17,6 +17,7 @@ const mcpSchemaExampleServer = {
 };
 
 export const mcpConfigurationSection = 'mcp';
+export const mcpDiscoverySection = 'chat.mpc.discovery.enabled';
 
 export const mcpSchemaExampleServers = {
 	'mcp-server-time': {
diff --git a/src/vs/workbench/contrib/mcp/common/mcpServer.ts b/src/vs/workbench/contrib/mcp/common/mcpServer.ts
diff --git a/src/vs/workbench/contrib/mcp/common/mcpTypes.ts b/src/vs/workbench/contrib/mcp/common/mcpTypes.ts
diff --git a/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts b/src/vs/workbench/contrib/mcp/electron-sandbox/nativeMpcDiscovery.ts
