fix microsoft#254926 (microsoft#254928)

Author: sandy081

src/vs/workbench/api/browser/mainThreadMcp.ts

@@ -13,6 +13,7 @@ import Severity from '../../../base/common/severity.js';
 import { URI, UriComponents } from '../../../base/common/uri.js';
 import * as nls from '../../../nls.js';
 import { IDialogService, IPromptButton } from '../../../platform/dialogs/common/dialogs.js';
+import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { LogLevel } from '../../../platform/log/common/log.js';
 import { IMcpMessageTransport, IMcpRegistry } from '../../contrib/mcp/common/mcpRegistryTypes.js';
 import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerLaunch, McpServerTransportType } from '../../contrib/mcp/common/mcpTypes.js';
@@ -91,6 +92,7 @@ export class MainThreadMcp extends Disposable implements MainThreadMcpShape {
 			const serverDefinitions = observableValue<readonly McpServerDefinition[]>('mcpServers', servers);
 			const handle = this._mcpRegistry.registerCollection({
 				...collection,
+				source: new ExtensionIdentifier(collection.extensionId),
 				resolveServerLanch: collection.canResolveLaunch ? (async def => {
 					const r = await this._proxy.$resolveMcpLaunch(collection.id, def.label);
 					return r ? McpServerLaunch.fromSerialized(r) : undefined;

src/vs/workbench/contrib/chat/browser/actions/chatToolPicker.ts

@@ -12,13 +12,14 @@ import { assertType } from '../../../../../base/common/types.js';
 import { generateUuid } from '../../../../../base/common/uuid.js';
 import { localize } from '../../../../../nls.js';
 import { ICommandService } from '../../../../../platform/commands/common/commands.js';
+import { ExtensionIdentifier } from '../../../../../platform/extensions/common/extensions.js';
 import { ServicesAccessor } from '../../../../../platform/instantiation/common/instantiation.js';
 import { IQuickInputButton, IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../../platform/quickinput/common/quickInput.js';
 import { IEditorService } from '../../../../services/editor/common/editorService.js';
-import { IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
+import { ExtensionEditorTab, IExtensionsWorkbenchService } from '../../../extensions/common/extensions.js';
 import { McpCommandIds } from '../../../mcp/common/mcpCommandIds.js';
 import { IMcpRegistry } from '../../../mcp/common/mcpRegistryTypes.js';
-import { IMcpServer, IMcpService, McpConnectionState } from '../../../mcp/common/mcpTypes.js';
+import { IMcpServer, IMcpService, IMcpWorkbenchService, McpConnectionState, McpServerEditorTab } from '../../../mcp/common/mcpTypes.js';
 import { ILanguageModelToolsService, IToolData, ToolDataSource, ToolSet } from '../../common/languageModelToolsService.js';
 import { ConfigureToolSets } from '../tools/toolSetsContribution.js';
 
@@ -59,8 +60,9 @@ export async function showToolsPicker(
 	const mcpService = accessor.get(IMcpService);
 	const mcpRegistry = accessor.get(IMcpRegistry);
 	const commandService = accessor.get(ICommandService);
-	const extensionWorkbenchService = accessor.get(IExtensionsWorkbenchService);
+	const extensionsWorkbenchService = accessor.get(IExtensionsWorkbenchService);
 	const editorService = accessor.get(IEditorService);
+	const mcpWorkbenchService = accessor.get(IMcpWorkbenchService);
 	const toolsService = accessor.get(ILanguageModelToolsService);
 
 	const mcpServerByTool = new Map<string, IMcpServer>();
@@ -88,7 +90,7 @@ export async function showToolsPicker(
 
 	const addMcpPick: CallbackPick = { type: 'item', label: localize('addServer', "Add MCP Server..."), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => commandService.executeCommand(McpCommandIds.AddConfiguration) };
 	const configureToolSetsPick: CallbackPick = { type: 'item', label: localize('configToolSet', "Configure Tool Sets..."), iconClass: ThemeIcon.asClassName(Codicon.gear), pickable: false, run: () => commandService.executeCommand(ConfigureToolSets.ID) };
-	const addExpPick: CallbackPick = { type: 'item', label: localize('addExtension', "Install Extension..."), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => extensionWorkbenchService.openSearch('@tag:language-model-tools') };
+	const addExpPick: CallbackPick = { type: 'item', label: localize('addExtension', "Install Extension..."), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: () => extensionsWorkbenchService.openSearch('@tag:language-model-tools') };
 	const addPick: CallbackPick = {
 		type: 'item', label: localize('addAny', "Add More Tools..."), iconClass: ThemeIcon.asClassName(Codicon.add), pickable: false, run: async () => {
 			const pick = await quickPickService.pick(
@@ -143,7 +145,13 @@ export async function showToolsPicker(
 			toolBuckets.set(key, bucket);
 
 			const collection = mcpRegistry.collections.get().find(c => c.id === mcpServer.collection.id);
-			if (collection?.presentation?.origin) {
+			if (collection?.source) {
+				buttons.push({
+					iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
+					tooltip: localize('configMcpCol', "Configure {0}", collection.label),
+					action: () => collection.source ? collection.source instanceof ExtensionIdentifier ? extensionsWorkbenchService.open(collection.source.value, { tab: ExtensionEditorTab.Features, feature: 'mcp' }) : mcpWorkbenchService.open(collection.source, { tab: McpServerEditorTab.Configuration }) : undefined
+				});
+			} else if (collection?.presentation?.origin) {
 				buttons.push({
 					iconClass: ThemeIcon.asClassName(Codicon.settingsGear),
 					tooltip: localize('configMcpCol', "Configure {0}", collection.label),

src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts

@@ -92,7 +92,8 @@ export class ExtensionMcpDiscovery extends Disposable implements IMcpDiscovery {
 							isCached: !!serverDefs,
 							load: () => this._activateExtensionServers(coll.id),
 							removed: () => extensionCollections.deleteAndDispose(id),
-						}
+						},
+						source: collections.description.identifier
 					});
 
 					extensionCollections.set(id, dispo);

src/vs/workbench/contrib/mcp/common/discovery/installedMcpServersDiscovery.ts

@@ -9,7 +9,7 @@ import { URI } from '../../../../../base/common/uri.js';
 import { ConfigurationTarget } from '../../../../../platform/configuration/common/configuration.js';
 import { StorageScope } from '../../../../../platform/storage/common/storage.js';
 import { IMcpRegistry } from '../mcpRegistryTypes.js';
-import { McpServerDefinition, McpServerTransportType, IMcpWorkbenchService, IMcpConfigPath } from '../mcpTypes.js';
+import { McpServerDefinition, McpServerTransportType, IMcpWorkbenchService, IMcpConfigPath, IWorkbenchMcpServer } from '../mcpTypes.js';
 import { IMcpDiscovery } from './mcpDiscovery.js';
 import { mcpConfigurationSection } from '../mcpConfiguration.js';
 import { posix as pathPosix, win32 as pathWin32, sep as pathSep } from '../../../../../base/common/path.js';
@@ -58,7 +58,7 @@ export class InstalledMcpServersDiscovery extends Disposable implements IMcpDisc
 	private async sync(): Promise<void> {
 		try {
 			const remoteEnv = await this.remoteAgentService.getEnvironment();
-			const collections = new Map<string, [IMcpConfigPath | undefined, McpServerDefinition[]]>();
+			const collections = new Map<string, [IMcpConfigPath | undefined, McpServerDefinition[], IWorkbenchMcpServer]>();
 			const mcpConfigPathInfos = new ResourceMap<Promise<IMcpConfigPath & { locations: Map<string, Location> } | undefined>>();
 			for (const server of this.mcpWorkbenchService.local) {
 				if (!server.local) {
@@ -81,7 +81,7 @@ export class InstalledMcpServersDiscovery extends Disposable implements IMcpDisc
 
 				let definitions = collections.get(collectionId);
 				if (!definitions) {
-					definitions = [mcpConfigPath, []];
+					definitions = [mcpConfigPath, [], server];
 					collections.set(collectionId, definitions);
 				}
 
@@ -135,7 +135,7 @@ export class InstalledMcpServersDiscovery extends Disposable implements IMcpDisc
 			for (const [id, [mcpConfigPath, serverDefinitions]] of collections) {
 				this.collectionDisposables.deleteAndDispose(id);
 				this.collectionDisposables.set(id, this.mcpRegistry.registerCollection({
-					id: id,
+					id,
 					label: mcpConfigPath?.label ?? '',
 					presentation: {
 						order: serverDefinitions[0]?.presentation?.order,

src/vs/workbench/contrib/mcp/common/mcpTypes.ts

@@ -71,6 +71,8 @@ export interface McpCollectionDefinition {
 		removed?(): void;
 	};
 
+	readonly source?: IWorkbenchMcpServer | ExtensionIdentifier;
+
 	readonly presentation?: {
 		/** Sort order of the collection. */
 		readonly order?: number;