fix microsoft#252906 (microsoft#252967)

Author: sandy081

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

@@ -30,7 +30,7 @@ import { McpSamplingService } from '../common/mcpSamplingService.js';
 import { McpService } from '../common/mcpService.js';
 import { IMcpElicitationService, IMcpSamplingService, IMcpService, IMcpWorkbenchService } from '../common/mcpTypes.js';
 import { McpAddContextContribution } from './mcpAddContextContribution.js';
-import { AddConfigurationAction, EditStoredInput, ListMcpServerCommand, McpBrowseCommand, McpBrowseResourcesCommand, McpConfigureSamplingModels, MCPServerActionRendering, McpServerOptionsCommand, McpStartPromptingServerCommand, RemoveStoredInput, ResetMcpCachedTools, ResetMcpTrustCommand, RestartServer, ShowConfiguration, ShowInstalledMcpServersCommand, ShowOutput, StartServer, StopServer } from './mcpCommands.js';
+import { AddConfigurationAction, EditStoredInput, ListMcpServerCommand, McpBrowseCommand, McpBrowseResourcesCommand, McpConfigureSamplingModels, MCPServerActionRendering, McpServerOptionsCommand, McpStartPromptingServerCommand, OpenRemoteUserMcpResourceCommand, OpenUserMcpResourceCommand, OpenWorkspaceFolderMcpResourceCommand, OpenWorkspaceMcpResourceCommand, RemoveStoredInput, ResetMcpCachedTools, ResetMcpTrustCommand, RestartServer, ShowConfiguration, ShowInstalledMcpServersCommand, ShowOutput, StartServer, StopServer } from './mcpCommands.js';
 import { McpDiscovery } from './mcpDiscovery.js';
 import { McpElicitationService } from './mcpElicitationService.js';
 import { McpLanguageFeatures } from './mcpLanguageFeatures.js';
@@ -71,6 +71,10 @@ registerAction2(ShowOutput);
 registerAction2(RestartServer);
 registerAction2(ShowConfiguration);
 registerAction2(McpBrowseCommand);
+registerAction2(OpenUserMcpResourceCommand);
+registerAction2(OpenRemoteUserMcpResourceCommand);
+registerAction2(OpenWorkspaceMcpResourceCommand);
+registerAction2(OpenWorkspaceFolderMcpResourceCommand);
 registerAction2(ShowInstalledMcpServersCommand);
 registerAction2(McpBrowseResourcesCommand);
 registerAction2(McpConfigureSamplingModels);

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

@@ -26,8 +26,8 @@ import { IInstantiationService, ServicesAccessor } from '../../../../platform/in
 import { IQuickInputService, IQuickPickItem, IQuickPickSeparator } from '../../../../platform/quickinput/common/quickInput.js';
 import { StorageScope } from '../../../../platform/storage/common/storage.js';
 import { spinningLoading } from '../../../../platform/theme/common/iconRegistry.js';
-import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.js';
-import { ActiveEditorContext, ResourceContextKey } from '../../../common/contextkeys.js';
+import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../platform/workspace/common/workspace.js';
+import { ActiveEditorContext, RemoteNameContext, ResourceContextKey, WorkbenchStateContext, WorkspaceFolderCountContext } from '../../../common/contextkeys.js';
 import { IWorkbenchContribution } from '../../../common/contributions.js';
 import { IAccountQuery, IAuthenticationQueryService } from '../../../services/authentication/common/authenticationQuery.js';
 import { IAuthenticationService } from '../../../services/authentication/common/authentication.js';
@@ -46,6 +46,10 @@ import { HasInstalledMcpServersContext, IMcpSamplingService, IMcpServer, IMcpSer
 import { McpAddConfigurationCommand } from './mcpCommandsAddConfiguration.js';
 import { McpResourceQuickAccess, McpResourceQuickPick } from './mcpResourceQuickAccess.js';
 import { openPanelChatAndGetWidget } from './openPanelChatAndGetWidget.js';
+import { IUserDataProfileService } from '../../../services/userDataProfile/common/userDataProfile.js';
+import { IRemoteUserDataProfilesService } from '../../../services/userDataProfile/common/remoteUserDataProfiles.js';
+import { PICK_WORKSPACE_FOLDER_COMMAND_ID } from '../../../browser/actions/workspaceCommands.js';
+import { MCP_CONFIGURATION_KEY, WORKSPACE_STANDALONE_CONFIGURATIONS } from '../../../services/configuration/common/configuration.js';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -708,6 +712,87 @@ export class ShowInstalledMcpServersCommand extends Action2 {
 	}
 }
 
