@codingame/monaco-vscode-api 26.2.2 → 28.0.0

package/vscode/src/vs/workbench/contrib/mcp/browser/media/mcpServerEditor.css

@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+.mcp-server-editor {
+	.configuration-content {
+		padding: 20px;
+		box-sizing: border-box;
+	}
+
+	.config-section {
+		margin-bottom: 15px;
+		display: flex;
+		align-items: flex-start;
+	}
+
+	.config-label {
+		font-weight: 600;
+		min-width: 80px;
+		margin-right: 15px;
+	}
+
+	.config-value {
+		word-break: break-all;
+	}
+
+	.no-config {
+		color: var(--vscode-descriptionForeground);
+		font-style: italic;
+		padding: 20px;
+	}
+
+	.manifest-content {
+		padding: 20px;
+		box-sizing: border-box;
+
+		.manifest-section {
+			margin-bottom: 20px;
+
+			.manifest-section-title {
+				font-size: 26px;
+				display: inline-block;
+				margin: 0px;
+				font-weight: 600;
+				height: 100%;
+				box-sizing: border-box;
+				padding: 10px;
+				padding-left: 0px;
+				flex: 1;
+				position: relative;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+		}
+
+		.package-section {
+
+			margin-top: 10px;
+
+			.package-section-title {
+				margin-bottom: 5px;
+				font-size: 1.4em;
+				font-weight: 600;
+				border-bottom: 1px solid var(--vscode-panelSection-border);
+				padding: 5px;
+			}
+
+			.package-details {
+				padding-left: 10px;
+				.package-detail {
+					display: grid;
+					grid-template-columns: 200px 1fr;
+					gap: 12px;
+					align-items: start;
+					padding: 8px 0px;
+				}
+
+				.package-separator {
+					margin-top: 10px;
+					border-bottom: 1px solid var(--vscode-panelSection-border);
+				}
+			}
+		}
+
+
+		.no-manifest {
+			font-style: italic;
+			padding: 20px;
+		}
+	}
+
+
+}

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

@@ -24,16 +24,16 @@ const allDiscoverySources = ( Object.keys({
     [DiscoverySource.CursorWorkspace]: true
 }));
 const discoverySourceLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(9498, "Claude Desktop")),
