@codingame/monaco-vscode-mcp-service-override 28.4.0 → 29.0.0

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpElicitationService.js

@@ -8,12 +8,14 @@ import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { isDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { generateUuid } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uuid';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { ChatElicitationRequestPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatElicitationRequestPart';
+import { ChatQuestionCarouselData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatProgressTypes/chatQuestionCarouselData';
 import { ChatModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { ElicitationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService/chatService.service';
@@ -25,8 +27,8 @@ import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/obse
 
 const noneItem = {
     id: undefined,
-    label: ( localize(10218, "None")),
-    description: ( localize(10219, "No selection")),
+    label: ( localize(10455, "None")),
+    description: ( localize(10456, "No selection")),
     alwaysShow: true
 };
 function isFormElicitation(params) {
@@ -78,39 +80,58 @@ let McpElicitationService = class McpElicitationService {
             if (chatModel instanceof ChatModel) {
                 const request = chatModel.getRequests().at(-1);
                 if (request) {
-                    const part = ( new ChatElicitationRequestPart(( localize(10220, "Request for Input")), elicitation.message, ( localize(10221, "{0} (MCP Server)", server.definition.label)), ( localize(10222, "Respond")), ( localize(10223, "Cancel")), async () => {
-                        const p = this._doElicitForm(elicitation, token);
-                        resolve(p);
-                        const result = await p;
-                        part.acceptedResult = result.content;
-                        return result.action === "accept" ? ElicitationState.Accepted : ElicitationState.Rejected;
-                    }, () => {
-                        resolve({
-                            action: "decline"
+                    const {
+                        questions,
+                        idToPropertyMap
+                    } = this._convertSchemaToQuestions(elicitation);
+                    const carousel = ( new ChatQuestionCarouselData(
+                        questions,
+                         true,
+                         undefined,
+                         undefined,
+                         undefined,
+                        (  new MarkdownString(elicitation.message)),
+                         mcpServerToSourceData(server)
+                    ));
+                    chatModel.acceptResponseProgress(request, carousel);
+                    store.add(token.onCancellationRequested(() => {
+                        carousel.completion.complete({
+                            answers: undefined
                         });
-                        return Promise.resolve(ElicitationState.Rejected);
-                    }, mcpServerToSourceData(server)));
-                    chatModel.acceptResponseProgress(request, part);
+                    }));
+                    carousel.completion.p.then(result => {
+                        if (!result.answers) {
+                            resolve({
+                                action: "cancel"
+                            });
+                        } else {
+                            const content = this._convertCarouselAnswersToElicitResult(result.answers, idToPropertyMap, elicitation.requestedSchema.properties);
+                            resolve({
+                                action: "accept",
+                                content
+                            });
+                        }
+                    });
+                    return;
                 }
-            } else {
-                const handle = this._notificationService.notify({
-                    message: elicitation.message,
-                    source: ( localize(10224, "MCP Server ({0})", server.definition.label)),
-                    severity: Severity.Info,
-                    actions: {
-                        primary: [store.add(( new Action("mcp.elicit.give", ( localize(10225, "Respond")), undefined, true, () => resolve(this._doElicitForm(elicitation, token)))))],
-                        secondary: [store.add(( new Action("mcp.elicit.cancel", ( localize(10226, "Cancel")), undefined, true, () => resolve({
-                            action: "decline"
-                        }))))]
-                    }
-                });
-                store.add(handle.onDidClose(() => resolve({
-                    action: "cancel"
-                })));
-                store.add(token.onCancellationRequested(() => resolve({
-                    action: "cancel"
-                })));
             }
+            const handle = this._notificationService.notify({
+                message: elicitation.message,
+                source: ( localize(10457, "MCP Server ({0})", server.definition.label)),
+                severity: Severity.Info,
+                actions: {
+                    primary: [store.add(( new Action("mcp.elicit.give", ( localize(10458, "Respond")), undefined, true, () => resolve(this._doElicitForm(elicitation, token)))))],
+                    secondary: [store.add(( new Action("mcp.elicit.cancel", ( localize(10459, "Cancel")), undefined, true, () => resolve({
+                        action: "decline"
+                    }))))]
+                }
+            });
+            store.add(handle.onDidClose(() => resolve({
+                action: "cancel"
+            })));
+            store.add(token.onCancellationRequested(() => resolve({
+                action: "cancel"
+            })));
         })).finally(() => store.dispose());
         return {
             kind: ElicitationKind.Form,
@@ -142,7 +163,7 @@ let McpElicitationService = class McpElicitationService {
             if (chatModel instanceof ChatModel) {
                 const request = chatModel.getRequests().at(-1);
                 if (request) {
-                    const part = ( new ChatElicitationRequestPart(( localize(10227, "Authorization Required")), ( new MarkdownString()).appendText(elicitation.message).appendMarkdown("\n\n" + ( localize(10228, "Open this URL?"))).appendCodeblock("", elicitation.url), ( localize(10221, "{0} (MCP Server)", server.definition.label)), ( localize(10229, "Open {0}", ( URI.parse(elicitation.url)).authority)), ( localize(10223, "Cancel")), async () => {
+                    const part = ( new ChatElicitationRequestPart(( localize(10460, "Authorization Required")), ( new MarkdownString()).appendText(elicitation.message).appendMarkdown("\n\n" + ( localize(10461, "Open this URL?"))).appendCodeblock("", elicitation.url), ( localize(10462, "{0} (MCP Server)", server.definition.label)), ( localize(10463, "Open {0}", ( URI.parse(elicitation.url)).authority)), ( localize(10464, "Cancel")), async () => {
                         const result = await this._doElicitUrl(elicitation, token);
                         resolve(result);
                         completePromise.then(() => part.hide());
@@ -157,12 +178,12 @@ let McpElicitationService = class McpElicitationService {
                 }
             } else {
                 const handle = this._notificationService.notify({
-                    message: elicitation.message + " " + ( localize(10230, "This will open {0}", elicitation.url)),
-                    source: ( localize(10224, "MCP Server ({0})", server.definition.label)),
+                    message: elicitation.message + " " + ( localize(10465, "This will open {0}", elicitation.url)),
+                    source: ( localize(10457, "MCP Server ({0})", server.definition.label)),
                     severity: Severity.Info,
                     actions: {
-                        primary: [store.add(( new Action("mcp.elicit.url.open2", ( localize(10231, "Open URL")), undefined, true, () => resolve(this._doElicitUrl(elicitation, token)))))],
-                        secondary: [store.add(( new Action("mcp.elicit.cancel", ( localize(10226, "Cancel")), undefined, true, () => resolve({
+                        primary: [store.add(( new Action("mcp.elicit.url.open2", ( localize(10466, "Open URL")), undefined, true, () => resolve(this._doElicitUrl(elicitation, token)))))],
+                        secondary: [store.add(( new Action("mcp.elicit.cancel", ( localize(10459, "Cancel")), undefined, true, () => resolve({
                             action: "decline"
                         }))))]
                     }
@@ -304,7 +325,7 @@ let McpElicitationService = class McpElicitationService {
     _getFieldPlaceholder(schema, required) {
         let placeholder = schema.description || "";
         if (!required) {
-            placeholder = placeholder ? `${placeholder} (${( localize(10232, "Optional"))})` : ( localize(10232, "Optional"));
+            placeholder = placeholder ? `${placeholder} (${( localize(10467, "Optional"))})` : ( localize(10467, "Optional"));
         }
         return placeholder;
     }
@@ -413,7 +434,7 @@ let McpElicitationService = class McpElicitationService {
                     items.push({
                         id: "$default",
                         label: `${schema.default}`,
-                        description: ( localize(10233, "Default value"))
+                        description: ( localize(10468, "Default value"))
                     });
                 }
             }
@@ -482,13 +503,13 @@ let McpElicitationService = class McpElicitationService {
         if (schema.minLength && value.length < schema.minLength) {
             return {
                 isValid: false,
-                message: ( localize(10234, "Minimum length is {0}", schema.minLength))
+                message: ( localize(10469, "Minimum length is {0}", schema.minLength))
             };
         }
         if (schema.maxLength && value.length > schema.maxLength) {
             return {
                 isValid: false,
-                message: ( localize(10235, "Maximum length is {0}", schema.maxLength))
+                message: ( localize(10470, "Maximum length is {0}", schema.maxLength))
             };
         }
         if (schema.format) {
@@ -509,7 +530,7 @@ let McpElicitationService = class McpElicitationService {
                 isValid: true
             } : {
                 isValid: false,
-                message: ( localize(10236, "Please enter a valid email address"))
+                message: ( localize(10471, "Please enter a valid email address"))
             };
         case "uri":
             if (URL.canParse(value)) {
@@ -519,7 +540,7 @@ let McpElicitationService = class McpElicitationService {
             } else {
                 return {
                     isValid: false,
-                    message: ( localize(10237, "Please enter a valid URI"))
+                    message: ( localize(10472, "Please enter a valid URI"))
                 };
             }
         case "date":
@@ -528,7 +549,7 @@ let McpElicitationService = class McpElicitationService {
                 if (!dateRegex.test(value)) {
                     return {
                         isValid: false,
-                        message: ( localize(10238, "Please enter a valid date (YYYY-MM-DD)"))
+                        message: ( localize(10473, "Please enter a valid date (YYYY-MM-DD)"))
                     };
                 }
                 const date = ( new Date(value));
@@ -536,7 +557,7 @@ let McpElicitationService = class McpElicitationService {
                     isValid: true
                 } : {
                     isValid: false,
-                    message: ( localize(10238, "Please enter a valid date (YYYY-MM-DD)"))
+                    message: ( localize(10473, "Please enter a valid date (YYYY-MM-DD)"))
                 };
             }
         case "date-time":
@@ -546,7 +567,7 @@ let McpElicitationService = class McpElicitationService {
                     isValid: true
                 } : {
                     isValid: false,
-                    message: ( localize(10239, "Please enter a valid date-time"))
+                    message: ( localize(10474, "Please enter a valid date-time"))
                 };
             }
         default:
@@ -560,25 +581,25 @@ let McpElicitationService = class McpElicitationService {
         if (isNaN(parsed)) {
             return {
                 isValid: false,
-                message: ( localize(10240, "Please enter a valid number"))
+                message: ( localize(10475, "Please enter a valid number"))
             };
         }
         if (schema.type === "integer" && !Number.isInteger(parsed)) {
             return {
                 isValid: false,
-                message: ( localize(10241, "Please enter a valid integer"))
+                message: ( localize(10476, "Please enter a valid integer"))
             };
         }
         if (schema.minimum !== undefined && parsed < schema.minimum) {
             return {
                 isValid: false,
-                message: ( localize(10242, "Minimum value is {0}", schema.minimum))
+                message: ( localize(10477, "Minimum value is {0}", schema.minimum))
             };
         }
         if (schema.maximum !== undefined && parsed > schema.maximum) {
             return {
                 isValid: false,
-                message: ( localize(10243, "Maximum value is {0}", schema.maximum))
+                message: ( localize(10478, "Maximum value is {0}", schema.maximum))
             };
         }
         return {
@@ -586,6 +607,202 @@ let McpElicitationService = class McpElicitationService {
             parsedValue: parsed
         };
     }
+    _convertSchemaToQuestions(elicitation) {
+        const properties = Object.entries(elicitation.requestedSchema.properties);
+        const requiredFields = ( new Set(elicitation.requestedSchema.required || []));
+        const questions = [];
+        const idToPropertyMap = ( new Map());
+        for (const [propertyName, schema] of properties) {
+            const id = generateUuid();
+            idToPropertyMap.set(id, propertyName);
+            const title = schema.title || propertyName;
+            const description = schema.description;
+            const isRequired = ( requiredFields.has(propertyName));
+            if (schema.type === "boolean") {
+                questions.push({
+                    id,
+                    type: "singleSelect",
+                    title,
+                    description,
+                    required: isRequired,
+                    allowFreeformInput: false,
+                    options: [{
+                        id: "true",
+                        label: ( localize(10479, "True")),
+                        value: "true"
+                    }, {
+                        id: "false",
+                        label: ( localize(10480, "False")),
+                        value: "false"
+                    }],
+                    defaultValue: schema.default !== undefined ? String(schema.default) : undefined
+                });
+            } else if (isLegacyTitledEnumSchema(schema)) {
+                questions.push({
+                    id,
+                    type: "singleSelect",
+                    title,
+                    description,
+                    required: isRequired,
+                    allowFreeformInput: false,
+                    options: ( schema.enum.map((v, i) => ({
+                        id: v,
+                        label: schema.enumNames[i] ? `${v} - ${schema.enumNames[i]}` : v,
+                        value: v
+                    }))),
+                    defaultValue: schema.default
+                });
+            } else if (isTitledSingleEnumSchema(schema)) {
+                questions.push({
+                    id,
+                    type: "singleSelect",
+                    title,
+                    description,
+                    required: isRequired,
+                    allowFreeformInput: false,
+                    options: ( schema.oneOf.map((
+                        {
+                            const: value,
+                            title: optTitle
+                        }
+                    ) => ({
+                        id: value,
+                        label: optTitle ? `${value} - ${optTitle}` : value,
+                        value
+                    }))),
+                    defaultValue: schema.default
+                });
+            } else if (isUntitledEnumSchema(schema)) {
+                questions.push({
+                    id,
+                    type: "singleSelect",
+                    title,
+                    description,
+                    required: isRequired,
+                    allowFreeformInput: false,
+                    options: ( schema.enum.map(v => ({
+                        id: v,
+                        label: v,
+                        value: v
+                    }))),
+                    defaultValue: schema.default
+                });
+            } else if (isTitledMultiEnumSchema(schema)) {
+                questions.push({
+                    id,
+                    type: "multiSelect",
+                    title,
+                    description,
+                    required: isRequired,
+                    allowFreeformInput: false,
+                    options: ( schema.items.anyOf.map((
+                        {
+                            const: value,
+                            title: optTitle
+                        }
+                    ) => ({
+                        id: value,
+                        label: optTitle ? `${value} - ${optTitle}` : value,
+                        value
+                    }))),
+                    defaultValue: schema.default
+                });
+            } else if (isUntitledMultiEnumSchema(schema)) {
+                questions.push({
+                    id,
+                    type: "multiSelect",
+                    title,
+                    description,
+                    required: isRequired,
+                    allowFreeformInput: false,
+                    options: ( schema.items.enum.map(v => ({
+                        id: v,
+                        label: v,
+                        value: v
+                    }))),
+                    defaultValue: schema.default
+                });
+            } else {
+                const validation = {};
+                if (schema.type === "string") {
+                    if (schema.minLength !== undefined) {
+                        validation.minLength = schema.minLength;
+                    }
+                    if (schema.maxLength !== undefined) {
+                        validation.maxLength = schema.maxLength;
+                    }
+                    if (schema.format) {
+                        validation.format = schema.format;
+                    }
+                } else if (schema.type === "number" || schema.type === "integer") {
+                    if (schema.minimum !== undefined) {
+                        validation.minimum = schema.minimum;
+                    }
+                    if (schema.maximum !== undefined) {
+                        validation.maximum = schema.maximum;
+                    }
+                    if (schema.type === "integer") {
+                        validation.isInteger = true;
+                    }
+                }
+                questions.push({
+                    id,
+                    type: "text",
+                    title,
+                    description,
+                    required: isRequired,
+                    defaultValue: schema.default !== undefined ? String(schema.default) : undefined,
+                    validation: ( Object.keys(validation)).length > 0 ? validation : undefined
+                });
+            }
+        }
+        return {
+            questions,
+            idToPropertyMap
+        };
+    }
+    _convertCarouselAnswersToElicitResult(answers, idToPropertyMap, schemaProperties) {
+        const content = {};
+        for (const [questionId, answer] of Object.entries(answers)) {
+            const propertyName = idToPropertyMap.get(questionId);
+            if (!propertyName) {
+                continue;
+            }
+            const schema = schemaProperties[propertyName];
+            if (!schema) {
+                continue;
+            }
+            let rawValue = answer;
+            if (typeof answer === "object" && answer !== null) {
+                const obj = answer;
+                if ("selectedValue" in obj) {
+                    rawValue = obj.selectedValue;
+                } else if ("selectedValues" in obj) {
+                    rawValue = obj.selectedValues;
+                } else if ("freeformValue" in obj && obj.freeformValue) {
+                    rawValue = obj.freeformValue;
+                }
+            }
+            if (rawValue === undefined || rawValue === null) {
+                continue;
+            }
+            if (schema.type === "boolean") {
+                content[propertyName] = rawValue === "true" || rawValue === true;
+            } else if (schema.type === "number" || schema.type === "integer") {
+                const num = Number(rawValue);
+                if (!isNaN(num)) {
+                    content[propertyName] = num;
+                }
+            } else if (schema.type === "array") {
+                if (Array.isArray(rawValue)) {
+                    content[propertyName] = ( rawValue.map(v => String(v)));
+                }
+            } else {
+                content[propertyName] = String(rawValue);
+            }
+        }
+        return content;
+    }
 };
 McpElicitationService = ( __decorate([( __param(0, INotificationService)), ( __param(1, IQuickInputService)), ( __param(2, IChatService)), ( __param(3, IOpenerService))], McpElicitationService));
 

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpGatewayService.js

@@ -1,5 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ProxyChannel } from '@codingame/monaco-vscode-api/vscode/vs/base/parts/ipc/common/ipc';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -32,10 +33,17 @@ let BrowserMcpGatewayService = class BrowserMcpGatewayService {
         return connection.withChannel(McpGatewayChannelName, async channel => {
             const service = ProxyChannel.toService(channel);
             const info = await service.createGateway(undefined);
-            const address = URI.revive(info.address);
-            this._logService.info(`[McpGateway][BrowserWorkbench] Remote gateway created: ${address}`);
+            const servers = reviveServers(info.servers);
+            this._logService.info(
+                `[McpGateway][BrowserWorkbench] Remote gateway created with ${servers.length} server(s)`
+            );
+            const onDidChangeServers = ( Event.map(Event.filter(
+                channel.listen("onDidChangeGatewayServers"),
+                e => e.gatewayId === info.gatewayId
+            ), e => reviveServers(e.servers)));
             return {
-                address,
+                servers,
+                onDidChangeServers,
                 dispose: () => {
                     this._logService.info(
                         `[McpGateway][BrowserWorkbench] Disposing remote gateway: ${info.gatewayId}`
@@ -47,5 +55,11 @@ let BrowserMcpGatewayService = class BrowserMcpGatewayService {
     }
 };
 BrowserMcpGatewayService = ( __decorate([( __param(0, IRemoteAgentService)), ( __param(1, ILogService))], BrowserMcpGatewayService));
+function reviveServers(servers) {
+    return ( servers.map(s => ({
+        label: s.label,
+        address: URI.revive(s.address)
+    })));
+}
 
 export { BrowserMcpGatewayService };

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpLanguageFeatures.js

@@ -115,7 +115,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     diagnostics.push({
                         severity: MarkerSeverity.Warning,
                         message: ( localize(
-                            10244,
+                            10481,
                             "Variable `{0}` not found, did you mean ${{1}}?",
                             name,
                             getClosestMatchingVariable(name) + (arg ? `:${arg}` : "")
@@ -181,14 +181,14 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ShowOutput,
-                        title: "$(error) " + ( localize(10245, "Error")),
+                        title: "$(error) " + ( localize(10482, "Error")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.RestartServer,
-                        title: ( localize(10246, "Restart")),
+                        title: ( localize(10483, "Restart")),
                         arguments: [server.definition.id, {
                             autoTrustChanges: true
                         }]
@@ -199,7 +199,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.RestartServer,
-                            title: ( localize(10247, "Debug")),
+                            title: ( localize(10484, "Debug")),
                             arguments: [server.definition.id, {
                                 debug: true,
                                 autoTrustChanges: true
@@ -213,14 +213,14 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ShowOutput,
-                        title: "$(loading~spin) " + ( localize(10248, "Starting")),
+                        title: "$(loading~spin) " + ( localize(10485, "Starting")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.StopServer,
-                        title: ( localize(10249, "Cancel")),
+                        title: ( localize(10486, "Cancel")),
                         arguments: [server.definition.id]
                     }
                 });
@@ -230,21 +230,21 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ShowOutput,
-                        title: "$(check) " + ( localize(10250, "Running")),
+                        title: "$(check) " + ( localize(10487, "Running")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.StopServer,
-                        title: ( localize(10251, "Stop")),
+                        title: ( localize(10488, "Stop")),
                         arguments: [server.definition.id]
                     }
                 }, {
                     range,
                     command: {
                         id: McpCommandIds.RestartServer,
-                        title: ( localize(10246, "Restart")),
+                        title: ( localize(10483, "Restart")),
                         arguments: [server.definition.id, {
                             autoTrustChanges: true
                         }]
@@ -255,7 +255,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.RestartServer,
-                            title: ( localize(10247, "Debug")),
+                            title: ( localize(10484, "Debug")),
                             arguments: [server.definition.id, {
                                 autoTrustChanges: true,
                                 debug: true
@@ -269,7 +269,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.StartServer,
-                        title: "$(debug-start) " + ( localize(10252, "Start")),
+                        title: "$(debug-start) " + ( localize(10489, "Start")),
                         arguments: [server.definition.id, {
                             autoTrustChanges: true
                         }]
@@ -280,7 +280,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.StartServer,
-                            title: ( localize(10247, "Debug")),
+                            title: ( localize(10484, "Debug")),
                             arguments: [server.definition.id, {
                                 autoTrustChanges: true,
                                 debug: true
@@ -296,7 +296,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: "",
-                            title: ( localize(10253, "{0} tools", toolCount))
+                            title: ( localize(10490, "{0} tools", toolCount))
                         }
                     });
                 }
@@ -306,7 +306,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.StartPromptForServer,
-                            title: ( localize(10254, "{0} prompts", promptCount)),
+                            title: ( localize(10491, "{0} prompts", promptCount)),
                             arguments: [server]
                         }
                     });
@@ -315,7 +315,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ServerOptions,
-                        title: ( localize(10255, "More...")),
+                        title: ( localize(10492, "More...")),
                         arguments: [server.definition.id]
                     }
                 });
@@ -390,16 +390,19 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         function pushAnnotation(savedId, offset, saved) {
             const tooltip = ( new MarkdownString([createMarkdownCommandLink({
                 id: McpCommandIds.EditStoredInput,
-                title: ( localize(10256, "Edit")),
-                arguments: [savedId, model.uri, mcpConfigurationSection, inConfig.target]
+                text: ( localize(10493, "Edit")),
+                arguments: [savedId, model.uri, mcpConfigurationSection, inConfig.target],
+                tooltip: ( localize(10494, "Edit saved value"))
             }), createMarkdownCommandLink({
                 id: McpCommandIds.RemoveStoredInput,
-                title: ( localize(10257, "Clear")),
-                arguments: [inConfig.scope, savedId]
+                text: ( localize(10495, "Clear")),
+                arguments: [inConfig.scope, savedId],
+                tooltip: ( localize(10496, "Clear saved value"))
             }), createMarkdownCommandLink({
                 id: McpCommandIds.RemoveStoredInput,
-                title: ( localize(10258, "Clear All")),
-                arguments: [inConfig.scope]
+                text: ( localize(10497, "Clear All")),
+                arguments: [inConfig.scope],
+                tooltip: ( localize(10498, "Clear all saved values"))
             })].join(" | "), {
                 isTrusted: true
             }));

package/vscode/src/vs/workbench/contrib/mcp/browser/mcpMigration.js

@@ -98,16 +98,16 @@ let McpConfigMigrationContribution = class McpConfigMigrationContribution extend
     }
     showMcpConfigErrorNotification(isRemote) {
         const message = isRemote ? ( localize(
-            10259,
+            10499,
             "MCP servers should no longer be configured in remote user settings. Use the dedicated MCP configuration instead."
         )) : ( localize(
-            10260,
+            10500,
             "MCP servers should no longer be configured in user settings. Use the dedicated MCP configuration instead."
         ));
-        const openConfigLabel = isRemote ? ( localize(10261, "Open Remote User MCP Configuration")) : ( localize(10262, "Open User MCP Configuration"));
+        const openConfigLabel = isRemote ? ( localize(10501, "Open Remote User MCP Configuration")) : ( localize(10502, "Open User MCP Configuration"));
         const commandId = isRemote ? McpCommandIds.OpenRemoteUserMcp : McpCommandIds.OpenUserMcp;
         this.notificationService.prompt(Severity.Error, message, [{
-            label: ( localize(10263, "Update Now")),
+            label: ( localize(10503, "Update Now")),
             run: async () => {
                 await this.migrateMcpConfig();
                 await this.commandService.executeCommand(commandId);