+export class OpenUserMcpResourceCommand extends Action2 {
+	constructor() {
+		super({
+			id: McpCommandIds.OpenUserMcp,
+			title: localize2('mcp.command.openUserMcp', "Open User MCP Servers"),
+			category,
+			f1: true
+		});
+	}
+
+	async run(accessor: ServicesAccessor) {
+		const userDataProfileService = accessor.get(IUserDataProfileService);
+		const editorService = accessor.get(IEditorService);
+		await editorService.openEditor({ resource: userDataProfileService.currentProfile.mcpResource });
+	}
+}
+
+export class OpenRemoteUserMcpResourceCommand extends Action2 {
+	constructor() {
+		super({
+			id: McpCommandIds.OpenRemoteUserMcp,
+			title: localize2('mcp.command.openRemoteUserMcp', "Open Remote User MCP Servers"),
+			category,
+			f1: true,
+			precondition: RemoteNameContext.notEqualsTo('')
+		});
+	}
+
+	async run(accessor: ServicesAccessor) {
+		const userDataProfileService = accessor.get(IUserDataProfileService);
+		const remoteUserDataProfileService = accessor.get(IRemoteUserDataProfilesService);
+		const editorService = accessor.get(IEditorService);
+		const remoteProfile = await remoteUserDataProfileService.getRemoteProfile(userDataProfileService.currentProfile);
+		await editorService.openEditor({ resource: remoteProfile.mcpResource });
+	}
+}
+
+export class OpenWorkspaceFolderMcpResourceCommand extends Action2 {
+	constructor() {
+		super({
+			id: McpCommandIds.OpenWorkspaceFolderMcp,
+			title: localize2('mcp.command.openWorkspaceFolderMcp', "Open Workspace Folder MCP Servers"),
+			category,
+			f1: true,
+			precondition: WorkspaceFolderCountContext.notEqualsTo(0)
+		});
+	}
+
+	async run(accessor: ServicesAccessor) {
+		const workspaceContextService = accessor.get(IWorkspaceContextService);
+		const commandService = accessor.get(ICommandService);
+		const editorService = accessor.get(IEditorService);
+		const workspaceFolders = workspaceContextService.getWorkspace().folders;
+		const workspaceFolder = workspaceFolders.length === 1 ? workspaceFolders[0] : await commandService.executeCommand<IWorkspaceFolder>(PICK_WORKSPACE_FOLDER_COMMAND_ID);
+		if (workspaceFolder) {
+			await editorService.openEditor({ resource: workspaceFolder.toResource(WORKSPACE_STANDALONE_CONFIGURATIONS[MCP_CONFIGURATION_KEY]) });
+		}
+	}
+}
+
+export class OpenWorkspaceMcpResourceCommand extends Action2 {
+	constructor() {
+		super({
+			id: McpCommandIds.OpenWorkspaceMcp,
+			title: localize2('mcp.command.openWorkspaceMcp', "Open Workspace MCP Servers"),
+			category,
+			f1: true,
+			precondition: WorkbenchStateContext.isEqualTo('workspace')
+		});
+	}
+
+	async run(accessor: ServicesAccessor) {
+		const workspaceContextService = accessor.get(IWorkspaceContextService);
+		const editorService = accessor.get(IEditorService);
+		const workspaceConfiguration = workspaceContextService.getWorkspace().configuration;
+		if (workspaceConfiguration) {
+			await editorService.openEditor({ resource: workspaceConfiguration });
+		}
+	}
+}
+
 export class McpBrowseResourcesCommand extends Action2 {
 	constructor() {
 		super({

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

@@ -10,6 +10,10 @@ export const enum McpCommandIds {
 	AddConfiguration = 'workbench.mcp.addConfiguration',
 	Browse = 'workbench.mcp.browseServers',
 	ShowInstalled = 'workbench.mcp.showInstalledServers',
+	OpenUserMcp = 'workbench.mcp.openUserMcpJson',
+	OpenRemoteUserMcp = 'workbench.mcp.openRemoteUserMcpJson',
+	OpenWorkspaceFolderMcp = 'workbench.mcp.openWorkspaceFolderMcpJson',
+	OpenWorkspaceMcp = 'workbench.mcp.openWorkspaceMcpJson',
 	BrowseResources = 'workbench.mcp.browseResources',
 	ConfigureSamplingModels = 'workbench.mcp.configureSamplingModels',
 	EditStoredInput = 'workbench.mcp.editStoredInput',