@codingame/monaco-vscode-mcp-service-override 24.2.0 → 25.0.0

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

@@ -36,7 +36,7 @@ import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/regist
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { DefaultViewsContext, SearchMcpServersContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { VIEW_CONTAINER } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensions.contribution';
-import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatContextKeys';
+import { ChatContextKeys } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/actions/chatContextKeys';
 import { Button } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/button/button';
 import { defaultButtonStyles } from '@codingame/monaco-vscode-api/vscode/vs/platform/theme/browser/defaultStyles';
 import { AbstractExtensionsListView } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/extensions/browser/extensionsViews';
@@ -106,7 +106,7 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
                     return mcpServer?.label ?? '';
                 },
                 getWidgetAriaLabel() {
-                    return localize(8941, "MCP Servers");
+                    return localize(8966, "MCP Servers");
                 }
             },
             overrideStyles: getLocationBasedViewColors(this.viewDescriptorService.getViewLocationById(this.id)).listOverrideStyles,
@@ -194,42 +194,42 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
         const iconElement = append(iconContainer, $('span'));
         iconElement.className = ThemeIcon.asClassName(mcpServerIcon);
         const title = append(welcomeContent, $('.mcp-welcome-title'));
-        title.textContent = ( localize(8942, "MCP Servers"));
-        const settingsCommandLink = ( createMarkdownCommandLink({ id: 'workbench.action.openSettings', arguments: [`@id:${mcpGalleryServiceEnablementConfig}`], title: mcpGalleryServiceEnablementConfig, tooltip: ( localize(8943, "Open Settings")) }).toString());
+        title.textContent = ( localize(8967, "MCP Servers"));
+        const settingsCommandLink = ( createMarkdownCommandLink({ id: 'workbench.action.openSettings', arguments: [`@id:${mcpGalleryServiceEnablementConfig}`], title: mcpGalleryServiceEnablementConfig, tooltip: ( localize(8968, "Open Settings")) }).toString());
         const description = append(welcomeContent, $('.mcp-welcome-description'));
         const markdownResult = this._register(this.markdownRendererService.render(( new MarkdownString(( localize(
-            8944,
+            8969,
             "Browse and install [Model Context Protocol (MCP) servers](https://code.visualstudio.com/docs/copilot/customization/mcp-servers) directly from VS Code to extend agent mode with extra tools for connecting to databases, invoking APIs and performing specialized tasks."
         )), { isTrusted: { enabledCommands: ['workbench.action.openSettings'] } }))
             .appendMarkdown('\n\n')
             .appendMarkdown(( localize(
-            8945,
+            8970,
             "This feature is currently in preview. You can disable it anytime using the setting {0}.",
             settingsCommandLink
         )))));
         description.appendChild(markdownResult.element);
         const buttonContainer = append(welcomeContent, $('.mcp-welcome-button-container'));
         const button = this._register(( new Button(buttonContainer, {
-            title: ( localize(8946, "Enable MCP Servers Marketplace")),
+            title: ( localize(8971, "Enable MCP Servers Marketplace")),
             ...defaultButtonStyles
         })));
