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

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

@@ -31,6 +31,7 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         this._mcpResourceScannerService = _mcpResourceScannerService;
         this._remoteAgentService = _remoteAgentService;
         this._defaultAllowedDomains = ["registry.npmjs.org"];
+        this._defaultAllowWritePaths = ["~/.npm"];
         this._sandboxConfigPerConfigurationTarget = ( new Map());
         this._pathJoin = (os, ...segments) => {
             const path = os === OperatingSystem.Windows ? win32 : posix;
@@ -57,7 +58,9 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         if (await this.isEnabled(serverDef, remoteAuthority)) {
             this._logService.trace(`McpSandboxService: Launching with config target ${configTarget}`);
             const launchDetails = await this._resolveSandboxLaunchDetails(configTarget, remoteAuthority, launch.sandbox, launch.cwd);
-            const sandboxArgs = this._getSandboxCommandArgs(launch.command, launch.args, launchDetails.sandboxConfigPath);
+            const quotedCommand = this._quoteShellArgument(launch.command);
+            const quotedArgs = ( launch.args.map(arg => this._quoteShellArgument(arg)));
+            const sandboxArgs = this._getSandboxCommandArgs(quotedCommand, quotedArgs, launchDetails.sandboxConfigPath);
             const sandboxEnv = await this._getSandboxEnvVariables(launch.env, launchDetails.tempDir, launchDetails.rgPath, remoteAuthority);
             if (launchDetails.srtPath) {
                 if (launchDetails.execPath) {
@@ -99,11 +102,11 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         const suggestionLines = [];
         if (allowedDomainsList.length) {
             const shown = ( allowedDomainsList.map(domain => `"${domain}"`)).join(", ");
-            suggestionLines.push(( localize(10452, "Add to `sandbox.network.allowedDomains`: {0}", shown)));
+            suggestionLines.push(( localize(10702, "Add to `sandbox.network.allowedDomains`: {0}", shown)));
         }
         if (allowWriteList.length) {
             const shown = ( allowWriteList.map(path => `"${path}"`)).join(", ");
-            suggestionLines.push(( localize(10453, "Add to `sandbox.filesystem.allowWrite`: {0}", shown)));
+            suggestionLines.push(( localize(10703, "Add to `sandbox.filesystem.allowWrite`: {0}", shown)));
         }
         const sandboxConfig = {};
         if (allowedDomainsList.length) {
@@ -118,7 +121,7 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         }
         return {
             message: ( localize(
-                10454,
+                10704,
                 "The MCP server {0} reported potential sandbox blocks. VS Code found possible sandbox configuration updates:\n{1}",
                 serverLabel,
                 suggestionLines.join("\n")
@@ -261,7 +264,8 @@ let McpSandboxService = class McpSandboxService extends Disposable {
             env = {
                 ...env,
                 TMPDIR: tempDir.path,
-                SRT_DEBUG: "true"
+                SRT_DEBUG: "true",
+                NODE_USE_ENV_PROXY: "1"
             };
         }
         if (rgPath) {
@@ -283,6 +287,7 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         const result = [];
         if (sandboxConfigPath) {
             result.push("--settings", sandboxConfigPath);
+            result.push("--");
         }
         result.push(command, ...args);
         return result;
@@ -370,14 +375,16 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         };
     }
     _getDefaultAllowWrite(directories) {
-        const defaultAllowWrite = ["~/.npm"];
         for (const launchCwd of directories ?? []) {
             const trimmed = launchCwd.trim();
             if (trimmed) {
-                defaultAllowWrite.push(trimmed);
+                this._defaultAllowWritePaths.push(trimmed);
             }
         }
-        return defaultAllowWrite;
+        return this._defaultAllowWritePaths;
+    }
+    _quoteShellArgument(value) {
+        return `'${value.replace(/'/g, `'\\''`)}'`;
     }
 };
 McpSandboxService = ( __decorate([( __param(0, IFileService)), ( __param(1, IEnvironmentService)), ( __param(2, ILogService)), ( __param(3, IMcpResourceScannerService)), ( __param(4, IRemoteAgentService))], McpSandboxService));

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

@@ -52,7 +52,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         this._state.set({
             state: McpConnectionState.Kind.Starting
         }, undefined);
-        this._logger.info(( localize(10470, "Starting server {0}", this.definition.label)));
+        this._logger.info(( localize(10720, "Starting server {0}", this.definition.label)));
         try {
             const launch = this._delegate.start(this._collection, this.definition, this.launchDefinition, {
                 errorOnUserInteraction: this._errorOnUserInteraction
@@ -89,7 +89,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(10471, "Connection state: {0}", (McpConnectionState.toString(state)))));
+            this._logger.info(( localize(10721, "Connection state: {0}", (McpConnectionState.toString(state)))));
             if (state.state === McpConnectionState.Kind.Running && !didStart) {
                 didStart = true;
                 McpServerRequestHandler.create(this._instantiationService, {
@@ -128,7 +128,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         };
     }
     async stop() {
-        this._logger.info(( localize(10472, "Stopping server {0}", this.definition.label)));
+        this._logger.info(( localize(10722, "Stopping server {0}", this.definition.label)));
         this._launch.value?.object.stop();
         await this._waitForState(McpConnectionState.Kind.Stopped, McpConnectionState.Kind.Error);
     }
@@ -165,14 +165,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
                 host: this._extractSandboxHost(message)
             };
         }
-        if (/\b(?:EAI_AGAIN|ENOTFOUND)\b/i.test(message)) {
-            return {
-                kind: "network",
-                message,
-                host: this._extractSandboxHost(message)
-            };
-        }
-        if (/(?:\b(?:EACCES|EPERM|ENOENT|fail(?:ed|ure)?)\b|not accessible)/i.test(message)) {
+        if (/(?:\b(?:EACCES|EPERM|ENOENT|EROFS|fail(?:ed|ure)?)\b|not accessible|read[- ]only)/i.test(message)) {
             return {
                 kind: "filesystem",
                 message,
@@ -186,7 +179,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         if (bracketedPath?.[1]) {
             return bracketedPath[1].trim();
         }
-        const quotedPath = line.match(/["'](\/[^"']+)["']/);
+        const quotedPath = line.match(/["'`](\/[^"'`]+)["'`]/);
         if (quotedPath?.[1]) {
             return quotedPath[1];
         }
@@ -194,16 +187,8 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         return trailingPath?.[1]?.trim();
     }
     _extractSandboxHost(value) {
-        const deniedMatch = value.match(/No matching config rule, denying:\s+(.+)$/i);
-        const matchTarget = deniedMatch?.[1] ?? value;
-        const trimmed = matchTarget.trim().replace(/^["'`]+|["'`,.;]+$/g, "");
-        if (!trimmed) {
-            return undefined;
-        }
-        const withoutProtocol = trimmed.replace(/^[a-z][a-z0-9+.-]*:\/\//i, "");
-        const firstToken = withoutProtocol.split(/[\s/]/, 1)[0] ?? "";
-        const host = firstToken.replace(/:\d+$/, "");
-        return host || undefined;
+        const match = value.match(/No matching config rule, denying:\s+(?<host>[^:\s]+):\d+\.?$/i);
+        return match?.groups?.host;
     }
 };
 McpServerConnection = ( __decorate([( __param(7, IInstantiationService))], McpServerConnection));

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

@@ -4,6 +4,8 @@ import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
+import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
+import { EnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { McpServerMetadataCache } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpServer";
 import { IAutostartResult, IMcpServer, McpCollectionDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
@@ -21,9 +23,10 @@ export declare class McpService extends Disposable implements IMcpService {
         state: import("@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes").LazyCollectionState;
         collections: McpCollectionDefinition[];
     }>;
+    readonly enablementModel: EnablementModel;
     protected readonly userCache: McpServerMetadataCache;
     protected readonly workspaceCache: McpServerMetadataCache;
-    constructor(_instantiationService: IInstantiationService, _mcpRegistry: IMcpRegistry, _logService: ILogService, configurationService: IConfigurationService);
+    constructor(_instantiationService: IInstantiationService, _mcpRegistry: IMcpRegistry, _logService: ILogService, configurationService: IConfigurationService, storageService: IStorageService);
     cancelAutostart(): void;
     autostart(_token?: CancellationToken): IObservable<IAutostartResult>;
     private _autostart;

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

@@ -9,6 +9,8 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { mcpAutoStartConfig, McpAutoStartValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
 import { StorageScope } 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 { EnablementModel, isContributionEnabled } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpServerMetadataCache, McpServer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpServer';
 import { IAutostartResult, McpConnectionState, McpServerCacheState, McpStartServerInteraction, UserInteractionRequiredError, McpServerDefinition, McpToolName } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
@@ -21,7 +23,13 @@ let McpService = class McpService extends Disposable {
     get lazyCollectionState() {
         return this._mcpRegistry.lazyCollectionState;
     }
-    constructor(_instantiationService, _mcpRegistry, _logService, configurationService) {
+    constructor(
+        _instantiationService,
+        _mcpRegistry,
+        _logService,
+        configurationService,
+        storageService
+    ) {
         super();
         this._instantiationService = _instantiationService;
         this._mcpRegistry = _mcpRegistry;
@@ -30,6 +38,7 @@ let McpService = class McpService extends Disposable {
         this._currentAutoStarts = ( new Set());
         this._servers = observableValue(this, []);
         this.servers = ( this._servers.map(servers => ( servers.map(s => s.object))));
+        this.enablementModel = this._register(( new EnablementModel("mcp.enablement", storageService)));
         this.userCache = this._register(
             _instantiationService.createInstance(McpServerMetadataCache, StorageScope.PROFILE)
         );
@@ -79,7 +88,9 @@ let McpService = class McpService extends Disposable {
         if (token.isCancellationRequested) {
             return;
         }
-        const candidates = this.servers.get().filter(s => s.connectionState.get().state !== McpConnectionState.Kind.Error);
+        const candidates = this.servers.get().filter(
+            s => s.connectionState.get().state !== McpConnectionState.Kind.Error && isContributionEnabled(s.enablement.get())
+        );
         let todo = ( new Set());
         if (autoStartConfig === McpAutoStartValue.OnlyNew) {
             todo = ( new Set(candidates.filter(s => s.cacheState.get() === McpServerCacheState.Unknown)));
@@ -178,7 +189,8 @@ let McpService = class McpService extends Disposable {
                 def.serverDefinition.roots,
                 !!def.collectionDefinition.lazy,
                 def.collectionDefinition.scope === StorageScope.WORKSPACE ? this.workspaceCache : this.userCache,
-                def.toolPrefix
+                def.toolPrefix,
+                this.enablementModel
             );
             nextServers.push({
                 object,
@@ -194,7 +206,7 @@ let McpService = class McpService extends Disposable {
         super.dispose();
     }
 };
-McpService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IMcpRegistry)), ( __param(2, ILogService)), ( __param(3, IConfigurationService))], McpService));
+McpService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IMcpRegistry)), ( __param(2, ILogService)), ( __param(3, IConfigurationService)), ( __param(4, IStorageService))], McpService));
 function defsEqual(server, def) {
     return server.collection.id === def.collectionDefinition.id && server.definition.id === def.serverDefinition.id;
 }

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpService.js

@@ -120,7 +120,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             numberOfRequests += ( Object.keys(accessRequest)).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(15424, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(15720, "Sign in requested"))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({
                 badge
             });
@@ -194,17 +194,17 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
         } = await this.dialogService.prompt({
             type: Severity.Info,
             message: ( localize(
-                15425,
+                15721,
                 "The MCP server '{0}' wants to access the {1} account '{2}'.",
                 mcpServerName,
                 provider.label,
                 accountName
             )),
             buttons: [{
-                label: ( localize(15426, "&&Allow")),
+                label: ( localize(15722, "&&Allow")),
                 run: () => SessionPromptChoice.Allow
             }, {
-                label: ( localize(15427, "&&Deny")),
+                label: ( localize(15723, "&&Deny")),
                 run: () => SessionPromptChoice.Deny
             }],
             cancelButton: {
@@ -246,17 +246,17 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             }
         });
         items.push({
-            label: ( localize(15428, "Sign in to another account"))
+            label: ( localize(15724, "Sign in to another account"))
         });
         quickPick.items = items;
         quickPick.title = ( localize(
-            15429,
+            15725,
             "The MCP server '{0}' wants to access a {1} account",
             mcpServerName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            15430,
+            15726,
             "Select an account for '{0}' to use or Esc to cancel",
             mcpServerName
         ));
@@ -336,7 +336,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             group: "3_accessRequests",
             command: {
                 id: `${providerId}${mcpServerId}Access`,
-                title: ( localize(15431, "Grant access to {0} for {1}... (1)", provider.label, mcpServerName))
+                title: ( localize(15727, "Grant access to {0} for {1}... (1)", provider.label, mcpServerName))
             }
         }));
         const accessCommand = CommandsRegistry.registerCommand({
@@ -380,7 +380,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             group: "2_signInRequests",
             command: {
                 id: commandId,
-                title: ( localize(15432, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
+                title: ( localize(15728, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({

package/vscode/src/vs/workbench/services/mcp/browser/mcpGalleryManifestService.js

@@ -71,9 +71,9 @@ let WorkbenchMcpGalleryManifestService = class WorkbenchMcpGalleryManifestServic
         }
         this.mcpGalleryManifest = manifest;
         if (this.mcpGalleryManifest) {
-            this.logService.info("MCP Registry configured:", this.mcpGalleryManifest.url);
+            this.logService.trace("MCP Registry configured:", this.mcpGalleryManifest.url);
         } else {
-            this.logService.info("No MCP Registry configured");
+            this.logService.trace("No MCP Registry configured");
         }
         this.currentStatus = this.mcpGalleryManifest ? McpGalleryManifestStatus.Available : McpGalleryManifestStatus.Unavailable;
         this._onDidChangeMcpGalleryManifest.fire(this.mcpGalleryManifest);