fix microsoft#253366 (microsoft#253639)

Author: sandy081

src/vs/workbench/contrib/mcp/browser/mcpServerActions.ts

@@ -12,10 +12,7 @@ import { IContextMenuService } from '../../../../platform/contextview/browser/co
 import { IInstantiationService } from '../../../../platform/instantiation/common/instantiation.js';
 import { manageExtensionIcon } from '../../extensions/browser/extensionsIcons.js';
 import { getDomNodePagePosition } from '../../../../base/browser/dom.js';
-import { IMcpSamplingService, IMcpServer, IMcpServerContainer, IMcpService, IMcpWorkbenchService, IWorkbenchMcpServer, McpCapability, McpConnectionState } from '../common/mcpTypes.js';
-import { IMcpRegistry } from '../common/mcpRegistryTypes.js';
-import { URI } from '../../../../base/common/uri.js';
-import { Location } from '../../../../editor/common/languages.js';
+import { IMcpSamplingService, IMcpServer, IMcpServerContainer, IMcpService, IMcpWorkbenchService, IWorkbenchMcpServer, McpCapability, McpConnectionState, McpServerEditorTab } from '../common/mcpTypes.js';
 import { IEditorService } from '../../../services/editor/common/editorService.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
 import { McpCommandIds } from '../common/mcpCommandIds.js';