-        button.label = ( localize(8946, "Enable MCP Servers Marketplace"));
+        button.label = ( localize(8971, "Enable MCP Servers Marketplace"));
         this._register(button.onDidClick(async () => {
             const { result } = await this.dialogService.prompt({
                 type: 'info',
-                message: ( localize(8947, "Enable MCP Servers Marketplace?")),
+                message: ( localize(8972, "Enable MCP Servers Marketplace?")),
                 custom: {
                     markdownDetails: [{
                             markdown: ( new MarkdownString(( localize(
-                                8945,
+                                8970,
                                 "This feature is currently in preview. You can disable it anytime using the setting {0}.",
                                 settingsCommandLink
                             )), { isTrusted: true }))
                         }]
                 },
                 buttons: [
-                    { label: ( localize(8948, "Enable")), run: () => true },
-                    { label: ( localize(8949, "Cancel")), run: () => false }
+                    { label: ( localize(8973, "Enable")), run: () => true },
+                    { label: ( localize(8974, "Cancel")), run: () => false }
                 ]
             });
             if (result) {
@@ -249,7 +249,7 @@ let McpServersListView = class McpServersListView extends AbstractExtensionsList
                 }
                 else if (count === 0) {
                     this.bodyTemplate.messageSeverityIcon.className = '';
-                    this.bodyTemplate.messageBox.textContent = ( localize(8950, "No MCP Servers found."));
+                    this.bodyTemplate.messageBox.textContent = ( localize(8975, "No MCP Servers found."));
                 }
                 if (this.bodyTemplate.messageBox.textContent) {
                     alert(this.bodyTemplate.messageBox.textContent);
@@ -445,7 +445,7 @@ class McpServersViewsContribution extends Disposable {
         ( Registry.as(Extensions.ViewsRegistry)).registerViews([
             {
                 id: InstalledMcpServersViewId,
-                name: ( localize2(8951, "MCP Servers - Installed")),
+                name: ( localize2(8976, "MCP Servers - Installed")),
                 ctorDescriptor: ( new SyncDescriptor(McpServersListView, [{}])),
                 when: ( ContextKeyExpr.and(DefaultViewsContext, HasInstalledMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()))),
                 weight: 40,
@@ -454,7 +454,7 @@ class McpServersViewsContribution extends Disposable {
             },
             {
                 id: 'workbench.views.mcp.default.marketplace',
-                name: ( localize2(8952, "MCP Servers")),
+                name: ( localize2(8977, "MCP Servers")),
                 ctorDescriptor: ( new SyncDescriptor(DefaultBrowseMcpServersView, [{}])),
                 when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledMcpServersContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ContextKeyExpr.or(( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)), ( ProductQualityContext.notEqualsTo('stable')), ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)))))),
                 weight: 40,
@@ -463,13 +463,13 @@ class McpServersViewsContribution extends Disposable {
             },
             {
                 id: 'workbench.views.mcp.marketplace',
-                name: ( localize2(8952, "MCP Servers")),
+                name: ( localize2(8977, "MCP Servers")),
                 ctorDescriptor: ( new SyncDescriptor(McpServersListView, [{}])),
                 when: ( ContextKeyExpr.and(SearchMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ContextKeyExpr.or(( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)), ( ProductQualityContext.notEqualsTo('stable')), ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)))))),
             },
             {
                 id: 'workbench.views.mcp.default.welcomeView',
-                name: ( localize2(8952, "MCP Servers")),
+                name: ( localize2(8977, "MCP Servers")),
                 ctorDescriptor: ( new SyncDescriptor(DefaultBrowseMcpServersView, [{ showWelcome: true }])),
                 when: ( ContextKeyExpr.and(DefaultViewsContext, ( HasInstalledMcpServersContext.toNegated()), ( ChatContextKeys.Setup.hidden.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)).negate()), ( ProductQualityContext.isEqualTo('stable')), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)).negate()))),
                 weight: 40,
