@codingame/monaco-vscode-mcp-service-override 16.1.1 → 17.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-mcp-service-override",
-  "version": "16.1.1",
+  "version": "17.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - mcp service-override",
   "keywords": [],
@@ -15,11 +15,10 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-2b1a9082-790f-527f-b013-d1b29d6265a3-common": "16.1.1",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "16.1.1",
-    "@codingame/monaco-vscode-ae8a8ca1-f243-508b-9c37-c88ebbd295fa-common": "16.1.1",
-    "@codingame/monaco-vscode-api": "16.1.1",
-    "@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common": "16.1.1"
+    "@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common": "17.0.0",
+    "@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-common": "17.0.0",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "17.0.0",
+    "@codingame/monaco-vscode-api": "17.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -5,7 +5,7 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/ext
 import { Extensions } from '@codingame/monaco-vscode-api/vscode/vs/platform/jsonschemas/common/jsonContributionRegistry';
 import { Registry } from '@codingame/monaco-vscode-api/vscode/vs/platform/registry/common/platform';
 import { registerWorkbenchContribution2, WorkbenchPhase } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions';
-import { mcpSchemaId } from '@codingame/monaco-vscode-2b1a9082-790f-527f-b013-d1b29d6265a3-common/vscode/vs/workbench/services/configuration/common/configuration';
+import { mcpSchemaId } from '@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-common/vscode/vs/workbench/services/configuration/common/configuration';
 import { ConfigMcpDiscovery } from '../common/discovery/configMcpDiscovery.js';
 import { ExtensionMcpDiscovery } from '../common/discovery/extensionMcpDiscovery.js';
 import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
@@ -13,14 +13,14 @@ import { RemoteNativeMpcDiscovery } from '../common/discovery/nativeMcpRemoteDis
 import { CursorWorkspaceMcpDiscoveryAdapter } from '../common/discovery/workspaceMcpDiscoveryAdapter.js';
 import '../common/mcpConfigPathsService.js';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
-import { mcpServerSchema } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
-import { McpContextKeysController } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpContextKeys';
+import { mcpServerSchema } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { McpContextKeysController } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpContextKeys';
 import '../common/mcpRegistry.js';
 import '../common/mcpService.js';
-import { ListMcpServerCommand, McpServerOptionsCommand, ResetMcpTrustCommand, ResetMcpCachedTools, AddConfigurationAction, RemoveStoredInput, EditStoredInput, StartServer, StopServer, ShowOutput, InstallFromActivation, RestartServer, MCPServerActionRendering } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/browser/mcpCommands';
+import { ListMcpServerCommand, McpServerOptionsCommand, ResetMcpTrustCommand, ResetMcpCachedTools, AddConfigurationAction, RemoveStoredInput, EditStoredInput, StartServer, StopServer, ShowOutput, InstallFromActivation, RestartServer, ShowConfiguration, MCPServerActionRendering } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/browser/mcpCommands';
 import { McpDiscovery } from './mcpDiscovery.js';
 import { McpLanguageFeatures } from './mcpLanguageFeatures.js';
-import { McpUrlHandler } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/browser/mcpUrlHandler';
+import { McpUrlHandler } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/browser/mcpUrlHandler';
 
 mcpDiscoveryRegistry.register(( new SyncDescriptor(RemoteNativeMpcDiscovery)));
 mcpDiscoveryRegistry.register(( new SyncDescriptor(ConfigMcpDiscovery)));
@@ -42,6 +42,7 @@ registerAction2(StopServer);
 registerAction2(ShowOutput);
 registerAction2(InstallFromActivation);
 registerAction2(RestartServer);
+registerAction2(ShowConfiguration);
 registerWorkbenchContribution2('mcpActionRendering', MCPServerActionRendering, WorkbenchPhase.BlockRestore);
 const jsonRegistry = ( Registry.as(Extensions.JSONContribution));
 jsonRegistry.registerSchema(mcpSchemaId, mcpServerSchema);

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

