@codingame/monaco-vscode-api 34.1.3 → 35.0.0

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(11458, "Claude Desktop")),
-    [DiscoverySource.Windsurf]: ( localize(11459, "Windsurf")),
-    [DiscoverySource.CursorGlobal]: ( localize(11460, "Cursor (Global)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(11461, "Cursor (Workspace)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(12089, "Claude Desktop")),
+    [DiscoverySource.Windsurf]: ( localize(12090, "Windsurf")),
+    [DiscoverySource.CursorGlobal]: ( localize(12091, "Cursor (Global)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(12092, "Cursor (Workspace)"))
 };
 const discoverySourceSettingsLabel = {
-    [DiscoverySource.ClaudeDesktop]: ( localize(11462, "Claude Desktop configuration (`claude_desktop_config.json`)")),
-    [DiscoverySource.Windsurf]: ( localize(11463, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
-    [DiscoverySource.CursorGlobal]: ( localize(11464, "Cursor global configuration (`~/.cursor/mcp.json`)")),
-    [DiscoverySource.CursorWorkspace]: ( localize(11465, "Cursor workspace configuration (`.cursor/mcp.json`)"))
+    [DiscoverySource.ClaudeDesktop]: ( localize(12093, "Claude Desktop configuration (`claude_desktop_config.json`)")),
+    [DiscoverySource.Windsurf]: ( localize(12094, "Windsurf configurations (`~/.codeium/windsurf/mcp_config.json`)")),
+    [DiscoverySource.CursorGlobal]: ( localize(12095, "Cursor global configuration (`~/.cursor/mcp.json`)")),
+    [DiscoverySource.CursorWorkspace]: ( localize(12096, "Cursor workspace configuration (`.cursor/mcp.json`)"))
 };
 const mcpConfigurationSection = "mcp";
 const mcpDiscoverySection = "chat.mcp.discovery.enabled";
@@ -62,7 +62,7 @@ const mcpDevModeProps = stdio => ({
     dev: {
         type: "object",
         markdownDescription: ( localize(
-            11466,
+            12097,
             "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: [{
@@ -74,7 +74,7 @@ const mcpDevModeProps = stdio => ({
         properties: {
             watch: {
                 description: ( localize(
-                    11467,
+                    12098,
                     "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"],
@@ -90,7 +90,7 @@ const mcpDevModeProps = stdio => ({
             ...(stdio && {
                 debug: {
                     markdownDescription: ( localize(
-                        11468,
+                        12099,
                         "If set, debugs the MCP server using the given runtime as it's started."
                     )),
                     oneOf: [{
@@ -100,7 +100,7 @@ const mcpDevModeProps = stdio => ({
                             type: {
                                 type: "string",
                                 enum: ["node"],
-                                description: ( localize(11469, "Debug the MCP server using Node.js."))
+                                description: ( localize(12100, "Debug the MCP server using Node.js."))
                             }
                         },
                         additionalProperties: false
@@ -111,11 +111,11 @@ const mcpDevModeProps = stdio => ({
                             type: {
                                 type: "string",
                                 enum: ["debugpy"],
-                                description: ( localize(11470, "Debug the MCP server using Python and debugpy."))
+                                description: ( localize(12101, "Debug the MCP server using Python and debugpy."))
                             },
                             debugpyPath: {
                                 type: "string",
-                                description: ( localize(11471, "Path to the debugpy executable."))
+                                description: ( localize(12102, "Path to the debugpy executable."))
                             }
                         },
                         additionalProperties: false
@@ -133,39 +133,39 @@ const mcpStdioServerSchema = {
         type: {
             type: "string",
             enum: ["stdio"],
-            description: ( localize(11472, "The type of the server."))
+            description: ( localize(12103, "The type of the server."))
         },
         sandboxEnabled: {
             type: "boolean",
             default: false,
-            description: ( localize(11473, "Whether to run the server in a sandboxed environment."))
+            description: ( localize(12104, "Whether to run the server in a sandboxed environment."))
         },
         command: {
             type: "string",
-            description: ( localize(11474, "The command to run the server."))
+            description: ( localize(12105, "The command to run the server."))
         },
         cwd: {
             type: "string",
             description: ( localize(
-                11475,
+                12106,
                 "The working directory for the server command. Defaults to the workspace folder when run in a workspace."
             )),
             examples: ["${workspaceFolder}"]
         },
         args: {
             type: "array",
-            description: ( localize(11476, "Arguments passed to the server.")),
+            description: ( localize(12107, "Arguments passed to the server.")),
             items: {
                 type: "string"
             }
         },
         envFile: {
             type: "string",
-            description: ( localize(11477, "Path to a file containing environment variables for the server.")),
+            description: ( localize(12108, "Path to a file containing environment variables for the server.")),
             examples: ["${workspaceFolder}/.env"]
         },
         env: {
-            description: ( localize(11478, "Environment variables passed to the server.")),
+            description: ( localize(12109, "Environment variables passed to the server.")),
             additionalProperties: {
                 anyOf: [{
                     type: "null"
@@ -182,27 +182,27 @@ const mcpStdioServerSchema = {
 const mcpServerSchema = {
     id: mcpSchemaId,
     type: "object",
-    title: ( localize(11479, "Model Context Protocol Servers")),
+    title: ( localize(12110, "Model Context Protocol Servers")),
     allowTrailingCommas: true,
     allowComments: true,
     additionalProperties: false,
     properties: {
         sandbox: {
             description: ( localize(
-                11480,
+                12111,
                 "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(11481, "Network access settings for the sandboxed server.")),
+                    description: ( localize(12112, "Network access settings for the sandboxed server.")),
                     type: "object",
                     additionalProperties: false,
                     properties: {
                         allowedDomains: {
                             description: ( localize(
-                                11482,
+                                12113,
                                 "List of domains that the server is allowed to access. Wildcards are supported, e.g. `*.example.com`."
                             )),
                             type: "array",
@@ -213,7 +213,7 @@ const mcpServerSchema = {
                         },
                         deniedDomains: {
                             description: ( localize(
-                                11483,
+                                12114,
                                 "List of domains that the server is not allowed to access. e.g. `invalid.example.com`."
                             )),
                             type: "array",
@@ -226,7 +226,7 @@ const mcpServerSchema = {
                 },
                 filesystem: {
                     description: ( localize(
-                        11484,
+                        12115,
                         "Filesystem access settings for the sandboxed server. Glob patterns are supported for Mac OS only."
                     )),
                     type: "object",
@@ -234,7 +234,7 @@ const mcpServerSchema = {
                     properties: {
                         denyRead: {
                             description: ( localize(
-                                11485,
+                                12116,
                                 "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",
@@ -245,7 +245,7 @@ const mcpServerSchema = {
                         },
                         allowWrite: {
                             description: ( localize(
-                                11486,
+                                12117,
                                 "List of file paths that the server is allowed to write to. e.g. `~/src/`."
                             )),
                             type: "array",
@@ -256,7 +256,7 @@ const mcpServerSchema = {
                         },
                         denyWrite: {
                             description: ( localize(
-                                11487,
+                                12118,
                                 "List of file paths that the server is not allowed to write to. e.g. `~/src/auth/`."
                             )),
                             type: "array",
@@ -281,25 +281,25 @@ const mcpServerSchema = {
                         type: {
                             type: "string",
                             enum: ["http", "sse"],
-                            description: ( localize(11472, "The type of the server."))
+                            description: ( localize(12103, "The type of the server."))
                         },
                         url: {
                             type: "string",
                             format: "uri",
                             pattern: "^https?:\\/\\/.+",
-                            patternErrorMessage: ( localize(11488, "The URL must start with 'http://' or 'https://'.")),
-                            description: ( localize(11489, "The URL of the Streamable HTTP or SSE endpoint."))
+                            patternErrorMessage: ( localize(12119, "The URL must start with 'http://' or 'https://'.")),
+                            description: ( localize(12120, "The URL of the Streamable HTTP or SSE endpoint."))
                         },
                         headers: {
                             type: "object",
-                            description: ( localize(11490, "Additional headers sent to the server.")),
+                            description: ( localize(12121, "Additional headers sent to the server.")),
                             additionalProperties: {
                                 type: "string"
                             }
                         },
                         oauth: {
                             type: "object",
-                            description: ( localize(11491, "OAuth configuration for authenticating with the server.")),
+                            description: ( localize(12122, "OAuth configuration for authenticating with the server.")),
                             additionalProperties: false,
                             minProperties: 1,
                             properties: {
@@ -307,7 +307,7 @@ const mcpServerSchema = {
                                     type: "string",
                                     minLength: 1,
                                     markdownDescription: ( localize(
-                                        11492,
+                                        12123,
                                         "The OAuth client ID to use when authenticating with the server. When `enterpriseManaged` is `true`, this is the **resource** authorization server's client ID (the client trusted by the protected resource), not the IdP's. To set the matching client secret, use the *Set Client Secret* code lens above this field — secrets are stored in the OS secret store, not in this file."
                                     ))
                                 },
@@ -315,7 +315,7 @@ const mcpServerSchema = {
                                     type: "boolean",
                                     default: false,
                                     markdownDescription: ( localize(
-                                        11493,
+                                        12124,
                                         "(Preview) When set to `true`, this MCP server authenticates through the SSO issuer configured by `#mcp.enterpriseManagedAuth.idp#` using OAuth Identity Assertion Authorization Grant (ID-JAG). After a one-time sign-in, subsequent enterprise-managed servers connect silently. The IdP issuer and client credentials are read from the `#mcp.enterpriseManagedAuth.idp#` setting; the `clientId` on this server entry is passed to the resource authorization server."
                                     ))
                                 }
@@ -340,7 +340,7 @@ const mcpContributionPoint = {
     },
     jsonSchema: {
         description: ( localize(
-            11494,
+            12125,
             "Contributes Model Context Protocol servers. Users of this should also use `vscode.lm.registerMcpServerDefinitionProvider`."
         )),
         type: "array",
@@ -361,15 +361,15 @@ const mcpContributionPoint = {
             }],
             properties: {
                 id: {
-                    description: ( localize(11495, "Unique ID for the collection.")),
+                    description: ( localize(12126, "Unique ID for the collection.")),
                     type: "string"
                 },
                 label: {
-                    description: ( localize(11496, "Display name for the collection.")),
+                    description: ( localize(12127, "Display name for the collection.")),
                     type: "string"
                 },
                 when: {
-                    description: ( localize(11497, "Condition which must be true to enable this collection.")),
+                    description: ( localize(12128, "Condition which must be true to enable this collection.")),
                     type: "string"
                 }
             }
@@ -386,7 +386,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
     }
     render(manifest) {
         const mcpServerDefinitionProviders = manifest.contributes?.mcpServerDefinitionProviders ?? [];
-        const headers = [( localize(11498, "ID")), ( localize(11499, "Name"))];
+        const headers = [( localize(12129, "ID")), ( localize(12130, "Name"))];
         const rows = ( mcpServerDefinitionProviders.map(mcpServerDefinitionProvider => {
             return [( new MarkdownString()).appendMarkdown(`\`${mcpServerDefinitionProvider.id}\``), mcpServerDefinitionProvider.label];
         }));
@@ -401,7 +401,7 @@ class McpServerDefinitionsProviderRenderer extends Disposable {
 }
 ( Registry.as(Extensions.ExtensionFeaturesRegistry)).registerExtensionFeature({
     id: mcpConfigurationSection,
-    label: ( localize(11500, "MCP Servers")),
+    label: ( localize(12131, "MCP Servers")),
     access: {
         canToggle: false
     },

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

@@ -579,7 +579,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         if (cnx.definition.sandboxEnabled) {
             if (!this.showSandboxConfigSuggestionFromPotentialBlocks(cnx, this._potentialSandboxBlocks)) {
                 this._notificationService.warn(( localize(
-                    11537,
+                    12168,
                     "The MCP server {0} could not be started: {1}",
                     cnx.definition.label,
                     error.message
@@ -604,36 +604,36 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 break;
             }
             const options = [{
-                label: ( localize(11538, "Show Output")),
+                label: ( localize(12169, "Show Output")),
                 run: () => this.showOutput()
             }];
             if (cnx.definition.devMode?.debug?.type === "debugpy" && debug) {
                 this._notificationService.prompt(Severity$1.Error, ( localize(
-                    11539,
+                    12170,
                     "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(11540, "View Docs")),
+                    label: ( localize(12171, "View Docs")),
                     run: () => this._openerService.open(( URI.parse("https://aka.ms/vscode-mcp-install/debugpy")))
                 }]);
                 return;
             }
             if (docsLink) {
                 options.push({
-                    label: ( localize(11541, "Install {0}", cnx.launchDefinition.command)),
+                    label: ( localize(12172, "Install {0}", cnx.launchDefinition.command)),
                     run: () => this._openerService.open(( URI.parse(docsLink)))
                 });
             }
             this._notificationService.prompt(Severity$1.Error, ( localize(
-                11542,
+                12173,
                 "The command \"{0}\" needed to run {1} was not found.",
                 cnx.launchDefinition.command,
                 cnx.definition.label
             )), options);
         } else {
             this._notificationService.warn(( localize(
-                11537,
+                12168,
                 "The MCP server {0} could not be started: {1}",
                 cnx.definition.label,
                 error.message
@@ -663,20 +663,20 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         void this._dialogService.confirm({
             type: "warning",
             message: ( localize(
-                11543,
+                12174,
                 "Update sandbox configuration in mcp.json for {0}?",
                 cnx.definition.label
             )),
             detail: suggestion.message,
-            primaryButton: ( localize(11544, "Yes")),
-            cancelButton: ( localize(11545, "No"))
+            primaryButton: ( localize(12175, "Yes")),
+            cancelButton: ( localize(12176, "No"))
         }).then(async result => {
             if (!result.confirmed) {
                 return;
             }
             if (!mcpResource || configTarget === undefined) {
                 this._notificationService.warn(( localize(
-                    11546,
+                    12177,
                     "Couldn't determine where to update sandbox configuration for {0}.",
                     cnx.definition.label
                 )));
@@ -693,14 +693,14 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 if (updated) {
                     this._removePotentialSandboxBlocks(potentialBlocks);
                     this._notificationService.info(( localize(
-                        11547,
+                        12178,
                         "Updated sandbox configuration for {0} in mcp.json. Restart server.",
                         cnx.definition.label
                     )));
                 }
             } catch (e) {
                 this._notificationService.error(( localize(
-                    11548,
+                    12179,
                     "Failed to update sandbox configuration for {0}: {1}",
                     cnx.definition.label,
                     e instanceof Error ? e.message : String(e)
@@ -809,7 +809,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         const validated = [];
         for (const [i, result] of validations.entries()) {
             if ("error" in result) {
-                error += ( localize(11549, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
+                error += ( localize(12180, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
                 for (const message of result.error) {
                     error += `\t- ${message}\n`;
                 }
@@ -1142,7 +1142,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
         notificationService.notify({
             severity: Severity$1.Warning,
             message: ( localize(
-                11550,
+                12181,
                 "MCP server `{0}` has tools with invalid parameters which will be omitted.",
                 serverName
             )),
@@ -1152,7 +1152,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
                     enabled: true,
                     id: "mcpBadSchema.show",
                     tooltip: "",
-                    label: ( localize(11551, "Show")),
+                    label: ( localize(12182, "Show")),
                     run: () => {
                         editorService.openEditor({
                             resource: undefined,

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

@@ -22,6 +22,13 @@ import { MCP } from "./modelContextProtocol.js";
 import { UriTemplate } from "../../../../base/common/uriTemplate.js";
 import { IMcpWorkbenchService } from "./mcpTypes.service.js";
 export declare const extensionMcpCollectionPrefix = "ext.";
+/**
+ * Prefix of the collection id used for MCP servers configured via the various
+ * `mcp.json`-style config files (user, remote user, workspace, and
+ * `.vscode/mcp.json` workspace-folder configs). The suffix is the
+ * {@link IMcpConfigPath.id} of the originating config path.
+ */
+export declare const MCP_CONFIGURATION_COLLECTION_ID_PREFIX = "mcp.config.";
 export declare function extensionPrefixedIdentifier(identifier: ExtensionIdentifier, id: string): string;
 /**
  * An McpCollection contains McpServers. There may be multiple collections for
@@ -86,6 +93,20 @@ export declare namespace McpCollectionDefinition {
         readonly configTarget: ConfigurationTarget;
     }
     function equals(a: McpCollectionDefinition, b: McpCollectionDefinition): boolean;
+    /**
+     * Returns `true` when the collection was discovered from the workspace (its
+     * config target is the workspace or a workspace folder). This is
+     * intentionally based on the config target and not the storage scope:
+     * extension-contributed collections use a workspace storage scope but are
+     * configured at the user level, so they are not workspace-discovered.
+     */
+    function isWorkspaceDiscovered(collection: McpCollectionDefinition): boolean;
+    /**
+     * Returns `true` when the collection originates from a `.vscode/mcp.json`
+     * workspace-folder config, identified by its collection id prefix (the
+     * shared `mcp.config.` prefix plus the workspace-folder config id).
+     */
+    function isVscodeMcpJson(collection: McpCollectionDefinition): boolean;
 }
 export interface McpServerDefinition {
     /** Globally-unique, stable ID for this definition */
@@ -355,15 +376,34 @@ export declare enum McpToolVisibility {
 /**
  * Serializable data for MCP App UI rendering.
  * This contains all the information needed to render an MCP App webview.
+ *
+ * The transport for the App's sub-RPCs (`tools/call`, `resources/read`,
+ * `sampling/createMessage`, …) is determined by the discriminator:
+ *
+ * - `local`: resolves the MCP server via {@link IMcpService} from
+ *   `serverDefinitionId` + `collectionId`. Used for locally-configured
+ *   MCP servers.
+ * - `agentHost`: routes through {@link IAgentHostService.handleMcpRequest}
+ *   on the AHP `mcp://` side `channel`. Used for MCP servers owned by
+ *   an agent host.
  */
-export interface IMcpToolCallUIData {
+export type IMcpToolCallUIData = {
+    readonly kind: "local";
     /** URI of the UI resource for rendering (e.g., "ui://weather-server/dashboard") */
     readonly resourceUri: string;
     /** Reference to the server definition for reconnection */
     readonly serverDefinitionId: string;
     /** Reference to the collection containing the server */
     readonly collectionId: string;
-}
+} | {
+    readonly kind: "agentHost";
+    /** URI of the UI resource for rendering (e.g., "ui://weather-server/dashboard") */
+    readonly resourceUri: string;
+    /** AHP `mcp://` channel URI for the originating server. */
+    readonly channel: string;
+    /** Stable identifier for the originating server (used as webview origin key). */
+    readonly serverId: string;
+};
 export interface IMcpTool {
     readonly id: string;
     /** Name for #referencing in chat */

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

@@ -8,14 +8,17 @@ import { equals } from '../../../../base/common/objects.js';
 import '../../../../base/common/observableInternal/index.js';
 import { URI } from '../../../../base/common/uri.js';
 import { localize } from '../../../../nls.js';
+import { ConfigurationTarget } from '../../../../platform/configuration/common/configuration.js';
 import { RawContextKey } from '../../../../platform/contextkey/common/contextkey.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { McpGalleryManifestStatus } from '../../../../platform/mcp/common/mcpGalleryManifest.js';
+import { WORKSPACE_FOLDER_CONFIG_ID_PREFIX } from '../../../services/mcp/common/mcpWorkbenchManagementService.js';
 import { MCP } from '../../../../platform/mcp/common/modelContextProtocol.js';
 import { IMcpWorkbenchService } from './mcpTypes.service.js';
 import { ObservableMap } from '../../../../base/common/observableInternal/map.js';
 
 const extensionMcpCollectionPrefix = "ext.";
+const MCP_CONFIGURATION_COLLECTION_ID_PREFIX = "mcp.config.";
 function extensionPrefixedIdentifier(identifier, id) {
     return ExtensionIdentifier.toKey(identifier) + "/" + id;
 }
@@ -35,6 +38,16 @@ var McpCollectionDefinition;
         return a.id === b.id && a.remoteAuthority === b.remoteAuthority && a.label === b.label && a.trustBehavior === b.trustBehavior && equals(a.sandbox, b.sandbox);
     }
     McpCollectionDefinition.equals = equals$1;
+    function isWorkspaceDiscovered(collection) {
+        return collection.configTarget === ConfigurationTarget.WORKSPACE || collection.configTarget === ConfigurationTarget.WORKSPACE_FOLDER;
+    }
+    McpCollectionDefinition.isWorkspaceDiscovered = isWorkspaceDiscovered;
+    function isVscodeMcpJson(collection) {
+        return collection.id.startsWith(
+            `${MCP_CONFIGURATION_COLLECTION_ID_PREFIX}${WORKSPACE_FOLDER_CONFIG_ID_PREFIX}`
+        );
+    }
+    McpCollectionDefinition.isVscodeMcpJson = isVscodeMcpJson;
 })(McpCollectionDefinition || (McpCollectionDefinition = {}));
 var McpServerStaticToolAvailability;
 (function(McpServerStaticToolAvailability) {
@@ -186,13 +199,13 @@ var McpConnectionState;
     McpConnectionState.toString = s => {
         switch (s.state) {
         case Kind.Stopped:
-            return localize(11555, "Stopped");
+            return localize(12186, "Stopped");
         case Kind.Starting:
-            return localize(11556, "Starting");
+            return localize(12187, "Starting");
         case Kind.Running:
-            return localize(11557, "Running");
+            return localize(12188, "Running");
         case Kind.Error:
-            return localize(11558, "Error {0}", s.message);
+            return localize(12189, "Error {0}", s.message);
         default:
             assertNever();
         }
@@ -363,4 +376,4 @@ var ElicitationKind;
 })(ElicitationKind || (ElicitationKind = {}));
 const McpToolResourceLinkMimeType = "application/vnd.code.resource-link";
 
-export { ElicitationKind, HasInstalledMcpServersContext, IAutostartResult, InstalledMcpServersViewId, LazyCollectionState, McpCapability, McpCollectionDefinition, McpCollectionSortOrder, McpConnectionFailedError, McpConnectionState, McpError, McpResourceURI, McpServerCacheState, McpServerContainers, McpServerDefinition, McpServerDefinitionVariableReplacement, McpServerEditorTab, McpServerEnablementState, McpServerInstallState, McpServerLaunch, McpServerStaticToolAvailability, McpServerTransportType, McpServerTrust, McpServersGalleryStatusContext, McpStartServerInteraction, McpToolName, McpToolResourceLinkMimeType, McpToolVisibility, MpcResponseError, UserInteractionRequiredError, extensionMcpCollectionPrefix, extensionPrefixedIdentifier, isMcpResourceTemplate, mcpOAuthClientSecretStorageKey, mcpPromptPrefix, mcpPromptReplaceSpecialChars };
+export { ElicitationKind, HasInstalledMcpServersContext, IAutostartResult, InstalledMcpServersViewId, LazyCollectionState, MCP_CONFIGURATION_COLLECTION_ID_PREFIX, McpCapability, McpCollectionDefinition, McpCollectionSortOrder, McpConnectionFailedError, McpConnectionState, McpError, McpResourceURI, McpServerCacheState, McpServerContainers, McpServerDefinition, McpServerDefinitionVariableReplacement, McpServerEditorTab, McpServerEnablementState, McpServerInstallState, McpServerLaunch, McpServerStaticToolAvailability, McpServerTransportType, McpServerTrust, McpServersGalleryStatusContext, McpStartServerInteraction, McpToolName, McpToolResourceLinkMimeType, McpToolVisibility, MpcResponseError, UserInteractionRequiredError, extensionMcpCollectionPrefix, extensionPrefixedIdentifier, isMcpResourceTemplate, mcpOAuthClientSecretStorageKey, mcpPromptPrefix, mcpPromptReplaceSpecialChars };

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(11606, "Merging: {0}", super.getName());
+        return localize(12237, "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(11607, "Incoming, Left Input")));
+        alert(( localize(12238, "Incoming, Left Input")));
         break;
     case "input2":
-        alert(( localize(11608, "Current, Right Input")));
+        alert(( localize(12239, "Current, Right Input")));
         break;
     case "result":
-        alert(( localize(11609, "Merge Result")));
+        alert(( localize(12240, "Merge Result")));
         break;
     }
 }