@@ -478,7 +478,7 @@ class McpServersViewsContribution extends Disposable {
             },
             {
                 id: 'workbench.views.mcp.welcomeView',
-                name: ( localize2(8952, "MCP Servers")),
+                name: ( localize2(8977, "MCP Servers")),
                 ctorDescriptor: ( new SyncDescriptor(McpServersListView, [{ showWelcome: true }])),
                 when: ( ContextKeyExpr.and(SearchMcpServersContext, ( ChatContextKeys.Setup.hidden.negate()), ( McpServersGalleryStatusContext.isEqualTo(McpGalleryManifestStatus.Available)), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceUrlConfig}`)).negate()), ( ProductQualityContext.isEqualTo('stable')), ( ( ContextKeyDefinedExpr.create(`config.${mcpGalleryServiceEnablementConfig}`)).negate()))),
             }

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

@@ -366,7 +366,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             const existing = result.get(server.name);
             if (existing) {
                 this.logService.warn(( localize(
-                    8953,
+                    8978,
                     "Overwriting mcp server '{0}' from {1} with {2}.",
                     server.name,
                     server.mcpResource.path,
@@ -379,7 +379,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             const existing = result.get(server.name);
             if (existing) {
                 this.logService.warn(( localize(
-                    8953,
+                    8978,
                     "Overwriting mcp server '{0}' from {1} with {2}.",
                     server.name,
                     server.mcpResource.path,
@@ -392,7 +392,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
     }
     canInstall(mcpServer) {
         if (!(mcpServer instanceof McpWorkbenchServer)) {
-            return ( new MarkdownString()).appendText(( localize(8954, "The provided object is not an mcp server.")));
+            return ( new MarkdownString()).appendText(( localize(8979, "The provided object is not an mcp server.")));
         }
         if (mcpServer.gallery) {
             const result = this.mcpManagementService.canInstall(mcpServer.gallery);
@@ -409,7 +409,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             return result;
         }
         return ( new MarkdownString()).appendText(( localize(
-            8955,
+            8980,
             "Cannot install the '{0}' MCP Server because it is not available in this setup.",
             mcpServer.label
         )));
@@ -512,7 +512,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
             id: USER_CONFIG_ID,
             key: 'userLocalValue',
             target: ConfigurationTarget.USER_LOCAL,
-            label: ( localize(8956, 'Global in {0}', this.productService.nameShort)),
+            label: ( localize(8981, 'Global in {0}', this.productService.nameShort)),
             scope: StorageScope.PROFILE,
             order: McpCollectionSortOrder.User,
             uri: mcpResource,
@@ -671,7 +671,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                 message: {
                     severity: Severity.Warning,
                     text: ( new MarkdownString(( localize(
-                        8957,
+                        8982,
                         "This MCP Server is disabled because MCP servers are configured to be disabled in the Editor. Please check your [settings]({0}).",
                         settingsCommandLink
                     ))))
@@ -685,7 +685,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                     message: {
                         severity: Severity.Warning,
                         text: ( new MarkdownString(( localize(
-                            8958,
+                            8983,
                             "This MCP Server is disabled because it is configured to be disabled in the Editor. Please check your [settings]({0}).",
                             settingsCommandLink
                         ))))
@@ -699,7 +699,7 @@ let McpWorkbenchService = class McpWorkbenchService extends Disposable {
                     message: {
                         severity: Severity.Warning,
                         text: ( new MarkdownString(( localize(
-                            8958,
+                            8983,
                             "This MCP Server is disabled because it is configured to be disabled in the Editor. Please check your [settings]({0}).",
                             settingsCommandLink
                         ))))

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.js

@@ -135,20 +135,20 @@ let ExtensionMcpDiscovery = ExtensionMcpDiscovery_1 = class ExtensionMcpDiscover
     }
     static _validate(user) {
         if (!Array.isArray(user.value)) {
-            user.collector.error(( localize(8959, "Expected an array of MCP collections")));
+            user.collector.error(( localize(8984, "Expected an array of MCP collections")));
             return false;
         }
         for (const contribution of user.value) {
             if (typeof contribution.id !== 'string' || isFalsyOrWhitespace(contribution.id)) {
-                user.collector.error(( localize(8960, "Expected 'id' to be a non-empty string.")));
+                user.collector.error(( localize(8985, "Expected 'id' to be a non-empty string.")));
                 return false;
             }
             if (typeof contribution.label !== 'string' || isFalsyOrWhitespace(contribution.label)) {
-                user.collector.error(( localize(8961, "Expected 'label' to be a non-empty string.")));
+                user.collector.error(( localize(8986, "Expected 'label' to be a non-empty string.")));
                 return false;
             }
             if (contribution.when !== undefined && (typeof contribution.when !== 'string' || isFalsyOrWhitespace(contribution.when))) {
-                user.collector.error(( localize(8962, "Expected 'when' to be a non-empty string.")));
+                user.collector.error(( localize(8987, "Expected 'when' to be a non-empty string.")));
                 return false;
             }
         }

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.js

@@ -83,7 +83,7 @@ let NativeFilesystemMcpDiscovery = class NativeFilesystemMcpDiscovery extends Fi
         this.suffix = '';
         if (remoteAuthority) {
             this.suffix = ' ' + ( localize(
-                8963,
+                8988,
                 ' on {0}',
                 labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority)
             ));

package/vscode/src/vs/workbench/contrib/mcp/common/mcpContextKeys.js

@@ -15,19 +15,19 @@ var McpContextKeys;
     McpContextKeys.serverCount = ( new RawContextKey(
         'mcp.serverCount',
         undefined,
-        { type: 'number', description: ( localize(8995, "Context key that has the number of registered MCP servers")) }
+        { type: 'number', description: ( localize(9020, "Context key that has the number of registered MCP servers")) }
     ));
     McpContextKeys.hasUnknownTools = ( new RawContextKey(
         'mcp.hasUnknownTools',
         undefined,
-        { type: 'boolean', description: ( localize(8996, "Indicates whether there are MCP servers with unknown tools.")) }
+        { type: 'boolean', description: ( localize(9021, "Indicates whether there are MCP servers with unknown tools.")) }
     ));
     McpContextKeys.hasServersWithErrors = ( new RawContextKey(
         'mcp.hasServersWithErrors',
         undefined,
-        { type: 'boolean', description: ( localize(8997, "Indicates whether there are any MCP servers with errors.")) }
+        { type: 'boolean', description: ( localize(9022, "Indicates whether there are any MCP servers with errors.")) }
     ));
-    McpContextKeys.toolsCount = ( new RawContextKey('mcp.toolsCount', undefined, { type: 'number', description: ( localize(8998, "Context key that has the number of registered MCP tools")) }));
+    McpContextKeys.toolsCount = ( new RawContextKey('mcp.toolsCount', undefined, { type: 'number', description: ( localize(9023, "Context key that has the number of registered MCP tools")) }));
 })(McpContextKeys || (McpContextKeys = {}));
 let McpContextKeysController = class McpContextKeysController extends Disposable {
     static { this.ID = 'workbench.contrib.mcp.contextKey'; }

package/vscode/src/vs/workbench/contrib/mcp/common/mcpLanguageModelToolContribution.d.ts

@@ -1,7 +1,7 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
-import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service";
+import { ILanguageModelToolsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { IMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
 export declare class McpLanguageModelToolContribution extends Disposable implements IWorkbenchContribution {

package/vscode/src/vs/workbench/contrib/mcp/common/mcpLanguageModelToolContribution.js

@@ -15,9 +15,9 @@ import { IImageResizeService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
-import { getAttachableImageExtension, ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { getAttachableImageExtension, ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatModel';
 import { LanguageModelPartAudience } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
-import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
+import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService.service';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpToolResourceLinkMimeType, McpResourceURI } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
@@ -51,7 +51,7 @@ let McpLanguageModelToolContribution = class McpLanguageModelToolContribution ex
                     const referenceName = server.definition.label.toLowerCase().replace(/\s+/g, '-');
                     const toolSet = store.add(this._toolsService.createToolSet(source, server.definition.id, referenceName, {
                         icon: Codicon.mcp,
-                        description: ( localize(8999, "{0}: All Tools", server.definition.label))
+                        description: ( localize(9024, "{0}: All Tools", server.definition.label))
                     }));
                     return { toolSet, source };
                 }));
@@ -144,14 +144,14 @@ let McpToolImplementation = class McpToolImplementation {
         const tool = this._tool;
         const server = this._server;
         const mcpToolWarning = ( localize(
-            9000,
+            9025,
             "Note that MCP servers or malicious conversation content may attempt to misuse '{0}' through tools.",
             this._productService.nameShort
         ));
         const title = tool.definition.annotations?.title || tool.definition.title || ('`' + tool.definition.name + '`');
         const confirm = {};
         if (!tool.definition.annotations?.readOnlyHint) {
-            confirm.title = ( new MarkdownString(( localize(9001, "Run {0}", title))));
+            confirm.title = ( new MarkdownString(( localize(9026, "Run {0}", title))));
             confirm.message = ( new MarkdownString(tool.definition.description, { supportThemeIcons: true }));
             confirm.disclaimer = mcpToolWarning;
             confirm.allowAutoConfirm = true;
@@ -161,9 +161,9 @@ let McpToolImplementation = class McpToolImplementation {
         }
         return {
             confirmationMessages: confirm,
-            invocationMessage: ( new MarkdownString(( localize(9002, "Running {0}", title)))),
-            pastTenseMessage: ( new MarkdownString(( localize(9003, "Ran {0} ", title)))),
-            originMessage: ( localize(9004, "{0} (MCP Server)", server.definition.label)),
+            invocationMessage: ( new MarkdownString(( localize(9027, "Running {0}", title)))),
+            pastTenseMessage: ( new MarkdownString(( localize(9028, "Ran {0} ", title)))),
+            originMessage: ( localize(9029, "{0} (MCP Server)", server.definition.label)),
             toolSpecificData: {
                 kind: 'input',
                 rawInput: context.parameters

package/vscode/src/vs/workbench/contrib/mcp/common/mcpRegistry.js

@@ -251,7 +251,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             const originURI = r.definition.presentation?.origin?.uri || r.collection.presentation?.origin;
             let labelWithOrigin = originURI ? `[\`${r.definition.label}\`](${originURI})` : '`' + r.definition.label + '`';
             if (r.collection.source instanceof ExtensionIdentifier) {
-                labelWithOrigin += ` (${( localize(9005, 'from {0}', r.collection.source.value))})`;
+                labelWithOrigin += ` (${( localize(9030, 'from {0}', r.collection.source.value))})`;
             }
             return labelWithOrigin;
         }
@@ -259,12 +259,12 @@ let McpRegistry = class McpRegistry extends Disposable {
             const def = definitions[0];
             const originURI = def.definition.presentation?.origin?.uri;
             const { result } = await this._dialogService.prompt({
-                message: ( localize(9006, 'Trust and run MCP server {0}?', def.definition.label)),
+                message: ( localize(9031, 'Trust and run MCP server {0}?', def.definition.label)),
                 custom: {
                     icon: Codicon.shield,
                     markdownDetails: [{
                             markdown: ( new MarkdownString(( localize(
-                                9007,
+                                9032,
                                 'The MCP server {0} was updated. MCP servers may add context to your chat session and lead to unexpected behavior. Do you want to trust and run this server?',
                                 labelFor(def)
                             )))),
@@ -275,20 +275,20 @@ let McpRegistry = class McpRegistry extends Disposable {
                         }]
                 },
                 buttons: [
-                    { label: ( localize(9008, 'Trust')), run: () => true },
-                    { label: ( localize(9009, 'Do not trust')), run: () => false }
+                    { label: ( localize(9033, 'Trust')), run: () => true },
+                    { label: ( localize(9034, 'Do not trust')), run: () => false }
                 ],
             });
             return result === undefined ? undefined : (result ? [def.definition.id] : []);
         }
         const list = ( definitions.map(d => `- ${labelFor(d)}`)).join('\n');
         const { result } = await this._dialogService.prompt({
-            message: ( localize(9010, 'Trust and run {0} MCP servers?', definitions.length)),
+            message: ( localize(9035, 'Trust and run {0} MCP servers?', definitions.length)),
             custom: {
                 icon: Codicon.shield,
                 markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            9011,
+                            9036,
                             'Several updated MCP servers were discovered:\n\n{0}\n\n MCP servers may add context to your chat session and lead to unexpected behavior. Do you want to trust and run these server?',
                             list
                         )))),
@@ -299,9 +299,9 @@ let McpRegistry = class McpRegistry extends Disposable {
                     }]
             },
             buttons: [
-                { label: ( localize(9008, 'Trust')), run: () => 'all' },
-                { label: ( localize(9012, 'Pick Trusted')), run: () => 'pick' },
-                { label: ( localize(9009, 'Do not trust')), run: () => 'none' },
+                { label: ( localize(9033, 'Trust')), run: () => 'all' },
+                { label: ( localize(9037, 'Pick Trusted')), run: () => 'pick' },
+                { label: ( localize(9034, 'Do not trust')), run: () => 'none' },
             ],
         });
         if (result === undefined) {
@@ -440,7 +440,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             }
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(9013, 'Error starting {0}: {1}', definition.label, String(e))),
+                message: ( localize(9038, 'Error starting {0}: {1}', definition.label, String(e))),
                 actions: {
                     primary: collection.presentation?.origin && [
                         {
@@ -448,7 +448,7 @@ let McpRegistry = class McpRegistry extends Disposable {
                             class: undefined,
                             enabled: true,
                             tooltip: '',
-                            label: ( localize(9014, 'Open Configuration')),
+                            label: ( localize(9039, 'Open Configuration')),
                             run: () => this._editorService.openEditor({
                                 resource: collection.presentation.origin,
                                 options: { selection: definition.presentation?.origin?.range }

package/vscode/src/vs/workbench/contrib/mcp/common/mcpSamplingLog.js

@@ -41,7 +41,7 @@ let McpSamplingLog = class McpSamplingLog extends Disposable {
         }
         const parts = [];
         const total = record.bins.reduce((sum, value) => sum + value, 0);
-        parts.push(( localize(9015, '{0} total requests in the last 7 days.', total)));
+        parts.push(( localize(9040, '{0} total requests in the last 7 days.', total)));
         parts.push(this._formatRecentRequests(record));
         return parts.join('\n');
     }

package/vscode/src/vs/workbench/contrib/mcp/common/mcpSamplingService.js

@@ -107,11 +107,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
         const model = await this._getMatchingModelInner(opts.server, opts.isDuringToolCall, opts.params.modelPreferences);
         if (model === ModelMatch.UnsureAllowedDuringChat) {
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                9016,
+                9041,
                 'Allow MCP tools from "{0}" to make LLM requests?',
                 opts.server.definition.label
             )), ( localize(
-                9017,
+                9042,
                 'The MCP server "{0}" has issued a request to make a language model call. Do you want to allow it to make requests during chat?',
                 opts.server.definition.label
             )), this.allowButtons(opts.server, 'allowedDuringChat'));
@@ -122,11 +122,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
         }
         else if (model === ModelMatch.UnsureAllowedOutsideChat) {
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                9018,
+                9043,
                 'Allow MCP server "{0}" to make LLM requests?',
                 opts.server.definition.label
             )), ( localize(
-                9019,
+                9044,
                 'The MCP server "{0}" has issued a request to make a language model call. Do you want to allow it to make requests, outside of tool calls during chat?',
                 opts.server.definition.label
             )), this.allowButtons(opts.server, 'allowedOutsideChat'));
