@codingame/monaco-vscode-mcp-service-override 23.2.2 → 24.1.0

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

@@ -2,42 +2,89 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { assertNever } from '@codingame/monaco-vscode-api/vscode/vs/base/common/assert';
+import { CancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
+import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+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 { 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-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/chat/browser/chatElicitationRequestPart';
-import { ChatModel } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ChatElicitationRequestPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chatElicitationRequestPart';
+import { ChatModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { ElicitationState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { LocalChatSessionUri } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatUri';
-import { mcpServerToSourceData } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
+import { MpcResponseError, ElicitationKind, McpConnectionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { mcpServerToSourceData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
+import { MCP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/modelContextProtocol';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
+import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
-const noneItem = { id: undefined, label: ( localize(8677, 'None')), description: ( localize(8678, 'No selection')), alwaysShow: true };
+const noneItem = { id: undefined, label: ( localize(8803, 'None')), description: ( localize(8804, 'No selection')), alwaysShow: true };
+function isFormElicitation(params) {
+    return params.mode === 'form' || (params.mode === undefined && !!params.requestedSchema);
+}
+function isUrlElicitation(params) {
+    return params.mode === 'url';
+}
+function isLegacyTitledEnumSchema(schema) {
+    const cast = schema;
+    return cast.type === 'string' && Array.isArray(cast.enum) && Array.isArray(cast.enumNames);
+}
+function isUntitledEnumSchema(schema) {
+    const cast = schema;
+    return cast.type === 'string' && Array.isArray(cast.enum);
+}
+function isTitledSingleEnumSchema(schema) {
+    const cast = schema;
+    return cast.type === 'string' && Array.isArray(cast.oneOf);
+}
+function isUntitledMultiEnumSchema(schema) {
+    const cast = schema;
+    return cast.type === 'array' && !!cast.items?.enum;
+}
+function isTitledMultiEnumSchema(schema) {
+    const cast = schema;
+    return cast.type === 'array' && !!cast.items?.anyOf;
+}
 let McpElicitationService = class McpElicitationService {
-    constructor(_notificationService, _quickInputService, _chatService) {
+    constructor(_notificationService, _quickInputService, _chatService, _openerService) {
         this._notificationService = _notificationService;
         this._quickInputService = _quickInputService;
         this._chatService = _chatService;
+        this._openerService = _openerService;
     }
     elicit(server, context, elicitation, token) {
+        if (isFormElicitation(elicitation)) {
+            return this._elicitForm(server, context, elicitation, token);
+        }
+        else if (isUrlElicitation(elicitation)) {
+            return this._elicitUrl(server, context, elicitation, token);
+        }
+        else {
+            return Promise.reject(( new MpcResponseError('Unsupported elicitation type', MCP.INVALID_PARAMS, undefined)));
+        }
+    }
+    async _elicitForm(server, context, elicitation, token) {
         const store = ( new DisposableStore());
-        return ( new Promise(resolve => {
+        const value = await ( new Promise(resolve => {
             const chatModel = context?.chatSessionId && this._chatService.getSession(LocalChatSessionUri.forSession(context.chatSessionId));
             if (chatModel instanceof ChatModel) {
                 const request = chatModel.getRequests().at(-1);
                 if (request) {
-                    const part = ( new ChatElicitationRequestPart(( localize(8679, 'Request for Input')), elicitation.message, ( localize(8680, "{0} (MCP Server)", server.definition.label)), ( localize(8681, 'Respond')), ( localize(8682, 'Cancel')), async () => {
-                        const p = this._doElicit(elicitation, token);
+                    const part = ( new ChatElicitationRequestPart(( localize(8805, 'Request for Input')), elicitation.message, ( localize(8806, "{0} (MCP Server)", server.definition.label)), ( localize(8807, 'Respond')), ( localize(8808, 'Cancel')), async () => {
+                        const p = this._doElicitForm(elicitation, token);
                         resolve(p);
                         const result = await p;
-                        part.state = result.action === 'accept' ? 'accepted' : 'rejected';
                         part.acceptedResult = result.content;
+                        return result.action === 'accept' ? ElicitationState.Accepted : ElicitationState.Rejected;
                     }, () => {
                         resolve({ action: 'decline' });
-                        part.state = 'rejected';
-                        return Promise.resolve();
+                        return Promise.resolve(ElicitationState.Rejected);
                     }, mcpServerToSourceData(server)));
                     chatModel.acceptResponseProgress(request, part);
                 }
@@ -45,19 +92,93 @@ let McpElicitationService = class McpElicitationService {
             else {
                 const handle = this._notificationService.notify({
                     message: elicitation.message,
-                    source: ( localize(8683, 'MCP Server ({0})', server.definition.label)),
+                    source: ( localize(8809, 'MCP Server ({0})', server.definition.label)),
+                    severity: Severity.Info,
+                    actions: {
+                        primary: [store.add(( new Action('mcp.elicit.give', ( localize(8810, 'Respond')), undefined, true, () => resolve(this._doElicitForm(elicitation, token)))))],
+                        secondary: [store.add(( new Action('mcp.elicit.cancel', ( localize(8811, '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, value, dispose: () => { } };
+    }
+    async _elicitUrl(server, context, elicitation, token) {
+        const promiseStore = ( new DisposableStore());
+        const completePromise = ( new Promise((resolve, reject) => {
+            promiseStore.add(token.onCancellationRequested(() => reject(( new CancellationError()))));
+            promiseStore.add(autorun(reader => {
+                const cnx = server.connection.read(reader);
+                const handler = cnx?.handler.read(reader);
+                if (handler) {
+                    reader.store.add(handler.onDidReceiveElicitationCompleteNotification(e => {
+                        if (e.params.elicitationId === elicitation.elicitationId) {
+                            resolve();
+                        }
+                    }));
+                }
+                else if (!McpConnectionState.isRunning(server.connectionState.read(reader))) {
+                    reject(( new CancellationError()));
+                }
+            }));
+        })).finally(() => promiseStore.dispose());
+        const store = ( new DisposableStore());
+        const value = await ( new Promise(resolve => {
+            const chatModel = context?.chatSessionId && this._chatService.getSession(LocalChatSessionUri.forSession(context.chatSessionId));
+            if (chatModel instanceof ChatModel) {
+                const request = chatModel.getRequests().at(-1);
+                if (request) {
+                    const part = ( new ChatElicitationRequestPart(( localize(8812, 'Authorization Required')), ( new MarkdownString()).appendText(elicitation.message)
+                        .appendMarkdown('\n\n' + ( localize(8813, 'Open this URL?')))
+                        .appendCodeblock('', elicitation.url), ( localize(8806, "{0} (MCP Server)", server.definition.label)), ( localize(8814, 'Open {0}', ( URI.parse(elicitation.url)).authority)), ( localize(8808, 'Cancel')), async () => {
+                        const result = await this._doElicitUrl(elicitation, token);
+                        resolve(result);
+                        completePromise.then(() => part.hide());
+                        return result.action === 'accept' ? ElicitationState.Accepted : ElicitationState.Rejected;
+                    }, () => {
+                        resolve({ action: 'decline' });
+                        return Promise.resolve(ElicitationState.Rejected);
+                    }, mcpServerToSourceData(server)));
+                    chatModel.acceptResponseProgress(request, part);
+                }
+            }
+            else {
+                const handle = this._notificationService.notify({
+                    message: elicitation.message + ' ' + ( localize(8815, 'This will open {0}', elicitation.url)),
+                    source: ( localize(8809, 'MCP Server ({0})', server.definition.label)),
                     severity: Severity.Info,
                     actions: {
-                        primary: [store.add(( new Action('mcp.elicit.give', ( localize(8684, 'Respond')), undefined, true, () => resolve(this._doElicit(elicitation, token)))))],
-                        secondary: [store.add(( new Action('mcp.elicit.cancel', ( localize(8685, 'Cancel')), undefined, true, () => resolve({ action: 'decline' }))))],
+                        primary: [store.add(( new Action('mcp.elicit.url.open2', ( localize(8816, 'Open URL')), undefined, true, () => resolve(this._doElicitUrl(elicitation, token)))))],
+                        secondary: [store.add(( new Action('mcp.elicit.cancel', ( localize(8811, '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.URL,
+            value,
+            wait: completePromise,
+            dispose: () => promiseStore.dispose(),
+        };
+    }
+    async _doElicitUrl(elicitation, token) {
+        if (token.isCancellationRequested) {
+            return { action: 'cancel' };
+        }
+        try {
+            if (await this._openerService.open(elicitation.url, { allowCommands: false })) {
+                return { action: 'accept' };
+            }
+        }
+        catch {
+        }
+        return { action: 'decline' };
     }
-    async _doElicit(elicitation, token) {
+    async _doElicitForm(elicitation, token) {
         const quickPick = this._quickInputService.createQuickPick();
         const store = ( new DisposableStore());
         try {
@@ -81,13 +202,25 @@ let McpElicitationService = class McpElicitationService {
                 quickPick.buttons = i > 0 ? [this._quickInputService.backButton] : [];
                 let result;
                 if (schema.type === 'boolean') {
-                    result = await this._handleEnumField(quickPick, { ...schema, type: 'string', enum: ['true', 'false'], default: schema.default ? String(schema.default) : undefined }, isRequired, store, token);
+                    result = await this._handleEnumField(quickPick, { enum: [{ const: 'true' }, { const: 'false' }], default: schema.default ? String(schema.default) : undefined }, isRequired, store, token);
                     if (result.type === 'value') {
                         result.value = result.value === 'true' ? true : false;
                     }
                 }
-                else if (schema.type === 'string' && 'enum' in schema) {
-                    result = await this._handleEnumField(quickPick, schema, isRequired, store, token);
+                else if (isLegacyTitledEnumSchema(schema)) {
+                    result = await this._handleEnumField(quickPick, { enum: ( schema.enum.map((v, i) => ({ const: v, title: schema.enumNames[i] }))), default: schema.default }, isRequired, store, token);
+                }
+                else if (isUntitledEnumSchema(schema)) {
+                    result = await this._handleEnumField(quickPick, { enum: ( schema.enum.map(v => ({ const: v }))), default: schema.default }, isRequired, store, token);
+                }
+                else if (isTitledSingleEnumSchema(schema)) {
+                    result = await this._handleEnumField(quickPick, { enum: schema.oneOf, default: schema.default }, isRequired, store, token);
+                }
+                else if (isTitledMultiEnumSchema(schema)) {
+                    result = await this._handleMultiEnumField(quickPick, { enum: schema.items.anyOf, default: schema.default }, isRequired, store, token);
+                }
+                else if (isUntitledMultiEnumSchema(schema)) {
+                    result = await this._handleMultiEnumField(quickPick, { enum: ( schema.items.enum.map(v => ({ const: v }))), default: schema.default }, isRequired, store, token);
                 }
                 else {
                     result = await this._handleInputField(quickPick, schema, isRequired, store, token);
@@ -123,21 +256,21 @@ let McpElicitationService = class McpElicitationService {
     _getFieldPlaceholder(schema, required) {
         let placeholder = schema.description || '';
         if (!required) {
-            placeholder = placeholder ? `${placeholder} (${( localize(8686, 'Optional'))})` : ( localize(8686, 'Optional'));
+            placeholder = placeholder ? `${placeholder} (${( localize(8817, 'Optional'))})` : ( localize(8817, 'Optional'));
         }
         return placeholder;
     }
     async _handleEnumField(quickPick, schema, required, store, token) {
-        const items = ( schema.enum.map((value, index) => ({
+        const items = ( schema.enum.map(({ const: value, title }) => ({
             id: value,
             label: value,
-            description: schema.enumNames?.[index],
+            description: title,
         })));
         if (!required) {
             items.push(noneItem);
         }
-        quickPick.items = items;
         quickPick.canSelectMany = false;
+        quickPick.items = items;
         if (schema.default !== undefined) {
             quickPick.activeItems = items.filter(item => item.id === schema.default);
         }
@@ -154,6 +287,35 @@ let McpElicitationService = class McpElicitationService {
             quickPick.show();
         }));
     }
+    async _handleMultiEnumField(quickPick, schema, required, store, token) {
+        const items = ( schema.enum.map(({ const: value, title }) => ({
+            id: value,
+            label: value,
+            description: title,
+            picked: !!schema.default?.includes(value),
+            pickable: true,
+        })));
+        if (!required) {
+            items.push(noneItem);
+        }
+        quickPick.canSelectMany = true;
+        quickPick.items = items;
+        return ( new Promise(resolve => {
+            store.add(token.onCancellationRequested(() => resolve({ type: 'cancel' })));
+            store.add(quickPick.onDidAccept(() => {
+                const selected = quickPick.selectedItems[0];
+                if (selected.id === undefined) {
+                    resolve({ type: 'value', value: undefined });
+                }
+                else {
+                    resolve({ type: 'value', value: ( quickPick.selectedItems.map(i => i.id)).filter(isDefined) });
+                }
+            }));
+            store.add(quickPick.onDidTriggerButton(() => resolve({ type: 'back' })));
+            store.add(quickPick.onDidHide(() => resolve({ type: 'cancel' })));
+            quickPick.show();
+        }));
+    }
     async _handleInputField(quickPick, schema, required, store, token) {
         quickPick.canSelectMany = false;
         const updateItems = () => {
@@ -168,7 +330,7 @@ let McpElicitationService = class McpElicitationService {
             else {
                 quickPick.validationMessage = '';
                 if (schema.default) {
-                    items.push({ id: '$default', label: `${schema.default}`, description: ( localize(8687, 'Default value')) });
+                    items.push({ id: '$default', label: `${schema.default}`, description: ( localize(8818, 'Default value')) });
                 }
             }
             if (quickPick.validationMessage) {
@@ -220,10 +382,10 @@ let McpElicitationService = class McpElicitationService {
     }
     _validateString(value, schema) {
         if (schema.minLength && value.length < schema.minLength) {
-            return { isValid: false, message: ( localize(8688, 'Minimum length is {0}', schema.minLength)) };
+            return { isValid: false, message: ( localize(8819, 'Minimum length is {0}', schema.minLength)) };
         }
         if (schema.maxLength && value.length > schema.maxLength) {
-            return { isValid: false, message: ( localize(8689, 'Maximum length is {0}', schema.maxLength)) };
+            return { isValid: false, message: ( localize(8820, 'Maximum length is {0}', schema.maxLength)) };
         }
         if (schema.format) {
             const formatValid = this._validateStringFormat(value, schema.format);
@@ -238,29 +400,29 @@ let McpElicitationService = class McpElicitationService {
             case 'email':
                 return value.includes('@')
                     ? { isValid: true }
-                    : { isValid: false, message: ( localize(8690, 'Please enter a valid email address')) };
+                    : { isValid: false, message: ( localize(8821, 'Please enter a valid email address')) };
             case 'uri':
                 if (URL.canParse(value)) {
                     return { isValid: true };
                 }
                 else {
-                    return { isValid: false, message: ( localize(8691, 'Please enter a valid URI')) };
+                    return { isValid: false, message: ( localize(8822, 'Please enter a valid URI')) };
                 }
             case 'date': {
                 const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
                 if (!dateRegex.test(value)) {
-                    return { isValid: false, message: ( localize(8692, 'Please enter a valid date (YYYY-MM-DD)')) };
+                    return { isValid: false, message: ( localize(8823, 'Please enter a valid date (YYYY-MM-DD)')) };
                 }
                 const date = ( new Date(value));
                 return !isNaN(date.getTime())
                     ? { isValid: true }
-                    : { isValid: false, message: ( localize(8692, 'Please enter a valid date (YYYY-MM-DD)')) };
+                    : { isValid: false, message: ( localize(8823, 'Please enter a valid date (YYYY-MM-DD)')) };
             }
             case 'date-time': {
                 const dateTime = ( new Date(value));
                 return !isNaN(dateTime.getTime())
                     ? { isValid: true }
-                    : { isValid: false, message: ( localize(8693, 'Please enter a valid date-time')) };
+                    : { isValid: false, message: ( localize(8824, 'Please enter a valid date-time')) };
             }
             default:
                 return { isValid: true };
@@ -269,16 +431,16 @@ let McpElicitationService = class McpElicitationService {
     _validateNumber(value, schema) {
         const parsed = Number(value);
         if (isNaN(parsed)) {
-            return { isValid: false, message: ( localize(8694, 'Please enter a valid number')) };
+            return { isValid: false, message: ( localize(8825, 'Please enter a valid number')) };
         }
         if (schema.type === 'integer' && !Number.isInteger(parsed)) {
-            return { isValid: false, message: ( localize(8695, 'Please enter a valid integer')) };
+            return { isValid: false, message: ( localize(8826, 'Please enter a valid integer')) };
         }
         if (schema.minimum !== undefined && parsed < schema.minimum) {
-            return { isValid: false, message: ( localize(8696, 'Minimum value is {0}', schema.minimum)) };
+            return { isValid: false, message: ( localize(8827, 'Minimum value is {0}', schema.minimum)) };
         }
         if (schema.maximum !== undefined && parsed > schema.maximum) {
-            return { isValid: false, message: ( localize(8697, 'Maximum value is {0}', schema.maximum)) };
+            return { isValid: false, message: ( localize(8828, 'Maximum value is {0}', schema.maximum)) };
         }
         return { isValid: true, parsedValue: parsed };
     }
@@ -286,7 +448,8 @@ let McpElicitationService = class McpElicitationService {
 McpElicitationService = ( __decorate([
     ( __param(0, INotificationService)),
     ( __param(1, IQuickInputService)),
-    ( __param(2, IChatService))
+    ( __param(2, IChatService)),
+    ( __param(3, IOpenerService))
 ], McpElicitationService));
 
 export { McpElicitationService };

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { computeLevenshteinDistance } from '@codingame/monaco-vscode-api/vscode/vs/base/common/diff/diff';
 import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
-import { MarkdownString, markdownCommandLink } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
+import { MarkdownString, createMarkdownCommandLink } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
 import { parseTree, findNodeAtLocation } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
 import { Disposable, MutableDisposable, dispose, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -13,8 +13,8 @@ import { MarkerSeverity } from '@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IMarkerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/markers/common/markers.service';
 import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
 import { ConfigurationResolverExpression } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolverExpression';
-import { McpCommandIds } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
-import { mcpConfigurationSection } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
+import { mcpConfigurationSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpConnectionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpWorkbenchService, IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
@@ -101,7 +101,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     diagnostics.push({
                         severity: MarkerSeverity.Warning,
                         message: ( localize(
-                            8698,
+                            8829,
                             'Variable `{0}` not found, did you mean ${{1}}?',
                             name,
                             getClosestMatchingVariable(name) + (arg ? `:${arg}` : '')
@@ -162,14 +162,14 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.ShowOutput,
-                            title: '$(error) ' + ( localize(8699, 'Error')),
+                            title: '$(error) ' + ( localize(8830, 'Error')),
                             arguments: [server.definition.id],
                         },
                     }, {
                         range,
                         command: {
                             id: McpCommandIds.RestartServer,
-                            title: ( localize(8700, "Restart")),
+                            title: ( localize(8831, "Restart")),
                             arguments: [server.definition.id, { autoTrustChanges: true }],
                         },
                     });
@@ -178,7 +178,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                             range,
                             command: {
                                 id: McpCommandIds.RestartServer,
-                                title: ( localize(8701, "Debug")),
+                                title: ( localize(8832, "Debug")),
                                 arguments: [server.definition.id, { debug: true, autoTrustChanges: true }],
                             },
                         });
@@ -189,14 +189,14 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.ShowOutput,
-                            title: '$(loading~spin) ' + ( localize(8702, 'Starting')),
+                            title: '$(loading~spin) ' + ( localize(8833, 'Starting')),
                             arguments: [server.definition.id],
                         },
                     }, {
                         range,
                         command: {
                             id: McpCommandIds.StopServer,
-                            title: ( localize(8703, "Cancel")),
+                            title: ( localize(8834, "Cancel")),
                             arguments: [server.definition.id],
                         },
                     });
@@ -206,21 +206,21 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.ShowOutput,
-                            title: '$(check) ' + ( localize(8704, 'Running')),
+                            title: '$(check) ' + ( localize(8835, 'Running')),
                             arguments: [server.definition.id],
                         },
                     }, {
                         range,
                         command: {
                             id: McpCommandIds.StopServer,
-                            title: ( localize(8705, "Stop")),
+                            title: ( localize(8836, "Stop")),
                             arguments: [server.definition.id],
                         },
                     }, {
                         range,
                         command: {
                             id: McpCommandIds.RestartServer,
-                            title: ( localize(8700, "Restart")),
+                            title: ( localize(8831, "Restart")),
                             arguments: [server.definition.id, { autoTrustChanges: true }],
                         },
                     });
@@ -229,7 +229,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                             range,
                             command: {
                                 id: McpCommandIds.RestartServer,
-                                title: ( localize(8701, "Debug")),
+                                title: ( localize(8832, "Debug")),
                                 arguments: [server.definition.id, { autoTrustChanges: true, debug: true }],
                             },
                         });
@@ -240,7 +240,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.StartServer,
-                            title: '$(debug-start) ' + ( localize(8706, "Start")),
+                            title: '$(debug-start) ' + ( localize(8837, "Start")),
                             arguments: [server.definition.id, { autoTrustChanges: true }],
                         },
                     });
@@ -249,7 +249,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                             range,
                             command: {
                                 id: McpCommandIds.StartServer,
-                                title: ( localize(8701, "Debug")),
+                                title: ( localize(8832, "Debug")),
                                 arguments: [server.definition.id, { autoTrustChanges: true, debug: true }],
                             },
                         });
@@ -262,7 +262,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: '',
-                            title: ( localize(8707, '{0} tools', toolCount)),
+                            title: ( localize(8838, '{0} tools', toolCount)),
                         }
                     });
                 }
@@ -272,7 +272,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                         range,
                         command: {
                             id: McpCommandIds.StartPromptForServer,
-                            title: ( localize(8708, '{0} prompts', promptCount)),
+                            title: ( localize(8839, '{0} prompts', promptCount)),
                             arguments: [server],
                         }
                     });
@@ -281,7 +281,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     range,
                     command: {
                         id: McpCommandIds.ServerOptions,
-                        title: ( localize(8709, 'More...')),
+                        title: ( localize(8840, 'More...')),
                         arguments: [server.definition.id],
                     }
                 });
@@ -347,9 +347,9 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         }
         function pushAnnotation(savedId, offset, saved) {
             const tooltip = ( new MarkdownString([
-                markdownCommandLink({ id: McpCommandIds.EditStoredInput, title: ( localize(8710, 'Edit')), arguments: [savedId, model.uri, mcpConfigurationSection, inConfig.target] }),
-                markdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: ( localize(8711, 'Clear')), arguments: [inConfig.scope, savedId] }),
-                markdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: ( localize(8712, 'Clear All')), arguments: [inConfig.scope] }),
+                createMarkdownCommandLink({ id: McpCommandIds.EditStoredInput, title: ( localize(8841, 'Edit')), arguments: [savedId, model.uri, mcpConfigurationSection, inConfig.target] }),
+                createMarkdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: ( localize(8842, 'Clear')), arguments: [inConfig.scope, savedId] }),
+                createMarkdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: ( localize(8843, 'Clear All')), arguments: [inConfig.scope] }),
             ].join(' | '), { isTrusted: true }));
             const hint = {
                 label: '= ' + (saved.input?.type === 'promptString' && saved.input.password ? '*'.repeat(10) : (saved.value || '')),

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

@@ -3,20 +3,20 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { McpServerType } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpPlatformTypes';
-import { mcpConfigurationSection } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { McpServerType } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpPlatformTypes';
+import { mcpConfigurationSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IWorkbenchMcpManagementService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/mcp/common/mcpWorkbenchManagementService.service';
 import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { toFileOperationResult, FileOperationResult } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { parse } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/base/common/jsonc';
+import { parse } from '@codingame/monaco-vscode-api/vscode/vs/base/common/jsonc';
 import { isObject } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { IJSONEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configuration/common/jsonEditing.service';
 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 { ICommandService } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands.service';
-import { McpCommandIds } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
+import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 
@@ -86,19 +86,19 @@ let McpConfigMigrationContribution = class McpConfigMigrationContribution extend
     showMcpConfigErrorNotification(isRemote) {
         const message = isRemote
             ? ( localize(
-            8713,
+            8844,
             'MCP servers should no longer be configured in remote user settings. Use the dedicated MCP configuration instead.'
         ))
             : ( localize(
-            8714,
+            8845,
             'MCP servers should no longer be configured in user settings. Use the dedicated MCP configuration instead.'
         ));
         const openConfigLabel = isRemote
-            ? ( localize(8715, 'Open Remote User MCP Configuration'))
-            : ( localize(8716, 'Open User MCP Configuration'));
+            ? ( localize(8846, 'Open Remote User MCP Configuration'))
+            : ( localize(8847, 'Open User MCP Configuration'));
         const commandId = isRemote ? McpCommandIds.OpenRemoteUserMcp : McpCommandIds.OpenUserMcp;
         this.notificationService.prompt(Severity.Error, message, [{
-                label: ( localize(8717, 'Update Now')),
+                label: ( localize(8848, 'Update Now')),
                 run: async () => {
                     await this.migrateMcpConfig();
                     await this.commandService.executeCommand(commandId);