-    [DiscoverySource.Windsurf]: ( localize(9499, "Windsurf")),
-    [DiscoverySource.CursorGlobal]: ( localize(9500, "Cursor (Global)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(9501, "Cursor (Workspace)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(10379, "Claude Desktop")),
+    [DiscoverySource.Windsurf]: ( localize(10380, "Windsurf")),
+    [DiscoverySource.CursorGlobal]: ( localize(10381, "Cursor (Global)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(10382, "Cursor (Workspace)"))
 };
 const discoverySourceSettingsLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(9502, "Claude Desktop configuration (`claude_desktop_config.json`)")),
-    [DiscoverySource.Windsurf]: ( localize(9503, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
-    [DiscoverySource.CursorGlobal]: ( localize(9504, "Cursor global configuration (`~/.cursor/mcp.json`)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(9505, "Cursor workspace configuration (`.cursor/mcp.json`)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(10383, "Claude Desktop configuration (`claude_desktop_config.json`)")),
+    [DiscoverySource.Windsurf]: ( localize(10384, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
+    [DiscoverySource.CursorGlobal]: ( localize(10385, "Cursor global configuration (`~/.cursor/mcp.json`)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(10386, "Cursor workspace configuration (`.cursor/mcp.json`)"))
 };
 const mcpConfigurationSection = "mcp";
 const mcpDiscoverySection = "chat.mcp.discovery.enabled";
@@ -55,7 +55,7 @@ const mcpDevModeProps = stdio => ({
     dev: {
         type: "object",
         markdownDescription: ( localize(
-            9506,
+            10387,
             "Enabled development mode for the server. When present, the server will be started eagerly and output will be included in its output. Properties inside the `dev` object can configure additional behavior."
         )),
         examples: [{
@@ -67,7 +67,7 @@ const mcpDevModeProps = stdio => ({
         properties: {
             watch: {
                 description: ( localize(
-                    9507,
+                    10388,
                     "A glob pattern or list of glob patterns relative to the workspace folder to watch. The MCP server will be restarted when these files change."
                 )),
                 examples: ["src/**/*.ts"],
@@ -83,7 +83,7 @@ const mcpDevModeProps = stdio => ({
             ...(stdio && {
                 debug: {
                     markdownDescription: ( localize(
-                        9508,
+                        10389,
                         "If set, debugs the MCP server using the given runtime as it's started."
                     )),
                     oneOf: [{
@@ -93,7 +93,7 @@ const mcpDevModeProps = stdio => ({
                             type: {
                                 type: "string",
                                 enum: ["node"],
-                                description: ( localize(9509, "Debug the MCP server using Node.js."))
+                                description: ( localize(10390, "Debug the MCP server using Node.js."))
                             }
                         },
                         additionalProperties: false
@@ -104,11 +104,11 @@ const mcpDevModeProps = stdio => ({
                             type: {
                                 type: "string",
                                 enum: ["debugpy"],
-                                description: ( localize(9510, "Debug the MCP server using Python and debugpy."))
+                                description: ( localize(10391, "Debug the MCP server using Python and debugpy."))
                             },
                             debugpyPath: {
                                 type: "string",
-                                description: ( localize(9511, "Path to the debugpy executable."))
+                                description: ( localize(10392, "Path to the debugpy executable."))
                             }
                         },
                         additionalProperties: false
@@ -126,34 +126,39 @@ const mcpStdioServerSchema = {
         type: {
             type: "string",
             enum: ["stdio"],
-            description: ( localize(9512, "The type of the server."))
+            description: ( localize(10393, "The type of the server."))
+        },
+        sandboxEnabled: {
+            type: "boolean",
+            default: false,
+            description: ( localize(10394, "Whether to run the server in a sandboxed environment."))
         },
         command: {
             type: "string",
-            description: ( localize(9513, "The command to run the server."))
+            description: ( localize(10395, "The command to run the server."))
         },
         cwd: {
             type: "string",
             description: ( localize(
-                9514,
+                10396,
                 "The working directory for the server command. Defaults to the workspace folder when run in a workspace."
             )),
             examples: ["${workspaceFolder}"]
         },
         args: {
             type: "array",
-            description: ( localize(9515, "Arguments passed to the server.")),
+            description: ( localize(10397, "Arguments passed to the server.")),
             items: {
                 type: "string"
             }
         },
         envFile: {
             type: "string",
-            description: ( localize(9516, "Path to a file containing environment variables for the server.")),
+            description: ( localize(10398, "Path to a file containing environment variables for the server.")),
             examples: ["${workspaceFolder}/.env"]
         },
         env: {
-            description: ( localize(9517, "Environment variables passed to the server.")),
+            description: ( localize(10399, "Environment variables passed to the server.")),
             additionalProperties: {
                 anyOf: [{
                     type: "null"
@@ -170,11 +175,93 @@ const mcpStdioServerSchema = {
 const mcpServerSchema = {
     id: mcpSchemaId,
     type: "object",
-    title: ( localize(9518, "Model Context Protocol Servers")),
+    title: ( localize(10400, "Model Context Protocol Servers")),
     allowTrailingCommas: true,
     allowComments: true,
     additionalProperties: false,
     properties: {
+        sandbox: {
+            description: ( localize(
+                10401,
+                "Sandbox config that determines file system and network access. Sandboxing is enabled when sandboxEnabled property is set at the server level on Mac OS and Linux only."
+            )),
+            type: "object",
+            additionalProperties: false,
+            properties: {
+                network: {
+                    description: ( localize(10402, "Network access settings for the sandboxed server.")),
+                    type: "object",
+                    additionalProperties: false,
+                    properties: {
+                        allowedDomains: {
+                            description: ( localize(
+                                10403,
+                                "List of domains that the server is allowed to access. Wildcards are supported, e.g. `*.example.com`."
+                            )),
+                            type: "array",
+                            items: {
+                                type: "string"
+                            },
+                            default: []
+                        },
+                        deniedDomains: {
+                            description: ( localize(
+                                10404,
+                                "List of domains that the server is not allowed to access. e.g. `invalid.example.com`."
+                            )),
+                            type: "array",
+                            items: {
+                                type: "string"
+                            },
+                            default: []
+                        }
+                    }
+                },
+                filesystem: {
+                    description: ( localize(
+                        10405,
+                        "Filesystem access settings for the sandboxed server. Glob patterns are supported for Mac OS only."
+                    )),
+                    type: "object",
+                    additionalProperties: false,
+                    properties: {
+                        denyRead: {
+                            description: ( localize(
+                                10406,
+                                "List of file paths that the server is not allowed to read. By default, all files are allowed to be read. e.g. `~/src/secrets`."
+                            )),
+                            type: "array",
+                            items: {
+                                type: "string"
+                            },
+                            default: []
+                        },
+                        allowWrite: {
+                            description: ( localize(
+                                10407,
+                                "List of file paths that the server is allowed to write to. e.g. `~/src/`."
+                            )),
+                            type: "array",
+                            items: {
+                                type: "string"
+                            },
+                            default: []
+                        },
+                        denyWrite: {
+                            description: ( localize(
+                                10408,
+                                "List of file paths that the server is not allowed to write to. e.g. `~/src/auth/`."
+                            )),
+                            type: "array",
+                            items: {
+                                type: "string"
+                            },
+                            default: []
+                        }
+                    }
+                }
+            }
+        },
         servers: {
             examples: [mcpSchemaExampleServers, httpSchemaExamples],
             additionalProperties: {
@@ -187,18 +274,18 @@ const mcpServerSchema = {
                         type: {
                             type: "string",
                             enum: ["http", "sse"],
-                            description: ( localize(9512, "The type of the server."))
+                            description: ( localize(10393, "The type of the server."))
                         },
                         url: {
                             type: "string",
                             format: "uri",
                             pattern: "^https?:\\/\\/.+",
-                            patternErrorMessage: ( localize(9519, "The URL must start with 'http://' or 'https://'.")),
-                            description: ( localize(9520, "The URL of the Streamable HTTP or SSE endpoint."))
+                            patternErrorMessage: ( localize(10409, "The URL must start with 'http://' or 'https://'.")),
+                            description: ( localize(10410, "The URL of the Streamable HTTP or SSE endpoint."))
                         },
                         headers: {
                             type: "object",
-                            description: ( localize(9521, "Additional headers sent to the server.")),
+                            description: ( localize(10411, "Additional headers sent to the server.")),
                             additionalProperties: {
                                 type: "string"
                             }
@@ -222,7 +309,7 @@ const mcpContributionPoint = {
     },
     jsonSchema: {
         description: ( localize(
-            9522,
+            10412,
             "Contributes Model Context Protocol servers. Users of this should also use `vscode.lm.registerMcpServerDefinitionProvider`."
         )),
         type: "array",
@@ -243,15 +330,15 @@ const mcpContributionPoint = {
             }],
             properties: {
                 id: {
-                    description: ( localize(9523, "Unique ID for the collection.")),
+                    description: ( localize(10413, "Unique ID for the collection.")),
                     type: "string"
                 },
                 label: {
-                    description: ( localize(9524, "Display name for the collection.")),
+                    description: ( localize(10414, "Display name for the collection.")),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(9525, "Condition which must be true to enable this collection.")),
+                    description: ( localize(10415, "Condition which must be true to enable this collection.")),
                     type: "string"
                 }
             }
@@ -268,7 +355,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
     }
     render(manifest) {
         const mcpServerDefinitionProviders = manifest.contributes?.mcpServerDefinitionProviders ?? [];
-        const headers = [( localize(9526, "ID")), ( localize(9527, "Name"))];
+        const headers = [( localize(10416, "ID")), ( localize(10417, "Name"))];
         const rows = ( mcpServerDefinitionProviders.map(mcpServerDefinitionProvider => {
             return [( new MarkdownString()).appendMarkdown(`\`${mcpServerDefinitionProvider.id}\``), mcpServerDefinitionProvider.label];
         }));
@@ -283,7 +370,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: mcpConfigurationSection,
-    label: ( localize(9528, "MCP Servers")),
+    label: ( localize(10418, "MCP Servers")),
     access: {
         canToggle: false
     },

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

@@ -0,0 +1,11 @@
+import { IDisposable } from "../../../../base/common/lifecycle.js";
+import { URI } from "../../../../base/common/uri.js";
+/**
+ * Result of creating an MCP gateway, which is itself disposable.
+ */
+export interface IMcpGatewayResult extends IDisposable {
+    /**
+     * The address of the HTTP endpoint for this gateway.
+     */
+    readonly address: URI;
+}

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

@@ -0,0 +1,26 @@
+import { IMcpGatewayResult } from "./mcpGatewayService.js";
+export declare const IWorkbenchMcpGatewayService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkbenchMcpGatewayService>;
+/**
+* Service that manages MCP gateway HTTP endpoints in the workbench.
+*
+* The gateway provides an HTTP server that external processes can connect
+* to in order to interact with MCP servers known to the editor. The server
+* is shared among all gateways and is automatically torn down when the
+* last gateway is disposed.
+*/
+export interface IWorkbenchMcpGatewayService {
+    readonly _serviceBrand: undefined;
+    /**
+    * Creates a new MCP gateway endpoint.
+    *
+    * The gateway is assigned a secure random route ID to make the endpoint
+    * URL unguessable without authentication.
+    *
+    * @param inRemote Whether to create the gateway in the remote environment.
+    * If true, the gateway is created on the remote server (requires a remote connection).
+    * If false, the gateway is created locally (requires a local Node process, e.g., desktop).
+    * @returns A promise that resolves to the gateway result if successful,
+    * or `undefined` if the requested environment is not available.
+    */
+    createGateway(inRemote: boolean): Promise<IMcpGatewayResult | undefined>;
+}

package/vscode/src/vs/workbench/contrib/mcp/common/mcpGatewayService.service.js

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IWorkbenchMcpGatewayService = ( createDecorator("IWorkbenchMcpGatewayService"));
+
+export { IWorkbenchMcpGatewayService };

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

@@ -0,0 +1,13 @@
+import { URI } from "../../../../base/common/uri.js";
+import { ConfigurationTarget } from "../../../../platform/configuration/common/configuration.js";
+import { IMcpSandboxConfiguration } from "../../../../platform/mcp/common/mcpPlatformTypes.js";
+import { SandboxConfigSuggestionResult } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/contrib/mcp/common/mcpSandboxService";
+import { McpServerDefinition, McpServerLaunch, IMcpPotentialSandboxBlock } from "./mcpTypes.js";
+export declare const IMcpSandboxService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IMcpSandboxService>;
+export interface IMcpSandboxService {
+    readonly _serviceBrand: undefined;
+    launchInSandboxIfEnabled(serverDef: McpServerDefinition, launch: McpServerLaunch, remoteAuthority: string | undefined, configTarget: ConfigurationTarget): Promise<McpServerLaunch>;
+    isEnabled(serverDef: McpServerDefinition, serverLabel?: string): Promise<boolean>;
+    getSandboxConfigSuggestionMessage(serverLabel: string, potentialBlocks: readonly IMcpPotentialSandboxBlock[], existingSandboxConfig?: IMcpSandboxConfiguration): SandboxConfigSuggestionResult | undefined;
+    applySandboxConfigSuggestion(serverDef: McpServerDefinition, mcpResource: URI, configTarget: ConfigurationTarget, potentialBlocks: readonly IMcpPotentialSandboxBlock[], suggestedSandboxConfig?: IMcpSandboxConfiguration): Promise<boolean>;
+}

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

@@ -0,0 +1,6 @@
+
+import { createDecorator } from '../../../../platform/instantiation/common/instantiation.js';
+
+const IMcpSandboxService = ( createDecorator("mcpSandboxService"));
+
+export { IMcpSandboxService };

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

@@ -3,6 +3,7 @@ import { Disposable, IDisposable } from "../../../../base/common/lifecycle.js";
 import { IObservable } from "../../../../base/common/observable.js";
 import { URI } from "../../../../base/common/uri.js";
 import { ICommandService } from "../../../../platform/commands/common/commands.service.js";
+import { IDialogService } from "../../../../platform/dialogs/common/dialogs.service.js";
 import { IInstantiationService } from "../../../../platform/instantiation/common/instantiation.js";
 import { ILogger } from "../../../../platform/log/common/log.js";
 import { ILoggerService } from "../../../../platform/log/common/log.service.js";
@@ -18,8 +19,9 @@ import { IOutputService } from "../../../services/output/common/output.service.j
 import { ToolProgress } from "../../chat/common/tools/languageModelToolsService.js";
 import { StoredMcpIcons } from "./mcpIcons.js";
 import { IMcpRegistry } from "./mcpRegistryTypes.service.js";
+import { IMcpSandboxService } from "./mcpSandboxService.service.js";
 import { McpServerRequestHandler } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/contrib/mcp/common/mcpServerRequestHandler";
-import { IMcpIcons, IMcpPrompt, IMcpResource, IMcpResourceTemplate, IMcpServer, IMcpServerConnection, IMcpServerStartOpts, IMcpTool, IMcpToolCallContext, McpCapability, McpCollectionDefinition, McpCollectionReference, McpConnectionState, McpDefinitionReference, McpServerCacheState, McpServerDefinition, McpToolVisibility } from "./mcpTypes.js";
+import { IMcpIcons, IMcpPotentialSandboxBlock, IMcpPrompt, IMcpResource, IMcpResourceTemplate, IMcpServer, IMcpServerConnection, IMcpServerStartOpts, IMcpTool, IMcpToolCallContext, McpCapability, McpCollectionDefinition, McpCollectionReference, McpConnectionState, McpDefinitionReference, McpServerCacheState, McpServerDefinition, McpToolVisibility } from "./mcpTypes.js";
 import { IMcpElicitationService } from "./mcpTypes.service.js";
 import { IMcpSamplingService } from "./mcpTypes.service.js";
 import { MCP } from "./modelContextProtocol.js";
@@ -137,17 +139,19 @@ export declare class McpServer extends Disposable implements IMcpServer {
     private readonly _telemetryService;
     private readonly _commandService;
     private readonly _instantiationService;
+    private readonly _dialogService;
     private readonly _notificationService;
     private readonly _openerService;
     private readonly _samplingService;
     private readonly _elicitationService;
+    private readonly _mcpSandboxService;
     /** Shared task manager that survives reconnections */
     private readonly _taskManager;
     /**
      * Helper function to call the function on the handler once it's online. The
      * connection started if it is not already.
      */
-    static callOn<R>(server: IMcpServer, fn: (handler: McpServerRequestHandler) => Promise<R>, token?: CancellationToken): Promise<R>;
+    static callOn<R>(server: IMcpServer, fn: (handler: McpServerRequestHandler, connection: IMcpServerConnection) => Promise<R>, token?: CancellationToken): Promise<R>;
     readonly collection: McpCollectionReference;
     private readonly _connectionSequencer;
     private readonly _connection;
@@ -169,9 +173,13 @@ export declare class McpServer extends Disposable implements IMcpServer {
     private readonly _loggerId;
     private readonly _logger;
     private _lastModeDebugged;
+    private _isQuietStart;
+    private _isSandboxSuggestionDialogVisible;
+    private _potentialSandboxBlocks;
+    private _potentialSandboxBlockListener;
     /** Count of running tool calls, used to detect if sampling is during an LM call */
     runningToolCalls: Set<IMcpToolCallContext>;
-    constructor(initialCollection: McpCollectionDefinition, definition: McpDefinitionReference, explicitRoots: URI[] | undefined, _requiresExtensionActivation: boolean | undefined, _primitiveCache: McpServerMetadataCache, toolPrefix: string, _mcpRegistry: IMcpRegistry, workspacesService: IWorkspaceContextService, _extensionService: IExtensionService, _loggerService: ILoggerService, _outputService: IOutputService, _telemetryService: ITelemetryService, _commandService: ICommandService, _instantiationService: IInstantiationService, _notificationService: INotificationService, _openerService: IOpenerService, _samplingService: IMcpSamplingService, _elicitationService: IMcpElicitationService, environmentService: IWorkbenchEnvironmentService);
+    constructor(initialCollection: McpCollectionDefinition, definition: McpDefinitionReference, explicitRoots: URI[] | undefined, _requiresExtensionActivation: boolean | undefined, _primitiveCache: McpServerMetadataCache, toolPrefix: string, _mcpRegistry: IMcpRegistry, workspacesService: IWorkspaceContextService, _extensionService: IExtensionService, _loggerService: ILoggerService, _outputService: IOutputService, _telemetryService: ITelemetryService, _commandService: ICommandService, _instantiationService: IInstantiationService, _dialogService: IDialogService, _notificationService: INotificationService, _openerService: IOpenerService, _samplingService: IMcpSamplingService, _elicitationService: IMcpElicitationService, _mcpSandboxService: IMcpSandboxService, environmentService: IWorkbenchEnvironmentService);
     readDefinitions(): IObservable<{
         server: McpServerDefinition | undefined;
         collection: McpCollectionDefinition | undefined;
@@ -181,6 +189,10 @@ export declare class McpServer extends Disposable implements IMcpServer {
     resourceTemplates(token?: CancellationToken): Promise<IMcpResourceTemplate[]>;
     start({ interaction, autoTrustChanges, promptType, debug, errorOnUserInteraction }?: IMcpServerStartOpts): Promise<McpConnectionState>;
     private showInteractiveError;
+    showSandboxConfigSuggestionFromPotentialBlocks(cnx: IMcpServerConnection, potentialBlocks: readonly IMcpPotentialSandboxBlock[]): boolean;
+    private _confirmAndApplySandboxConfigSuggestion;
+    recordPotentialSandboxBlock(block: IMcpPotentialSandboxBlock): void;
+    private _removePotentialSandboxBlocks;
     stop(): Promise<void>;
     /** Waits for any ongoing tools to be refreshed before resolving. */
     awaitToolRefresh(): Promise<void>;