@codingame/monaco-vscode-api 30.0.1 → 31.0.0

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

@@ -167,7 +167,7 @@ let PublisherWidget = class PublisherWidget extends McpServerWidget {
             this.element.setAttribute("role", "button");
             this.element.tabIndex = 0;
             this.containerHover = this.disposables.add(
-                this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), this.element, ( localize(10664, "Publisher ({0})", this.mcpServer.publisherDisplayName)))
+                this.hoverService.setupManagedHover(getDefaultHoverDelegate("mouse"), this.element, ( localize(10794, "Publisher ({0})", this.mcpServer.publisherDisplayName)))
             );
             append(this.element, publisherDisplayName);
             if (this.mcpServer.gallery?.publisherDomain?.verified) {
@@ -176,7 +176,7 @@ let PublisherWidget = class PublisherWidget extends McpServerWidget {
                 verifiedPublisher.tabIndex = 0;
                 verifiedPublisher.setAttribute("role", "button");
                 this.containerHover.update(( localize(
-                    10665,
+                    10795,
                     "This publisher has verified ownership of {0}",
                     this.mcpServer.gallery?.publisherDomain.link
                 )));
@@ -325,12 +325,12 @@ let McpServerHoverWidget = class McpServerHoverWidget extends McpServerWidget {
         let addSeparator = false;
         if (this.mcpServer.local?.scope === LocalMcpServerScope.Workspace) {
             markdown.appendMarkdown(`$(${mcpServerWorkspaceIcon.id}) `);
-            markdown.appendMarkdown(( localize(10666, "Workspace MCP Server")));
+            markdown.appendMarkdown(( localize(10796, "Workspace MCP Server")));
             addSeparator = true;
         }
         if (this.mcpServer.local?.scope === LocalMcpServerScope.RemoteUser) {
             markdown.appendMarkdown(`$(${mcpServerRemoteIcon.id}) `);
-            markdown.appendMarkdown(( localize(10667, "Remote MCP Server")));
+            markdown.appendMarkdown(( localize(10797, "Remote MCP Server")));
             addSeparator = true;
         }
         if (this.mcpServer.installState === McpServerInstallState.Installed) {
@@ -448,7 +448,7 @@ const mcpStarredIconColor = registerColor("mcpIcon.starForeground", {
     dark: "#FF8E00",
     hcDark: "#FF8E00",
     hcLight: textLinkForeground
-}, ( localize(10668, "The icon color for mcp starred.")), false);
+}, ( localize(10798, "The icon color for mcp starred.")), false);
 registerThemingParticipant((theme, collector) => {
     const mcpStarredIconColorValue = theme.getColor(mcpStarredIconColor);
     if (mcpStarredIconColorValue) {

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(10694, "Claude Desktop")),
-    [DiscoverySource.Windsurf]: ( localize(10695, "Windsurf")),
-    [DiscoverySource.CursorGlobal]: ( localize(10696, "Cursor (Global)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(10697, "Cursor (Workspace)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(10824, "Claude Desktop")),
+    [DiscoverySource.Windsurf]: ( localize(10825, "Windsurf")),
+    [DiscoverySource.CursorGlobal]: ( localize(10826, "Cursor (Global)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(10827, "Cursor (Workspace)"))
 };
 const discoverySourceSettingsLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(10698, "Claude Desktop configuration (`claude_desktop_config.json`)")),
-    [DiscoverySource.Windsurf]: ( localize(10699, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
-    [DiscoverySource.CursorGlobal]: ( localize(10700, "Cursor global configuration (`~/.cursor/mcp.json`)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(10701, "Cursor workspace configuration (`.cursor/mcp.json`)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(10828, "Claude Desktop configuration (`claude_desktop_config.json`)")),
+    [DiscoverySource.Windsurf]: ( localize(10829, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
+    [DiscoverySource.CursorGlobal]: ( localize(10830, "Cursor global configuration (`~/.cursor/mcp.json`)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(10831, "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(
-            10702,
+            10832,
             "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(
-                    10703,
+                    10833,
                     "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(
-                        10704,
+                        10834,
                         "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(10705, "Debug the MCP server using Node.js."))
+                                description: ( localize(10835, "Debug the MCP server using Node.js."))
                             }
                         },
                         additionalProperties: false
@@ -104,11 +104,11 @@ const mcpDevModeProps = stdio => ({
                             type: {
                                 type: "string",
                                 enum: ["debugpy"],
-                                description: ( localize(10706, "Debug the MCP server using Python and debugpy."))
+                                description: ( localize(10836, "Debug the MCP server using Python and debugpy."))
                             },
                             debugpyPath: {
                                 type: "string",
-                                description: ( localize(10707, "Path to the debugpy executable."))
+                                description: ( localize(10837, "Path to the debugpy executable."))
                             }
                         },
                         additionalProperties: false
@@ -126,39 +126,39 @@ const mcpStdioServerSchema = {
         type: {
             type: "string",
             enum: ["stdio"],
-            description: ( localize(10708, "The type of the server."))
+            description: ( localize(10838, "The type of the server."))
         },
         sandboxEnabled: {
             type: "boolean",
             default: false,
-            description: ( localize(10709, "Whether to run the server in a sandboxed environment."))
+            description: ( localize(10839, "Whether to run the server in a sandboxed environment."))
         },
         command: {
             type: "string",
-            description: ( localize(10710, "The command to run the server."))
+            description: ( localize(10840, "The command to run the server."))
         },
         cwd: {
             type: "string",
             description: ( localize(
-                10711,
+                10841,
                 "The working directory for the server command. Defaults to the workspace folder when run in a workspace."
             )),
             examples: ["${workspaceFolder}"]
         },
         args: {
             type: "array",
-            description: ( localize(10712, "Arguments passed to the server.")),
+            description: ( localize(10842, "Arguments passed to the server.")),
             items: {
                 type: "string"
             }
         },
         envFile: {
             type: "string",
-            description: ( localize(10713, "Path to a file containing environment variables for the server.")),
+            description: ( localize(10843, "Path to a file containing environment variables for the server.")),
             examples: ["${workspaceFolder}/.env"]
         },
         env: {
-            description: ( localize(10714, "Environment variables passed to the server.")),
+            description: ( localize(10844, "Environment variables passed to the server.")),
             additionalProperties: {
                 anyOf: [{
                     type: "null"
@@ -175,27 +175,27 @@ const mcpStdioServerSchema = {
 const mcpServerSchema = {
     id: mcpSchemaId,
     type: "object",
-    title: ( localize(10715, "Model Context Protocol Servers")),
+    title: ( localize(10845, "Model Context Protocol Servers")),
     allowTrailingCommas: true,
     allowComments: true,
     additionalProperties: false,
     properties: {
         sandbox: {
             description: ( localize(
-                10716,
+                10846,
                 "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(10717, "Network access settings for the sandboxed server.")),
+                    description: ( localize(10847, "Network access settings for the sandboxed server.")),
                     type: "object",
                     additionalProperties: false,
                     properties: {
                         allowedDomains: {
                             description: ( localize(
-                                10718,
+                                10848,
                                 "List of domains that the server is allowed to access. Wildcards are supported, e.g. `*.example.com`."
                             )),
                             type: "array",
@@ -206,7 +206,7 @@ const mcpServerSchema = {
                         },
                         deniedDomains: {
                             description: ( localize(
-                                10719,
+                                10849,
                                 "List of domains that the server is not allowed to access. e.g. `invalid.example.com`."
                             )),
                             type: "array",
@@ -219,7 +219,7 @@ const mcpServerSchema = {
                 },
                 filesystem: {
                     description: ( localize(
-                        10720,
+                        10850,
                         "Filesystem access settings for the sandboxed server. Glob patterns are supported for Mac OS only."
                     )),
                     type: "object",
@@ -227,7 +227,7 @@ const mcpServerSchema = {
                     properties: {
                         denyRead: {
                             description: ( localize(
-                                10721,
+                                10851,
                                 "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",
@@ -238,7 +238,7 @@ const mcpServerSchema = {
                         },
                         allowWrite: {
                             description: ( localize(
-                                10722,
+                                10852,
                                 "List of file paths that the server is allowed to write to. e.g. `~/src/`."
                             )),
                             type: "array",
@@ -249,7 +249,7 @@ const mcpServerSchema = {
                         },
                         denyWrite: {
                             description: ( localize(
-                                10723,
+                                10853,
                                 "List of file paths that the server is not allowed to write to. e.g. `~/src/auth/`."
                             )),
                             type: "array",
@@ -274,22 +274,35 @@ const mcpServerSchema = {
                         type: {
                             type: "string",
                             enum: ["http", "sse"],
-                            description: ( localize(10708, "The type of the server."))
+                            description: ( localize(10838, "The type of the server."))
                         },
                         url: {
                             type: "string",
                             format: "uri",
                             pattern: "^https?:\\/\\/.+",
-                            patternErrorMessage: ( localize(10724, "The URL must start with 'http://' or 'https://'.")),
-                            description: ( localize(10725, "The URL of the Streamable HTTP or SSE endpoint."))
+                            patternErrorMessage: ( localize(10854, "The URL must start with 'http://' or 'https://'.")),
+                            description: ( localize(10855, "The URL of the Streamable HTTP or SSE endpoint."))
                         },
                         headers: {
                             type: "object",
-                            description: ( localize(10726, "Additional headers sent to the server.")),
+                            description: ( localize(10856, "Additional headers sent to the server.")),
                             additionalProperties: {
                                 type: "string"
                             }
                         },
+                        oauth: {
+                            type: "object",
+                            description: ( localize(10857, "OAuth configuration for authenticating with the server.")),
+                            additionalProperties: false,
+                            minProperties: 1,
+                            properties: {
+                                clientId: {
+                                    type: "string",
+                                    minLength: 1,
+                                    description: ( localize(10858, "The OAuth client ID to use when authenticating with the server."))
+                                }
+                            }
+                        },
                         ...mcpDevModeProps(false)
                     }
                 }]
@@ -309,7 +322,7 @@ const mcpContributionPoint = {
     },
     jsonSchema: {
         description: ( localize(
-            10727,
+            10859,
             "Contributes Model Context Protocol servers. Users of this should also use `vscode.lm.registerMcpServerDefinitionProvider`."
         )),
         type: "array",
@@ -330,15 +343,15 @@ const mcpContributionPoint = {
             }],
             properties: {
                 id: {
-                    description: ( localize(10728, "Unique ID for the collection.")),
+                    description: ( localize(10860, "Unique ID for the collection.")),
                     type: "string"
                 },
                 label: {
-                    description: ( localize(10729, "Display name for the collection.")),
+                    description: ( localize(10861, "Display name for the collection.")),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(10730, "Condition which must be true to enable this collection.")),
+                    description: ( localize(10862, "Condition which must be true to enable this collection.")),
                     type: "string"
                 }
             }
@@ -355,7 +368,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
     }
     render(manifest) {
         const mcpServerDefinitionProviders = manifest.contributes?.mcpServerDefinitionProviders ?? [];
-        const headers = [( localize(10731, "ID")), ( localize(10732, "Name"))];
+        const headers = [( localize(10863, "ID")), ( localize(10864, "Name"))];
         const rows = ( mcpServerDefinitionProviders.map(mcpServerDefinitionProvider => {
             return [( new MarkdownString()).appendMarkdown(`\`${mcpServerDefinitionProvider.id}\``), mcpServerDefinitionProvider.label];
         }));
@@ -370,7 +383,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: mcpConfigurationSection,
-    label: ( localize(10733, "MCP Servers")),
+    label: ( localize(10865, "MCP Servers")),
     access: {
         canToggle: false
     },

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

@@ -1,3 +1,4 @@
+import { URI } from "../../../../base/common/uri.js";
 import { IMcpGatewayResult } from "./mcpGatewayService.js";
 export declare const IWorkbenchMcpGatewayService: import("../../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IWorkbenchMcpGatewayService>;
 /**
@@ -19,8 +20,11 @@ export interface IWorkbenchMcpGatewayService {
     * @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).
+    * @param chatSessionResource Optional chat session resource URI to associate with this
+    * gateway. When provided, MCP tool calls made through this gateway will be associated
+    * with the chat session, enabling inline elicitation UI instead of notification fallback.
     * @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>;
+    createGateway(inRemote: boolean, chatSessionResource?: URI): Promise<IMcpGatewayResult | undefined>;
 }

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

@@ -538,7 +538,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         if (cnx.definition.sandboxEnabled) {
             if (!this.showSandboxConfigSuggestionFromPotentialBlocks(cnx, this._potentialSandboxBlocks)) {
                 this._notificationService.warn(( localize(
-                    10770,
+                    10902,
                     "The MCP server {0} could not be started: {1}",
                     cnx.definition.label,
                     error.message
@@ -563,36 +563,36 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 break;
             }
             const options = [{
-                label: ( localize(10771, "Show Output")),
+                label: ( localize(10903, "Show Output")),
                 run: () => this.showOutput()
             }];
             if (cnx.definition.devMode?.debug?.type === "debugpy" && debug) {
                 this._notificationService.prompt(Severity$1.Error, ( localize(
-                    10772,
+                    10904,
                     "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(10773, "View Docs")),
+                    label: ( localize(10905, "View Docs")),
                     run: () => this._openerService.open(( URI.parse("https://aka.ms/vscode-mcp-install/debugpy")))
                 }]);
                 return;
             }
             if (docsLink) {
                 options.push({
-                    label: ( localize(10774, "Install {0}", cnx.launchDefinition.command)),
+                    label: ( localize(10906, "Install {0}", cnx.launchDefinition.command)),
                     run: () => this._openerService.open(( URI.parse(docsLink)))
                 });
             }
             this._notificationService.prompt(Severity$1.Error, ( localize(
-                10775,
+                10907,
                 "The command \"{0}\" needed to run {1} was not found.",
                 cnx.launchDefinition.command,
                 cnx.definition.label
             )), options);
         } else {
             this._notificationService.warn(( localize(
-                10770,
+                10902,
                 "The MCP server {0} could not be started: {1}",
                 cnx.definition.label,
                 error.message
@@ -622,20 +622,20 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         void this._dialogService.confirm({
             type: "warning",
             message: ( localize(
-                10776,
+                10908,
                 "Update sandbox configuration in mcp.json for {0}?",
                 cnx.definition.label
             )),
             detail: suggestion.message,
-            primaryButton: ( localize(10777, "Yes")),
-            cancelButton: ( localize(10778, "No"))
+            primaryButton: ( localize(10909, "Yes")),
+            cancelButton: ( localize(10910, "No"))
         }).then(async result => {
             if (!result.confirmed) {
                 return;
             }
             if (!mcpResource || configTarget === undefined) {
                 this._notificationService.warn(( localize(
-                    10779,
+                    10911,
                     "Couldn't determine where to update sandbox configuration for {0}.",
                     cnx.definition.label
                 )));
@@ -652,14 +652,14 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 if (updated) {
                     this._removePotentialSandboxBlocks(potentialBlocks);
                     this._notificationService.info(( localize(
-                        10780,
+                        10912,
                         "Updated sandbox configuration for {0} in mcp.json. Restart server.",
                         cnx.definition.label
                     )));
                 }
             } catch (e) {
                 this._notificationService.error(( localize(
-                    10781,
+                    10913,
                     "Failed to update sandbox configuration for {0}: {1}",
                     cnx.definition.label,
                     e instanceof Error ? e.message : String(e)
@@ -768,7 +768,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         const validated = [];
         for (const [i, result] of validations.entries()) {
             if ("error" in result) {
-                error += ( localize(10782, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
+                error += ( localize(10914, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
                 for (const message of result.error) {
                     error += `\t- ${message}\n`;
                 }
@@ -1095,7 +1095,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
         notificationService.notify({
             severity: Severity$1.Warning,
             message: ( localize(
-                10783,
+                10915,
                 "MCP server `{0}` has tools with invalid parameters which will be omitted.",
                 serverName
             )),
@@ -1105,7 +1105,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
                     enabled: true,
                     id: "mcpBadSchema.show",
                     tooltip: "",
-                    label: ( localize(10784, "Show")),
+                    label: ( localize(10916, "Show")),
                     run: () => {
                         editorService.openEditor({
                             resource: undefined,

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

@@ -406,6 +406,9 @@ export interface McpServerTransportHTTPAuthentication {
      */
     readonly scopes: string[];
 }
+export interface McpServerTransportHTTPOAuth {
+    readonly clientId?: string;
+}
 /**
  * MCP server launched on the command line which communicated over SSE or Streamable HTTP.
  * https://spec.modelcontextprotocol.io/specification/2024-11-05/basic/transports/#http-with-sse
@@ -418,6 +421,11 @@ export interface McpServerTransportHTTP {
         string,
         string
     ][];
+    readonly oauth?: McpServerTransportHTTPOAuth;
+    /**
+     * @deprecated this was originally used for step-auth auth but a different approach was used instead
+     * so it's effectively dead code.
+     */
     readonly authentication?: McpServerTransportHTTPAuthentication;
 }
 export type McpServerLaunch = McpServerTransportStdio | McpServerTransportHTTP;
@@ -429,6 +437,7 @@ export declare namespace McpServerLaunch {
             string,
             string
         ][];
+        oauth?: McpServerTransportHTTPOAuth;
         authentication?: McpServerTransportHTTPAuthentication;
     } | {
         type: McpServerTransportType.Stdio;

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

@@ -149,6 +149,7 @@ var McpServerLaunch;
                 type: launch.type,
                 uri: URI.revive(launch.uri),
                 headers: launch.headers,
+                oauth: launch.oauth,
                 authentication: launch.authentication
             };
         case McpServerTransportType.Stdio:
@@ -182,13 +183,13 @@ var McpConnectionState;
     McpConnectionState.toString = s => {
         switch (s.state) {
         case Kind.Stopped:
-            return localize(10788, "Stopped");
+            return localize(10920, "Stopped");
         case Kind.Starting:
-            return localize(10789, "Starting");
+            return localize(10921, "Starting");
         case Kind.Running:
-            return localize(10790, "Running");
+            return localize(10922, "Running");
         case Kind.Error:
-            return localize(10791, "Error {0}", s.message);
+            return localize(10923, "Error {0}", s.message);
         default:
             assertNever();
         }

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

@@ -46,7 +46,7 @@ export interface IMcpWorkbenchService {
     uninstall(mcpServer: IWorkbenchMcpServer): Promise<void>;
     getMcpConfigPath(arg: IWorkbenchLocalMcpServer): IMcpConfigPath | undefined;
     getMcpConfigPath(arg: URI): Promise<IMcpConfigPath | undefined>;
-    openSearch(searchValue: string, preserveFoucs?: boolean): Promise<void>;
+    openSearch(searchValue: string, preserveFocus?: boolean): Promise<void>;
     open(extension: IWorkbenchMcpServer | string, options?: IMcpServerEditorOptions): Promise<void>;
 }
 export interface IMcpSamplingService {

package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput.js

@@ -106,7 +106,7 @@ let MergeEditorInput = class MergeEditorInput extends AbstractTextResourceEditor
         return capabilities;
     }
     getName() {
-        return localize(10837, "Merging: {0}", super.getName());
+        return localize(10969, "Merging: {0}", super.getName());
     }
     async resolve() {
         if (!this._inputModel) {
@@ -190,13 +190,13 @@ MergeEditorInput = MergeEditorInput_1 = ( __decorate([( __param(4, IInstantiatio
 function alertFocusedEditor(editor) {
     switch (editor) {
     case "input1":
-        alert(( localize(10838, "Incoming, Left Input")));
+        alert(( localize(10970, "Incoming, Left Input")));
         break;
     case "input2":
-        alert(( localize(10839, "Current, Right Input")));
+        alert(( localize(10971, "Current, Right Input")));
         break;
     case "result":
-        alert(( localize(10840, "Merge Result")));
+        alert(( localize(10972, "Merge Result")));
         break;
     }
 }