Skip to content

mcp: adopt tool annotations for display names and confirmation avoidance #246755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connor4312 merged 1 commit into from
Apr 16, 2025
Merged

mcp: adopt tool annotations for display names and confirmation avoidance #246755

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/vs/workbench/contrib/mcp/common/mcpService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ export class McpService extends Disposable implements IMcpService {
id: tool.id,
source: { type: 'mcp', label: server.definition.label, collectionId: server.collection.id, definitionId: server.definition.id },
icon: Codicon.tools,
displayName: tool.definition.name,
displayName: tool.definition.annotations?.title || tool.definition.name,
toolReferenceName: tool.definition.name,
modelDescription: tool.definition.description ?? '',
userDescription: tool.definition.description ?? '',
Expand Down Expand Up @@ -228,14 +228,17 @@ class McpToolImplementation implements IToolImpl {
this._productService.nameShort
);

const needsConfirmation = !tool.definition.annotations?.readOnlyHint;
const title = tool.definition.annotations?.title || ('`' + tool.definition.name + '`');

return {
confirmationMessages: {
title: localize('msg.title', "Run `{0}`", tool.definition.name, server.definition.label),
confirmationMessages: needsConfirmation ? {
title: localize('msg.title', "Run {0}", title),
message: new MarkdownString(localize('msg.msg', "{0}\n\n {1}", tool.definition.description, mcpToolWarning), { supportThemeIcons: true }),
allowAutoConfirm: true,
},
invocationMessage: new MarkdownString(localize('msg.run', "Running `{0}`", tool.definition.name, server.definition.label)),
pastTenseMessage: new MarkdownString(localize('msg.ran', "Ran `{0}` ", tool.definition.name, server.definition.label)),
} : undefined,
invocationMessage: new MarkdownString(localize('msg.run', "Running {0}", title)),
pastTenseMessage: new MarkdownString(localize('msg.ran', "Ran {0} ", title)),
toolSpecificData: {
kind: 'input',
rawInput: parameters
Expand Down
Loading