@@ -540,9 +537,7 @@ export class ShowServerConfigurationAction extends McpServerAction {
 	private static readonly HIDE = `${this.CLASS} hide`;
 
 	constructor(
-		@IMcpService private readonly mcpService: IMcpService,
-		@IMcpRegistry private readonly mcpRegistry: IMcpRegistry,
-		@IEditorService private readonly editorService: IEditorService,
+		@IMcpWorkbenchService private readonly mcpWorkbenchService: IMcpWorkbenchService
 	) {
 		super('extensions.config', localize('config', "Show Configuration"), ShowServerConfigurationAction.CLASS, false);
 		this.update();
@@ -551,8 +546,7 @@ export class ShowServerConfigurationAction extends McpServerAction {
 	update(): void {
 		this.enabled = false;
 		this.class = ShowServerConfigurationAction.HIDE;
-		const configurationTarget = this.getConfigurationTarget();
-		if (!configurationTarget) {
+		if (!this.mcpServer?.local) {
 			return;
 		}
 		this.class = ShowServerConfigurationAction.CLASS;
@@ -561,31 +555,12 @@ export class ShowServerConfigurationAction extends McpServerAction {
 	}
 
 	override async run(): Promise<any> {
-		const configurationTarget = this.getConfigurationTarget();
-		if (!configurationTarget) {
+		if (!this.mcpServer?.local) {
 			return;
 		}
-		this.editorService.openEditor({
-			resource: URI.isUri(configurationTarget) ? configurationTarget : configurationTarget!.uri,
-			options: { selection: URI.isUri(configurationTarget) ? undefined : configurationTarget!.range }
-		});
+		this.mcpWorkbenchService.open(this.mcpServer, { tab: McpServerEditorTab.Configuration });
 	}
 
-	private getConfigurationTarget(): Location | URI | undefined {
-		if (!this.mcpServer) {
-			return;
-		}
-		if (!this.mcpServer.local) {
-			return;
-		}
-		const server = this.mcpService.servers.get().find(s => s.definition.label === this.mcpServer?.name);
-		if (!server) {
-			return;
-		}
-		const collection = this.mcpRegistry.collections.get().find(c => c.id === server.collection.id);
-		const serverDefinition = collection?.serverDefinitions.get().find(s => s.id === server.definition.id);
-		return serverDefinition?.presentation?.origin || collection?.presentation?.origin;
-	}
 }
 
 export class ConfigureModelAccessAction extends McpServerAction {

src/vs/workbench/contrib/mcp/browser/mcpServerEditor.ts

@@ -37,11 +37,10 @@ import { IWebview, IWebviewService } from '../../webview/browser/webview.js';
 import { IEditorGroup } from '../../../services/editor/common/editorGroupsService.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.js';
 import { IHoverService } from '../../../../platform/hover/browser/hover.js';
-import { IWorkbenchMcpServer, McpServerContainers } from '../common/mcpTypes.js';
+import { IMcpServerEditorOptions, IWorkbenchMcpServer, McpServerContainers } from '../common/mcpTypes.js';
 import { InstallCountWidget, McpServerIconWidget, McpServerWidget, onClick, PublisherWidget, RatingsWidget } from './mcpServerWidgets.js';
 import { DropDownAction, InstallAction, ManageMcpServerAction, UninstallAction } from './mcpServerActions.js';
 import { McpServerEditorInput } from './mcpServerEditorInput.js';
-import { IEditorOptions } from '../../../../platform/editor/common/editor.js';
 import { ILocalMcpServer, IMcpServerManifest, IMcpServerPackage, PackageType } from '../../../../platform/mcp/common/mcpManagement.js';
 import { IActionViewItemOptions } from '../../../../base/browser/ui/actionbar/actionViewItems.js';
 import { McpServerType } from '../../../../platform/mcp/common/mcpPlatformTypes.js';
@@ -286,7 +285,7 @@ export class McpServerEditor extends EditorPane {
 		};
 	}
 
-	override async setInput(input: McpServerEditorInput, options: IEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
+	override async setInput(input: McpServerEditorInput, options: IMcpServerEditorOptions | undefined, context: IEditorOpenContext, token: CancellationToken): Promise<void> {
 		await super.setInput(input, options, context, token);
 		if (this.template) {
 			await this.render(input.mcpServer, this.template, !!options?.preserveFocus);
@@ -313,6 +312,13 @@ export class McpServerEditor extends EditorPane {
 		this.renderNavbar(mcpServer, template, preserveFocus);
 	}
 
+	override setOptions(options: IMcpServerEditorOptions | undefined): void {
+		super.setOptions(options);
+		if (options?.tab) {
+			this.template?.navbar.switch(options.tab);
+		}
+	}
+
 	private renderNavbar(extension: IWorkbenchMcpServer, template: IExtensionEditorTemplate, preserveFocus: boolean): void {
 		template.content.innerText = '';
 		template.navbar.clear();
@@ -334,6 +340,10 @@ export class McpServerEditor extends EditorPane {
 			template.navbar.push(McpServerEditorTab.Manifest, localize('manifest', "Manifest"), localize('manifesttooltip', "Server manifest details"));
 		}
 
+		if ((<IMcpServerEditorOptions | undefined>this.options)?.tab) {
+			template.navbar.switch((<IMcpServerEditorOptions>this.options).tab!);
+		}
+
 		if (template.navbar.currentId) {
 			this.onNavbarChange(extension, { id: template.navbar.currentId, focus: !preserveFocus }, template);
 		}

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

@@ -569,13 +569,24 @@ export interface IMcpServerContainer extends IDisposable {
 	update(): void;
 }
 
+export interface IMcpServerEditorOptions extends IEditorOptions {
+	tab?: McpServerEditorTab;
+	sideByside?: boolean;
+}
+
 export const enum McpServerInstallState {
 	Installing,
 	Installed,
 	Uninstalling,
 	Uninstalled
 }
 
+export const enum McpServerEditorTab {
+	Readme = 'readme',
+	Manifest = 'manifest',
+	Configuration = 'configuration',
+}
+
 export interface IWorkbenchMcpServer {
 	readonly gallery: IGalleryMcpServer | undefined;
 	readonly local: IWorkbenchLocalMcpServer | undefined;
@@ -615,7 +626,7 @@ export interface IMcpWorkbenchService {
 	uninstall(mcpServer: IWorkbenchMcpServer): Promise<void>;
 	getMcpConfigPath(arg: IWorkbenchLocalMcpServer): IMcpConfigPath | undefined;
 	getMcpConfigPath(arg: URI): Promise<IMcpConfigPath | undefined>;
-	open(extension: IWorkbenchMcpServer | string, options?: IEditorOptions): Promise<void>;
+	open(extension: IWorkbenchMcpServer | string, options?: IMcpServerEditorOptions): Promise<void>;
 }
 
 export class McpServerContainers extends Disposable {