@@ -6,7 +6,7 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { mcpDiscoveryRegistry } from '../common/discovery/mcpDiscovery.js';
-import { mcpEnabledSection } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpEnabledSection } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
 
 let McpDiscovery = class McpDiscovery extends Disposable {

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

@@ -13,12 +13,12 @@ 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-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
 import { IMcpConfigPathsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfigPathsService.service';
-import { mcpConfigurationSection } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpConfigurationSection } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/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 { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
-import { StartServer, ShowOutput, StopServer, RestartServer, EditStoredInput, RemoveStoredInput } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/browser/mcpCommands';
 
 const diagnosticOwner = 'vscode.mcp';
 let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
@@ -103,7 +103,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     diagnostics.push({
                         severity: MarkerSeverity.Warning,
                         message: ( localize(
-                            7618,
+                            7700,
                             'Variable `{0}` not found, did you mean ${{1}}?',
                             name,
                             getClosestMatchingVariable(name) + (arg ? `:${arg}` : '')
@@ -160,15 +160,15 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     lenses.lenses.push({
                         range,
                         command: {
-                            id: ShowOutput.ID,
-                            title: '$(error) ' + ( localize(7619, 'Error')),
+                            id: McpCommandIds.ShowOutput,
+                            title: '$(error) ' + ( localize(7701, 'Error')),
                             arguments: [server.definition.id],
                         },
                     }, {
                         range,
                         command: {
-                            id: RestartServer.ID,
-                            title: ( localize(7620, "Restart")),
+                            id: McpCommandIds.RestartServer,
+                            title: ( localize(7702, "Restart")),
                             arguments: [server.definition.id],
                         },
                     });
@@ -177,15 +177,15 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     lenses.lenses.push({
                         range,
                         command: {
-                            id: ShowOutput.ID,
-                            title: '$(loading~spin) ' + ( localize(7621, 'Starting')),
+                            id: McpCommandIds.ShowOutput,
+                            title: '$(loading~spin) ' + ( localize(7703, 'Starting')),
                             arguments: [server.definition.id],
                         },
                     }, {
                         range,
                         command: {
-                            id: StopServer.ID,
-                            title: ( localize(7622, "Cancel")),
+                            id: McpCommandIds.StopServer,
+                            title: ( localize(7704, "Cancel")),
                             arguments: [server.definition.id],
                         },
                     });
@@ -194,29 +194,29 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     lenses.lenses.push({
                         range,
                         command: {
-                            id: ShowOutput.ID,
-                            title: '$(check) ' + ( localize(7623, 'Running')),
+                            id: McpCommandIds.ShowOutput,
+                            title: '$(check) ' + ( localize(7705, 'Running')),
                             arguments: [server.definition.id],
                         },
                     }, {
                         range,
                         command: {
-                            id: StopServer.ID,
-                            title: ( localize(7624, "Stop")),
+                            id: McpCommandIds.StopServer,
+                            title: ( localize(7706, "Stop")),
                             arguments: [server.definition.id],
                         },
                     }, {
                         range,
                         command: {
-                            id: RestartServer.ID,
-                            title: ( localize(7620, "Restart")),
+                            id: McpCommandIds.RestartServer,
+                            title: ( localize(7702, "Restart")),
                             arguments: [server.definition.id],
                         },
                     }, {
                         range,
                         command: {
                             id: '',
-                            title: ( localize(7625, '{0} tools', read(server.tools).length)),
+                            title: ( localize(7707, '{0} tools', read(server.tools).length)),
                         },
                     });
                     break;
@@ -224,8 +224,8 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                     lenses.lenses.push({
                         range,
                         command: {
-                            id: StartServer.ID,
-                            title: '$(debug-start) ' + ( localize(7626, "Start")),
+                            id: McpCommandIds.StartServer,
+                            title: '$(debug-start) ' + ( localize(7708, "Start")),
                             arguments: [server.definition.id],
                         },
                     });
@@ -235,7 +235,7 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
                             range,
                             command: {
                                 id: '',
-                                title: ( localize(7627, '{0} cached tools', toolCount)),
+                                title: ( localize(7709, '{0} cached tools', toolCount)),
                             }
                         });
                     }
@@ -302,9 +302,9 @@ let McpLanguageFeatures = class McpLanguageFeatures extends Disposable {
         }
         function pushAnnotation(savedId, offset, saved) {
             const tooltip = ( new MarkdownString([
-                markdownCommandLink({ id: EditStoredInput.ID, title: ( localize(7628, 'Edit')), arguments: [savedId, model.uri, mcpConfigurationSection, inConfig.target] }),
-                markdownCommandLink({ id: RemoveStoredInput.ID, title: ( localize(7629, 'Clear')), arguments: [inConfig.scope, savedId] }),
-                markdownCommandLink({ id: RemoveStoredInput.ID, title: ( localize(7630, 'Clear All')), arguments: [inConfig.scope] }),
+                markdownCommandLink({ id: McpCommandIds.EditStoredInput, title: ( localize(7710, 'Edit')), arguments: [savedId, model.uri, mcpConfigurationSection, inConfig.target] }),
+                markdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: ( localize(7711, 'Clear')), arguments: [inConfig.scope, savedId] }),
+                markdownCommandLink({ id: McpCommandIds.RemoveStoredInput, title: ( localize(7712, '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/common/discovery/configMcpDiscovery.js

@@ -9,7 +9,7 @@ import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { getMcpServerMapping } from '../mcpConfigFileUtils.js';
 import { IMcpConfigPathsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfigPathsService.service';
-import { mcpConfigurationSection } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpConfigurationSection } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpServerTransportType, McpServerDefinition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { autorunDelta } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/autorun';
@@ -91,8 +91,8 @@ let ConfigMcpDiscovery = class ConfigMcpDiscovery extends Disposable {
             const nextDefinitions = ( Object.entries(value?.servers || {}).map(([name, value]) => ({
                 id: `${collectionId}.${name}`,
                 label: name,
-                launch: 'type' in value && value.type === 'sse' ? {
-                    type: McpServerTransportType.SSE,
+                launch: 'url' in value ? {
+                    type: McpServerTransportType.HTTP,
                     uri: ( URI.parse(value.url)),
                     headers: Object.entries(value.headers || {}),
                 } : {

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

@@ -8,7 +8,7 @@ import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtensionsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensionsRegistry';
-import { mcpContributionPoint, mcpActivationEvent } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpContributionPoint, mcpActivationEvent } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpServerDefinition, extensionPrefixedIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
@@ -83,16 +83,16 @@ let ExtensionMcpDiscovery = ExtensionMcpDiscovery_1 = class ExtensionMcpDiscover
     }
     static _validate(user) {
         if (!Array.isArray(user.value)) {
-            user.collector.error(( localize(7631, "Expected an array of MCP collections")));
+            user.collector.error(( localize(7713, "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(7632, "Expected 'id' to be a non-empty string.")));
+                user.collector.error(( localize(7714, "Expected 'id' to be a non-empty string.")));
                 return false;
             }
             if (typeof contribution.label !== 'string' || isFalsyOrWhitespace(contribution.label)) {
-                user.collector.error(( localize(7633, "Expected 'label' to be a non-empty string.")));
+                user.collector.error(( localize(7715, "Expected 'label' to be a non-empty string.")));
                 return false;
             }
         }

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

@@ -8,7 +8,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { INativeMcpDiscoveryData } from "../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js";
 import { Dto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
-import { DiscoverySource } from "@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
+import { DiscoverySource } from "@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { McpCollectionDefinition, McpServerDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
 import { IMcpDiscovery } from "./mcpDiscovery.js";

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

@@ -12,7 +12,7 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
-import { mcpDiscoverySection, discoverySourceLabel } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpDiscoverySection, discoverySourceLabel } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpCollectionSortOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { ClaudeDesktopMpcDiscoveryAdapter, CursorDesktopMpcDiscoveryAdapter, WindsurfDesktopMpcDiscoveryAdapter } from './nativeMcpDiscoveryAdapters.js';
@@ -81,7 +81,7 @@ let NativeFilesystemMcpDiscovery = class NativeFilesystemMcpDiscovery extends Fi
         this.suffix = '';
         if (remoteAuthority) {
             this.suffix = ' ' + ( localize(
-                7634,
+                7716,
                 ' on {0}',
                 labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority)
             ));

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

@@ -2,7 +2,7 @@ import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { Mutable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { INativeMcpDiscoveryData } from "../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js";
-import { DiscoverySource } from "@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
+import { DiscoverySource } from "@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
 import { McpCollectionSortOrder, McpServerDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
 export interface NativeMpcDiscoveryAdapter {
     readonly remoteAuthority: string | null;

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

@@ -1,7 +1,7 @@
 
 import { Platform } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { DiscoverySource } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { DiscoverySource } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { McpServerTransportType, McpCollectionSortOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 
 function claudeConfigToServerDefinition(idPrefix, contents, cwd) {
@@ -17,7 +17,7 @@ function claudeConfigToServerDefinition(idPrefix, contents, cwd) {
             id: `${idPrefix}.${name}`,
             label: name,
             launch: server.url ? {
-                type: McpServerTransportType.SSE,
+                type: McpServerTransportType.HTTP,
                 uri: ( URI.parse(server.url)),
                 headers: [],
             } : {

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

@@ -9,7 +9,7 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
-import { DiscoverySource } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { DiscoverySource } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpCollectionSortOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { FilesystemMcpDiscovery } from './nativeMcpDiscoveryAbstract.js';

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

@@ -13,10 +13,10 @@ import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
-import { FOLDER_SETTINGS_PATH } from '@codingame/monaco-vscode-2b1a9082-790f-527f-b013-d1b29d6265a3-common/vscode/vs/workbench/services/preferences/common/preferences';
+import { FOLDER_SETTINGS_PATH } from '@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-common/vscode/vs/workbench/services/preferences/common/preferences';
 import { IPreferencesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/preferences/common/preferences.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
-import { mcpConfigurationSection } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { mcpConfigurationSection } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { McpCollectionSortOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/base';
 
@@ -33,7 +33,7 @@ let McpConfigPathsService = class McpConfigPathsService extends Disposable {
                 id: 'usrlocal',
                 key: 'userLocalValue',
                 target: ConfigurationTarget.USER_LOCAL,
-                label: ( localize(7635, 'Global in {0}', productService.nameShort)),
+                label: ( localize(7717, 'Global in {0}', productService.nameShort)),
                 scope: StorageScope.PROFILE,
                 order: McpCollectionSortOrder.User,
                 uri: preferencesService.userSettingsResource,

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

@@ -1,6 +1,7 @@
 import { Disposable, IDisposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { ConfigurationTarget } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration";
+import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
@@ -26,18 +27,18 @@ export declare class McpRegistry extends Disposable implements IMcpRegistry {
     private readonly _trustPrompts;
     private readonly _collections;
     private readonly _delegates;
+    private readonly _enabled;
     readonly collections: IObservable<readonly McpCollectionDefinition[]>;
     private readonly _collectionToPrefixes;
     private readonly _workspaceStorage;
     private readonly _profileStorage;
     private readonly _trustMemento;
-    private readonly _lazyCollectionsToUpdate;
     private readonly _ongoingLazyActivations;
     readonly lazyCollectionState: IObservable<LazyCollectionState>;
     get delegates(): readonly IMcpHostDelegate[];
     private readonly _onDidChangeInputs;
     readonly onDidChangeInputs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    constructor(_instantiationService: IInstantiationService, _configurationResolverService: IConfigurationResolverService, _dialogService: IDialogService, _storageService: IStorageService, _productService: IProductService, _notificationService: INotificationService, _editorService: IEditorService);
+    constructor(_instantiationService: IInstantiationService, _configurationResolverService: IConfigurationResolverService, _dialogService: IDialogService, _storageService: IStorageService, _productService: IProductService, _notificationService: INotificationService, _editorService: IEditorService, configurationService: IConfigurationService);
     registerDelegate(delegate: IMcpHostDelegate): IDisposable;
     registerCollection(collection: McpCollectionDefinition): IDisposable;
     collectionToolPrefix(collection: McpCollectionReference): IObservable<string>;
@@ -46,6 +47,7 @@ export declare class McpRegistry extends Disposable implements IMcpRegistry {
     private _getInputStorageInConfigTarget;
     clearSavedInputs(scope: StorageScope, inputId?: string): Promise<void>;
     editSavedInput(inputId: string, folderData: IWorkspaceFolderData | undefined, configSection: string, target: ConfigurationTarget): Promise<void>;
+    setSavedInput(inputId: string, target: ConfigurationTarget, value: string): Promise<void>;
     getSavedInputs(scope: StorageScope): Promise<{
         [id: string]: IResolvedValue;
     }>;

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

@@ -1,5 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codicons';
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { StringSHA1 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
 import { MarkdownString } from '@codingame/monaco-vscode-api/vscode/vs/base/common/htmlContent';
@@ -7,19 +8,24 @@ import { Lazy } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lazy';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
 import { basename } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import { indexOfPattern } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 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 { observableMemento } from '@codingame/monaco-vscode-ec21d4de-4d65-574c-8715-bb1a6bbad376-common/vscode/vs/platform/observable/common/observableMemento';
+import { observableMemento } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/platform/observable/common/observableMemento';
+import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.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 { AUX_WINDOW_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { mcpEnabledSection } from '@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
 import { McpServerConnection } from './mcpServerConnection.js';
 import { LazyCollectionState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
@@ -36,7 +42,7 @@ let McpRegistry = class McpRegistry extends Disposable {
     get delegates() {
         return this._delegates;
     }
-    constructor(_instantiationService, _configurationResolverService, _dialogService, _storageService, _productService, _notificationService, _editorService) {
+    constructor(_instantiationService, _configurationResolverService, _dialogService, _storageService, _productService, _notificationService, _editorService, configurationService) {
         super();
         this._instantiationService = _instantiationService;
         this._configurationResolverService = _configurationResolverService;
@@ -48,12 +54,18 @@ let McpRegistry = class McpRegistry extends Disposable {
         this._trustPrompts = ( new Map());
         this._collections = observableValue('collections', []);
         this._delegates = [];
-        this.collections = this._collections;
+        this.collections = derived(reader => {
+            if (!this._enabled.read(reader)) {
+                return [];
+            }
+            return this._collections.read(reader);
+        });
         this._collectionToPrefixes = ( this._collections.map(c => {
             const hashes = ( c.map((collection) => {
                 const sha = ( new StringSHA1());
                 sha.update(collection.id);
-                return { view: 0, hash: sha.digest(), collection };
+                const hash = sha.digest();
+                return { view: indexOfPattern(hash, /[a-z]/i), hash, collection };
             }));
             const view = (h) => h.hash.slice(h.view, h.view + collectionPrefixLen);
             let collided = false;
@@ -80,9 +92,11 @@ let McpRegistry = class McpRegistry extends Disposable {
         this._trustMemento = ( new Lazy(
             () => this._register(createTrustMemento(StorageScope.APPLICATION, StorageTarget.MACHINE, this._storageService))
         ));
-        this._lazyCollectionsToUpdate = ( new Set());
         this._ongoingLazyActivations = observableValue(this, 0);
         this.lazyCollectionState = derived(reader => {
+            if (this._enabled.read(reader) === false) {
+                return LazyCollectionState.AllKnown;
+            }
             if (this._ongoingLazyActivations.read(reader) > 0) {
                 return LazyCollectionState.LoadingUnknown;
             }
@@ -91,6 +105,7 @@ let McpRegistry = class McpRegistry extends Disposable {
         });
         this._onDidChangeInputs = this._register(( new Emitter()));
         this.onDidChangeInputs = this._onDidChangeInputs.event;
+        this._enabled = observableConfigValue(mcpEnabledSection, true, configurationService);
     }
     registerDelegate(delegate) {
         this._delegates.push(delegate);
@@ -108,7 +123,6 @@ let McpRegistry = class McpRegistry extends Disposable {
         const currentCollections = this._collections.get();
         const toReplace = currentCollections.find(c => c.lazy && c.id === collection.id);
         if (toReplace) {
-            this._lazyCollectionsToUpdate.add(collection.id);
             this._collections.set(( currentCollections.map(c => c === toReplace ? collection : c)), undefined);
         }
         else {
@@ -170,6 +184,15 @@ let McpRegistry = class McpRegistry extends Disposable {
         await this._configurationResolverService.resolveWithInteraction(folderData, expr, configSection, previous ? { [inputId.slice(2, -1)]: previous } : {}, target);
         await this._updateStorageWithExpressionInputs(storage, expr);
     }
+    async setSavedInput(inputId, target, value) {
+        const storage = this._getInputStorageInConfigTarget(target);
+        const expr = ConfigurationResolverExpression.parse(inputId);
+        for (const unresolved of expr.unresolved()) {
+            expr.resolve(unresolved, value);
+            break;
+        }
+        await this._updateStorageWithExpressionInputs(storage, expr);
+    }
     getSavedInputs(scope) {
         return this._getInputStorage(scope).getMap();
     }
@@ -198,23 +221,27 @@ let McpRegistry = class McpRegistry extends Disposable {
         const originURI = collection.presentation?.origin;
         const labelWithOrigin = originURI ? `[\`${basename(originURI)}\`](${originURI})` : collection.label;
         const result = await this._dialogService.prompt({
-            message: ( localize(7655, 'Trust MCP servers from {0}?', collection.label)),
+            message: ( localize(7737, 'Trust MCP servers from {0}?', collection.label)),
             custom: {
+                icon: Codicon.shield,
                 markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            7656,
+                            7738,
                             '{0} discovered Model Context Protocol servers from {1} (`{2}`). {0} can use their capabilities in Chat.\n\nDo you want to allow running MCP servers from {3}?',
                             this._productService.nameShort,
                             collection.label,
                             ( collection.serverDefinitions.get().map(s => s.label)).join('`, `'),
                             labelWithOrigin
                         )))),
-                        dismissOnLinkClick: true,
+                        actionHandler: () => {
+                            const editor = this._editorService.openEditor({ resource: collection.presentation.origin }, AUX_WINDOW_GROUP);
+                            return editor.then(Boolean);
+                        },
                     }]
             },
             buttons: [
-                { label: ( localize(7657, 'Trust')), run: () => true },
-                { label: ( localize(7658, 'Do not trust')), run: () => false }
+                { label: ( localize(7739, 'Trust')), run: () => true },
+                { label: ( localize(7740, 'Do not trust')), run: () => false }
             ],
         });
         return result.result;
@@ -252,7 +279,11 @@ let McpRegistry = class McpRegistry extends Disposable {
         return await this._configurationResolverService.resolveAsync(folder, expr);
     }
     async resolveConnection({ collectionRef, definitionRef, forceTrust, logger }) {
-        const collection = this._collections.get().find(c => c.id === collectionRef.id);
+        let collection = this._collections.get().find(c => c.id === collectionRef.id);
+        if (collection?.lazy) {
+            await collection.lazy.load();
+            collection = this._collections.get().find(c => c.id === collectionRef.id);
+        }
         const definition = collection?.serverDefinitions.get().find(s => s.id === definitionRef.id);
         if (!collection || !definition) {
             throw ( new Error(
@@ -280,14 +311,20 @@ let McpRegistry = class McpRegistry extends Disposable {
                 return undefined;
             }
         }
-        let launch;
+        let launch = definition.launch;
+        if (collection.resolveServerLanch) {
+            launch = await collection.resolveServerLanch(definition);
+            if (!launch) {
+                return undefined;
+            }
+        }
         try {
-            launch = await this._replaceVariablesInLaunch(definition, definition.launch);
+            launch = await this._replaceVariablesInLaunch(definition, launch);
         }
         catch (e) {
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(7659, 'Error starting {0}: {1}', definition.label, String(e))),
+                message: ( localize(7741, 'Error starting {0}: {1}', definition.label, String(e))),
                 actions: {
                     primary: collection.presentation?.origin && [
                         {
@@ -295,7 +332,7 @@ let McpRegistry = class McpRegistry extends Disposable {
                             class: undefined,
                             enabled: true,
                             tooltip: '',
-                            label: ( localize(7660, 'Open Configuration')),
+                            label: ( localize(7742, 'Open Configuration')),
                             run: () => this._editorService.openEditor({
                                 resource: collection.presentation.origin,
                                 options: { selection: definition.presentation?.origin?.range }
@@ -316,7 +353,8 @@ McpRegistry = ( __decorate([
     ( __param(3, IStorageService)),
     ( __param(4, IProductService)),
     ( __param(5, INotificationService)),
-    ( __param(6, IEditorService))
+    ( __param(6, IEditorService)),
+    ( __param(7, IConfigurationService))
 ], McpRegistry));
 
 export { McpRegistry };