mcp: polishes to user experience (microsoft#253062)

- Fix new configs not being typed correctly
- Add an 'update' option to the notification
- Fix opening settings throwing an error if the mcp.json doesn't yet exist

Author: connor4312

src/vs/platform/mcp/common/mcpResourceScannerService.ts

@@ -204,7 +204,7 @@ export class McpResourceScannerService extends Disposable implements IMcpResourc
 
 	private sanitizeServer(serverOrConfig: IOldScannedMcpServer | Mutable<IMcpServerConfiguration>): IMcpServerConfiguration {
 		let server: IMcpServerConfiguration;
-		if (!(<IOldScannedMcpServer>serverOrConfig).config) {
+		if ((<IOldScannedMcpServer>serverOrConfig).config) {
 			const oldScannedMcpServer = <IOldScannedMcpServer>serverOrConfig;
 			server = {
 				...oldScannedMcpServer.config,

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

@@ -50,6 +50,8 @@ import { IUserDataProfileService } from '../../../services/userDataProfile/commo
 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';
+import { IFileService } from '../../../../platform/files/common/files.js';
+import { VSBuffer } from '../../../../base/common/buffer.js';
 
 // acroynms do not get localized
 const category: ILocalizedString = {
@@ -712,40 +714,52 @@ export class ShowInstalledMcpServersCommand extends Action2 {
 	}
 }
 
-export class OpenUserMcpResourceCommand extends Action2 {
+abstract class OpenMcpResourceCommand extends Action2 {
+	protected abstract getURI(accessor: ServicesAccessor): Promise<URI>;
+
+	async run(accessor: ServicesAccessor) {
+		const fileService = accessor.get(IFileService);
+		const editorService = accessor.get(IEditorService);
+		const resource = await this.getURI(accessor);
+		if (!(await fileService.exists(resource))) {
+			await fileService.createFile(resource, VSBuffer.fromString(JSON.stringify({ servers: {} }, null, '\t')));
+		}
+		await editorService.openEditor({ resource });
+	}
+}
+
+export class OpenUserMcpResourceCommand extends OpenMcpResourceCommand {
 	constructor() {
 		super({
 			id: McpCommandIds.OpenUserMcp,
-			title: localize2('mcp.command.openUserMcp', "Open User MCP Configuration"),
+			title: localize2('mcp.command.openUserMcp', "Open User Configuration"),
 			category,
 			f1: true
 		});
 	}
 
-	async run(accessor: ServicesAccessor) {
+	protected override getURI(accessor: ServicesAccessor): Promise<URI> {
 		const userDataProfileService = accessor.get(IUserDataProfileService);
-		const editorService = accessor.get(IEditorService);
-		await editorService.openEditor({ resource: userDataProfileService.currentProfile.mcpResource });
+		return Promise.resolve(userDataProfileService.currentProfile.mcpResource);
 	}
 }
 
-export class OpenRemoteUserMcpResourceCommand extends Action2 {
+export class OpenRemoteUserMcpResourceCommand extends OpenMcpResourceCommand {
 	constructor() {
 		super({
 			id: McpCommandIds.OpenRemoteUserMcp,
-			title: localize2('mcp.command.openRemoteUserMcp', "Open Remote User MCP Configuration"),
+			title: localize2('mcp.command.openRemoteUserMcp', "Open Remote User Configuration"),
 			category,
 			f1: true,
 			precondition: RemoteNameContext.notEqualsTo('')
 		});
 	}
 
-	async run(accessor: ServicesAccessor) {
+	protected override async getURI(accessor: ServicesAccessor): Promise<URI> {
 		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 });
+		return remoteProfile.mcpResource;
 	}
 }
 

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

@@ -96,8 +96,8 @@ export class McpConfigMigrationContribution extends Disposable implements IWorkb
 
 	private showMcpConfigErrorNotification(isRemote: boolean): void {
 		const message = isRemote
-			? localize('mcp.migration.remoteConfigFound', 'MCP servers should not be configured in remote user settings. Use the dedicated MCP configuration instead.')
-			: localize('mcp.migration.userConfigFound', 'MCP servers should not be configured in user settings. Use the dedicated MCP configuration instead.');
+			? localize('mcp.migration.remoteConfigFound', 'MCP servers should no longer be configured in remote user settings. Use the dedicated MCP configuration instead.')
+			: localize('mcp.migration.userConfigFound', 'MCP servers should no longer be configured in user settings. Use the dedicated MCP configuration instead.');
 
 		const openConfigLabel = isRemote
 			? localize('mcp.migration.openRemoteConfig', 'Open Remote User MCP Configuration')
@@ -109,7 +109,14 @@ export class McpConfigMigrationContribution extends Disposable implements IWorkb
 			Severity.Error,
 			message,
 			[{
+				label: localize('mcp.migration.update', 'Update Now'),
+				run: async () => {
+					await this.migrateMcpConfig();
+					await this.commandService.executeCommand(commandId);
+				},
+			}, {
 				label: openConfigLabel,
+				keepOpen: true,
 				run: () => this.commandService.executeCommand(commandId)
 			}]
 		);