louis_lifu
/
vscode
mirror of https://github.com/microsoft/vscode.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mcp: open to-trust config in aux window instead of main window (#245173) 

* mcp: open to-trust config in aux window instead of main window

Fixes #245162

* pr comment
This commit is contained in:
Connor Peet 2025-04-01 10:03:55 -07:00 committed by GitHub
parent 12bf15cc4d
commit f90087deb4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/vs/platform/dialogs/common/dialogs.ts
View File

@ -283,7 +283,8 @@ export interface ICustomDialogOptions {
export interface ICustomDialogMarkdown {
readonly markdown: IMarkdownString;
readonly classes?: string[];
readonly dismissOnLinkClick?: boolean;
/** Custom link handler for markdown content, see {@link IContentActionHandler}. Defaults to {@link openLinkFromMarkdown}. */
actionHandler?(link: string): Promise<boolean>;
}
/**

7
src/vs/workbench/browser/parts/dialogs/dialogHandler.ts
View File

@ -114,12 +114,9 @@ export class BrowserDialogHandler extends AbstractDialogHandler {
customOptions.markdownDetails?.forEach(markdownDetail => {
const result = this.markdownRenderer.render(markdownDetail.markdown, {
actionHandler: {
callback: link => {
if (markdownDetail.dismissOnLinkClick) {
dialog.dispose();
}
callback: markdownDetail.actionHandler || (link => {
return openLinkFromMarkdown(this.openerService, link, markdownDetail.markdown.isTrusted, true /* skip URL validation to prevent another dialog from showing which is unsupported */);
},
}),
disposables: dialogDisposables
}
});

7
src/vs/workbench/contrib/mcp/common/mcpRegistry.ts
View File

@ -22,7 +22,7 @@ import { IStorageService, StorageScope, StorageTarget } from '../../../../platfo
import { IWorkspaceFolderData } from '../../../../platform/workspace/common/workspace.js';
import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
import { ConfigurationResolverExpression, IResolvedValue } from '../../../services/configurationResolver/common/configurationResolverExpression.js';
import { IEditorService } from '../../../services/editor/common/editorService.js';
import { AUX_WINDOW_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
import { mcpEnabledSection } from './mcpConfiguration.js';
import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
import { IMcpHostDelegate, IMcpRegistry, IMcpResolveConnectionOptions } from './mcpRegistryTypes.js';
@ -262,7 +262,10 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
custom: {
markdownDetails: [{
markdown: new MarkdownString(localize('mcp.trust.details', '{0} discovered Model Context Protocol servers from {1} (`{2}`). {0} can use their capabilities in Chat.\n\nDo you want to allow running MCP servers from {3}?', this._productService.nameShort, collection.label, collection.serverDefinitions.get().map(s => s.label).join('`, `'), labelWithOrigin)),
dismissOnLinkClick: true,
actionHandler: () => {
const editor = this._editorService.openEditor({ resource: collection.presentation!.origin! }, AUX_WINDOW_GROUP);
return editor.then(Boolean);
},
}]
},
buttons: [