fix microsoft#253356 (microsoft#253705)

Author: sandy081

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

@@ -37,7 +37,7 @@ 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 { IMcpServerEditorOptions, IWorkbenchMcpServer, McpServerContainers } from '../common/mcpTypes.js';
+import { IMcpServerEditorOptions, IMcpWorkbenchService, IWorkbenchMcpServer, McpServerContainers } from '../common/mcpTypes.js';
 import { InstallCountWidget, McpServerIconWidget, McpServerWidget, onClick, PublisherWidget, RatingsWidget } from './mcpServerWidgets.js';
 import { DropDownAction, InstallAction, InstallingLabelAction, ManageMcpServerAction, UninstallAction } from './mcpServerActions.js';
 import { McpServerEditorInput } from './mcpServerEditorInput.js';
@@ -73,19 +73,34 @@ class NavBar extends Disposable {
 		this.actionbar = this._register(new ActionBar(element));
 	}
 
-	push(id: string, label: string, tooltip: string): void {
+	push(id: string, label: string, tooltip: string, index?: number): void {
 		const action = new Action(id, label, undefined, true, () => this.update(id, true));
 
 		action.tooltip = tooltip;
 
-		this.actions.push(action);
-		this.actionbar.push(action);
+		if (typeof index === 'number') {
+			this.actions.splice(index, 0, action);
+		} else {
+			this.actions.push(action);
+		}
+		this.actionbar.push(action, { index });
 
 		if (this.actions.length === 1) {
 			this.update(id);
 		}
 	}
 
+	remove(id: string): void {
+		const index = this.actions.findIndex(action => action.id === id);
+		if (index !== -1) {
+			this.actions.splice(index, 1);
+			this.actionbar.pull(index);
+			if (this._currentId === id) {
+				this.switch(this.actions[0]?.id);
+			}
+		}
+	}
+
 	clear(): void {
 		this.actions = dispose(this.actions);
 		this.actionbar.clear();
@@ -100,6 +115,10 @@ class NavBar extends Disposable {
 		return false;
 	}
 
+	has(id: string): boolean {
+		return this.actions.some(action => action.id === id);
+	}
+
 	private update(id: string, focus?: boolean): void {
 		this._currentId = id;
 		this._onChange.fire({ id, focus: !!focus });
@@ -165,6 +184,7 @@ export class McpServerEditor extends EditorPane {
 		@IWebviewService private readonly webviewService: IWebviewService,
 		@ILanguageService private readonly languageService: ILanguageService,
 		@IContextKeyService private readonly contextKeyService: IContextKeyService,
+		@IMcpWorkbenchService private readonly mcpWorkbenchService: IMcpWorkbenchService,
 		@IHoverService private readonly hoverService: IHoverService,
 	) {
 		super(McpServerEditor.ID, group, telemetryService, themeService, storageService);
@@ -341,6 +361,17 @@ export class McpServerEditor extends EditorPane {
 			template.navbar.push(McpServerEditorTab.Manifest, localize('manifest', "Manifest"), localize('manifesttooltip', "Server manifest details"));
 		}
 
+		this.transientDisposables.add(this.mcpWorkbenchService.onChange(e => {
+			if (e === extension) {
+				if (e.config && !template.navbar.has(McpServerEditorTab.Configuration)) {
+					template.navbar.push(McpServerEditorTab.Configuration, localize('configuration', "Configuration"), localize('configurationtooltip', "Server configuration details"), extension.readmeUrl ? 1 : 0);
+				}
+				if (!e.config && template.navbar.has(McpServerEditorTab.Configuration)) {
+					template.navbar.remove(McpServerEditorTab.Configuration);
+				}
+			}
+		}));
+
 		if ((<IMcpServerEditorOptions | undefined>this.options)?.tab) {
 			template.navbar.switch((<IMcpServerEditorOptions>this.options).tab!);
 		}

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

@@ -209,13 +209,15 @@ export class McpWorkbenchService extends Disposable implements IMcpWorkbenchServ
 	}
 
 	private onDidInstallMcpServer(local: IWorkbenchLocalMcpServer, gallery?: IGalleryMcpServer): IWorkbenchMcpServer {
-		let server = this._local.find(server => server.local?.name === local.name);
+		let server = this.installing.find(server => server.name === local.name);
+		this.installing = server ? this.installing.filter(e => e !== server) : this.installing;
 		if (server) {
 			server.local = local;
 		} else {
 			server = this.instantiationService.createInstance(McpWorkbenchServer, e => this.getInstallState(e), local, gallery, undefined);
-			this._local.push(server);
 		}
+		this._local = this._local.filter(e => e.name === local.name);
+		this._local.push(server);
 		this._onChange.fire(server);
 		return server;
 	}
@@ -334,7 +336,7 @@ export class McpWorkbenchService extends Disposable implements IMcpWorkbenchServ
 	private async doInstall(server: McpWorkbenchServer, installTask: () => Promise<IWorkbenchLocalMcpServer>): Promise<IWorkbenchMcpServer> {
 		this.installing.push(server);
 		this._onChange.fire(server);
-		await installTask().finally(() => this.installing = this.installing.filter(s => s !== server));
+		await installTask();
 		return this.waitAndGetInstalledMcpServer(server);
 	}