@@ -142,12 +142,12 @@ let McpSamplingService = class McpSamplingService extends Disposable {
             const newlyPickedModels = opts.isDuringToolCall
                 ? await this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server)
                 : await this._notify(( localize(
-                9020,
+                9045,
                 'MCP server "{0}" triggered a language model request, but it has no allowlisted models.',
                 opts.server.definition.label
             )), {
-                    [( localize(9021, 'Configure'))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
-                    [( localize(9022, 'Cancel'))]: () => Promise.resolve(undefined),
+                    [( localize(9046, 'Configure'))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
+                    [( localize(9047, 'Cancel'))]: () => Promise.resolve(undefined),
                 });
             if (newlyPickedModels) {
                 return this._getMatchingModel(opts);
@@ -158,19 +158,19 @@ let McpSamplingService = class McpSamplingService extends Disposable {
     }
     allowButtons(server, key) {
         return {
-            [( localize(9023, 'Allow in this Session'))]: async () => {
+            [( localize(9048, 'Allow in this Session'))]: async () => {
                 this._sessionSets[key].set(server.definition.id, true);
                 return true;
             },
-            [( localize(9024, 'Always'))]: async () => {
+            [( localize(9049, 'Always'))]: async () => {
                 await this.updateConfig(server, c => c[key] = true);
                 return true;
             },
-            [( localize(9025, 'Not Now'))]: async () => {
+            [( localize(9050, 'Not Now'))]: async () => {
                 this._sessionSets[key].set(server.definition.id, false);
                 return false;
             },
-            [( localize(9026, 'Never'))]: async () => {
+            [( localize(9051, 'Never'))]: async () => {
                 await this.updateConfig(server, c => c[key] = false);
                 return false;
             },

package/vscode/src/vs/workbench/contrib/mcp/common/mcpServer.d.ts

@@ -14,7 +14,7 @@ import { IWorkspaceContextService } from "@codingame/monaco-vscode-api/vscode/vs
 import { IWorkbenchEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IOutputService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/output/common/output.service";
-import { ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService";
+import { ToolProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/tools/languageModelToolsService";
 import { StoredMcpIcons } from "./mcpIcons.js";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { McpServerRequestHandler } from "./mcpServerRequestHandler.js";

package/vscode/src/vs/workbench/contrib/mcp/common/mcpServer.js

@@ -4,8 +4,10 @@ import { raceCancellationError, Sequencer, AsyncIterableProducer } from '@coding
 import { CancellationToken, CancellationTokenSource } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { Iterable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/iterator';
 import { parseTree, findNodeAtOffset, getNodePath } from '@codingame/monaco-vscode-api/vscode/vs/base/common/json';
+import { normalizeDriveLetter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/labels';
 import { Disposable, toDisposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { mapValues } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
@@ -250,10 +252,13 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
             }
             cnx.roots = ( workspaces.read(reader)
                 .filter(w => w.uri.authority === (initialCollection.remoteAuthority || ''))
-                .map(w => ({
-                name: w.name,
-                uri: ( ( URI.from(uriTransformer?.transformIncoming(w.uri) ?? w.uri)).toString())
-            })));
+                .map(w => {
+                let uri = ( URI.from(uriTransformer?.transformIncoming(w.uri) ?? w.uri));
+                if (uri.scheme === Schemas.file) {
+                    uri = URI.file(normalizeDriveLetter(uri.fsPath, true));
+                }
+                return { name: w.name, uri: ( uri.toString()) };
+            }));
         }));
         this._register(autorun(reader => {
             const cnx = this._connection.read(reader);
@@ -434,29 +439,29 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                     break;
             }
             const options = [{
-                    label: ( localize(9027, "Show Output")),
+                    label: ( localize(9052, "Show Output")),
                     run: () => this.showOutput(),
                 }];
             if (cnx.definition.devMode?.debug?.type === 'debugpy' && debug) {
                 this._notificationService.prompt(Severity.Error, ( localize(
-                    9028,
+                    9053,
                     'The command "{0}" was not found. You can specify the path to debugpy in the `dev.debug.debugpyPath` option.',
                     cnx.launchDefinition.command,
                     cnx.definition.label
                 )), [...options, {
-                        label: ( localize(9029, 'View Docs')),
+                        label: ( localize(9054, 'View Docs')),
                         run: () => this._openerService.open(( URI.parse('https://aka.ms/vscode-mcp-install/debugpy'))),
                     }]);
                 return;
             }
             if (docsLink) {
                 options.push({
-                    label: ( localize(9030, 'Install {0}', cnx.launchDefinition.command)),
+                    label: ( localize(9055, 'Install {0}', cnx.launchDefinition.command)),
                     run: () => this._openerService.open(( URI.parse(docsLink))),
                 });
             }
             this._notificationService.prompt(Severity.Error, ( localize(
-                9031,
+                9056,
                 'The command "{0}" needed to run {1} was not found.',
                 cnx.launchDefinition.command,
                 cnx.definition.label
@@ -464,7 +469,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         }
         else {
             this._notificationService.warn(( localize(
-                9032,
+                9057,
                 'The MCP server {0} could not be started: {1}',
                 cnx.definition.label,
                 error.message
@@ -530,7 +535,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         const validated = [];
         for (const [i, result] of validations.entries()) {
             if ('error' in result) {
-                error += ( localize(9033, 'Tool `{0}` has invalid JSON parameters:', tools[i].name)) + '\n';
+                error += ( localize(9058, 'Tool `{0}` has invalid JSON parameters:', tools[i].name)) + '\n';
                 for (const message of result.error) {
                     error += `\t- ${message}\n`;
                 }
@@ -817,7 +822,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
         notificationService.notify({
             severity: Severity.Warning,
             message: ( localize(
-                9034,
+                9059,
                 'MCP server `{0}` has tools with invalid parameters which will be omitted.',
                 serverName
             )),
@@ -827,7 +832,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
                         enabled: true,
                         id: 'mcpBadSchema.show',
                         tooltip: '',
-                        label: ( localize(9035, 'Show')),
+                        label: ( localize(9060, 'Show')),
                         run: () => {
                             editorService.openEditor({
                                 resource: undefined,

package/vscode/src/vs/workbench/contrib/mcp/common/mcpServerConnection.js

@@ -36,7 +36,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         }
         this._launch.value = undefined;
         this._state.set({ state: McpConnectionState.Kind.Starting }, undefined);
-        this._logger.info(( localize(9036, 'Starting server {0}', this.definition.label)));
+        this._logger.info(( localize(9061, 'Starting server {0}', this.definition.label)));
         try {
             const launch = this._delegate.start(this._collection, this.definition, this.launchDefinition, { errorOnUserInteraction: this._errorOnUserInteraction });
             this._launch.value = this.adoptLaunch(launch, methods);
@@ -63,7 +63,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         store.add(autorun(reader => {
             const state = launch.state.read(reader);
             this._state.set(state, undefined);
-            this._logger.info(( localize(9037, 'Connection state: {0}', (McpConnectionState.toString(state)))));
+            this._logger.info(( localize(9062, 'Connection state: {0}', (McpConnectionState.toString(state)))));
             if (state.state === McpConnectionState.Kind.Running && !didStart) {
                 didStart = true;
                 McpServerRequestHandler.create(this._instantiationService, {
@@ -98,7 +98,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         return { dispose: () => store.dispose(), object: launch };
     }
     async stop() {
-        this._logger.info(( localize(9038, 'Stopping server {0}', this.definition.label)));
+        this._logger.info(( localize(9063, 'Stopping server {0}', this.definition.label)));
         this._launch.value?.object.stop();
         await this._waitForState(McpConnectionState.Kind.Stopped, McpConnectionState.Kind.Error);
     }