@codingame/monaco-vscode-api 36.2.6 → 37.0.0

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

@@ -18,6 +18,7 @@ import { localize } from '../../../../nls.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 { IAllowedMcpServersService } from '../../../../platform/mcp/common/mcpManagement.service.js';
 import { ILoggerService } from '../../../../platform/log/common/log.service.js';
 import '../../../../platform/notification/common/notification.js';
 import { INotificationService } from '../../../../platform/notification/common/notification.service.js';
@@ -26,6 +27,7 @@ import { StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IStorageService } from '../../../../platform/storage/common/storage.service.js';
 import { ITelemetryService } from '../../../../platform/telemetry/common/telemetry.service.js';
 import { IWorkspaceContextService } from '../../../../platform/workspace/common/workspace.service.js';
+import { ConfigurationResolverExpression } from '../../../services/configurationResolver/common/configurationResolverExpression.js';
 import { IEditorService } from '../../../services/editor/common/editorService.service.js';
 import { IWorkbenchEnvironmentService } from '../../../services/environment/common/environmentService.service.js';
 import { IExtensionService } from '../../../services/extensions/common/extensions.service.js';
@@ -37,7 +39,7 @@ import { McpIcons, parseAndValidateMcpIcon } from './mcpIcons.js';
 import { IMcpRegistry } from './mcpRegistryTypes.service.js';
 import { IMcpSandboxService } from './mcpSandboxService.service.js';
 import { McpTaskManager } from './mcpTaskManager.js';
-import { McpToolName, McpConnectionState, McpConnectionFailedError, McpServerCacheState, McpServerStaticToolAvailability, extensionMcpCollectionPrefix, UserInteractionRequiredError, McpServerTransportType, McpToolVisibility, mcpPromptReplaceSpecialChars, McpCapability, MpcResponseError, ElicitationKind, McpResourceURI } from './mcpTypes.js';
+import { McpToolName, McpConnectionState, McpConnectionFailedError, McpServerCacheState, McpServerStaticToolAvailability, McpServerTransportType, extensionMcpCollectionPrefix, UserInteractionRequiredError, McpToolVisibility, mcpPromptReplaceSpecialChars, McpCapability, MpcResponseError, ElicitationKind, McpResourceURI } from './mcpTypes.js';
 import { IMcpSamplingService, IMcpElicitationService } from './mcpTypes.service.js';
 import { MCP } from '../../../../platform/mcp/common/modelContextProtocol.js';
 import { UriTemplate } from '../../../../base/common/uriTemplate.js';
@@ -192,8 +194,17 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         let d;
         const callPromise = ( new Promise((resolve, reject) => {
             d = autorun(reader => {
+                if (ranOnce) {
+                    return;
+                }
                 const connection = server.connection.read(reader);
-                if (!connection || ranOnce) {
+                if (!connection) {
+                    const state = server.connectionState.read(reader);
+                    if (state.state === McpConnectionState.Kind.Error) {
+                        reject(( new McpConnectionFailedError(`MCP server could not be started: ${state.message}`)));
+                    } else if (state.state === McpConnectionState.Kind.Stopped) {
+                        reject(( new McpConnectionFailedError("MCP server has stopped")));
+                    }
                     return;
                 }
                 const handler = connection.handler.read(reader);
@@ -219,10 +230,10 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         return this._capabilities.value;
     }
     get tools() {
-        return this._tools.value;
+        return this._gatedTools;
     }
     get prompts() {
-        return this._prompts.value;
+        return this._gatedPrompts;
     }
     get serverMetadata() {
         return this._serverMetadata.value;
@@ -247,6 +258,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         prefixGenerator,
         enablementModel,
         _mcpRegistry,
+        _allowedMcpServersService,
         workspacesService,
         _extensionService,
         _loggerService,
@@ -267,6 +279,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         this._requiresExtensionActivation = _requiresExtensionActivation;
         this._primitiveCache = _primitiveCache;
         this._mcpRegistry = _mcpRegistry;
+        this._allowedMcpServersService = _allowedMcpServersService;
         this._extensionService = _extensionService;
         this._loggerService = _loggerService;
         this._outputService = _outputService;
@@ -283,9 +296,17 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         this._connectionSequencer = ( new Sequencer());
         this._connection = this._register(disposableObservableValue(this, undefined));
         this.connection = this._connection;
-        this.connectionState = derived(reader => this._connection.read(reader)?.state.read(reader) ?? {
-            state: McpConnectionState.Kind.Stopped
-        });
+        this.connectionState = derived(
+            reader => this._policyBlock.read(reader) ?? this._connection.read(reader)?.state.read(reader) ?? {
+                state: McpConnectionState.Kind.Stopped
+            }
+        );
+        this._gatedTools = derived(
+            reader => this._policyBlock.read(reader) ? [] : this._tools.value.read(reader)
+        );
+        this._gatedPrompts = derived(
+            reader => this._policyBlock.read(reader) ? [] : this._prompts.value.read(reader)
+        );
         this.cacheState = derived(reader => {
             const currentNonce = () => this._fullDefinitions.read(reader)?.server?.cacheNonce;
             const stateWhenServingFromCache = () => {
@@ -321,6 +342,32 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         this.collection = initialCollection;
         this._fullDefinitions = this._mcpRegistry.getServerDefinition(this.collection, this.definition);
         this.enablement = derived(r => enablementModel.readEnabled(definition.id, r));
+        this._policyEpoch = observableFromEvent(
+            this,
+            this._allowedMcpServersService.onDidChangeAllowedMcpServers,
+            () => undefined
+        );
+        this._policyBlock = derived(this, reader => {
+            this._policyEpoch.read(reader);
+            const connection = this._connection.read(reader);
+            if (connection) {
+                return this._evaluatePolicy(this._identityFromLaunch(connection.launchDefinition));
+            }
+            const launch = this._fullDefinitions.read(reader).server?.launch;
+            if (!launch) {
+                return undefined;
+            }
+            const identity = this._identityFromLaunch(launch);
+            if (McpServer_1._hasUnresolvedVariables(identity)) {
+                return undefined;
+            }
+            return this._evaluatePolicy(identity);
+        });
+        this._register(autorun(reader => {
+            if (this._policyBlock.read(reader) && this._connection.read(undefined)) {
+                this._connection.set(undefined, undefined);
+            }
+        }));
         this._loggerId = `mcpServer.${definition.id}`;
         this._logger = this._register(_loggerService.createLogger(this._loggerId, {
             hidden: true,
@@ -436,6 +483,39 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
             return ( templates.map(t => ( new McpResourceTemplate(this, t, McpIcons.fromParsed(this._parseIcons(t))))));
         }, token);
     }
+    _identityFromLaunch(launch) {
+        if (launch?.type === McpServerTransportType.HTTP) {
+            return {
+                name: this.definition.label,
+                url: ( launch.uri.toString(true))
+            };
+        }
+        if (launch?.type === McpServerTransportType.Stdio) {
+            return typeof launch.command === "string" ? {
+                name: this.definition.label,
+                command: [
+                    launch.command,
+                    ...(launch.args ?? []).filter(arg => typeof arg === "string")
+                ]
+            } : {
+                name: this.definition.label
+            };
+        }
+        return {
+            name: this.definition.label
+        };
+    }
+    _evaluatePolicy(identity) {
+        const allowed = this._allowedMcpServersService.isServerAllowed(identity);
+        return allowed === true ? undefined : {
+            state: McpConnectionState.Kind.Error,
+            message: allowed.value
+        };
+    }
+    static _hasUnresolvedVariables(identity) {
+        const variableMarker = ConfigurationResolverExpression.VARIABLE_LHS;
+        return !!identity.url?.includes(variableMarker) || !!identity.command?.some(arg => arg.includes(variableMarker));
+    }
     start(
         {
             interaction,
@@ -449,6 +529,10 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
             s: "unknown"
         });
         return this._connectionSequencer.queue(async () => {
+            const preStartBlock = this._policyBlock.get();
+            if (preStartBlock) {
+                return preStartBlock;
+            }
             const activationEvent = mcpActivationEvent(this.collection.id.slice(extensionMcpCollectionPrefix.length));
             if (this._requiresExtensionActivation && !this._extensionService.activationEventIsDone(activationEvent)) {
                 await this._extensionService.activateByEvent(activationEvent);
@@ -504,6 +588,11 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                     this.showOutput();
                 }
             }
+            const resolvedBlock = this._policyBlock.get();
+            if (resolvedBlock) {
+                this._connection.set(undefined, undefined);
+                return resolvedBlock;
+            }
             this._potentialSandboxBlocks.length = 0;
             const start = Date.now();
             let state = await connection.start({
@@ -579,7 +668,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         if (cnx.definition.sandboxEnabled) {
             if (!this.showSandboxConfigSuggestionFromPotentialBlocks(cnx, this._potentialSandboxBlocks)) {
                 this._notificationService.warn(( localize(
-                    12168,
+                    13929,
                     "The MCP server {0} could not be started: {1}",
                     cnx.definition.label,
                     error.message
@@ -604,36 +693,36 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 break;
             }
             const options = [{
-                label: ( localize(12169, "Show Output")),
+                label: ( localize(13930, "Show Output")),
                 run: () => this.showOutput()
             }];
             if (cnx.definition.devMode?.debug?.type === "debugpy" && debug) {
                 this._notificationService.prompt(Severity$1.Error, ( localize(
-                    12170,
+                    13931,
                     "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(12171, "View Docs")),
+                    label: ( localize(13932, "View Docs")),
                     run: () => this._openerService.open(( URI.parse("https://aka.ms/vscode-mcp-install/debugpy")))
                 }]);
                 return;
             }
             if (docsLink) {
                 options.push({
-                    label: ( localize(12172, "Install {0}", cnx.launchDefinition.command)),
+                    label: ( localize(13933, "Install {0}", cnx.launchDefinition.command)),
                     run: () => this._openerService.open(( URI.parse(docsLink)))
                 });
             }
             this._notificationService.prompt(Severity$1.Error, ( localize(
-                12173,
+                13934,
                 "The command \"{0}\" needed to run {1} was not found.",
                 cnx.launchDefinition.command,
                 cnx.definition.label
             )), options);
         } else {
             this._notificationService.warn(( localize(
-                12168,
+                13929,
                 "The MCP server {0} could not be started: {1}",
                 cnx.definition.label,
                 error.message
@@ -663,20 +752,20 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         void this._dialogService.confirm({
             type: "warning",
             message: ( localize(
-                12174,
+                13935,
                 "Update sandbox configuration in mcp.json for {0}?",
                 cnx.definition.label
             )),
             detail: suggestion.message,
-            primaryButton: ( localize(12175, "Yes")),
-            cancelButton: ( localize(12176, "No"))
+            primaryButton: ( localize(13936, "Yes")),
+            cancelButton: ( localize(13937, "No"))
         }).then(async result => {
             if (!result.confirmed) {
                 return;
             }
             if (!mcpResource || configTarget === undefined) {
                 this._notificationService.warn(( localize(
-                    12177,
+                    13938,
                     "Couldn't determine where to update sandbox configuration for {0}.",
                     cnx.definition.label
                 )));
@@ -693,14 +782,14 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
                 if (updated) {
                     this._removePotentialSandboxBlocks(potentialBlocks);
                     this._notificationService.info(( localize(
-                        12178,
+                        13939,
                         "Updated sandbox configuration for {0} in mcp.json. Restart server.",
                         cnx.definition.label
                     )));
                 }
             } catch (e) {
                 this._notificationService.error(( localize(
-                    12179,
+                    13940,
                     "Failed to update sandbox configuration for {0}: {1}",
                     cnx.definition.label,
                     e instanceof Error ? e.message : String(e)
@@ -809,7 +898,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         const validated = [];
         for (const [i, result] of validations.entries()) {
             if ("error" in result) {
-                error += ( localize(12180, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
+                error += ( localize(13941, "Tool `{0}` has invalid JSON parameters:", tools[i].name)) + "\n";
                 for (const message of result.error) {
                     error += `\t- ${message}\n`;
                 }
@@ -939,7 +1028,7 @@ let McpServer = McpServer_1 = class McpServer extends Disposable {
         });
     }
 };
-McpServer = McpServer_1 = ( __decorate([( __param(7, IMcpRegistry)), ( __param(8, IWorkspaceContextService)), ( __param(9, IExtensionService)), ( __param(10, ILoggerService)), ( __param(11, IOutputService)), ( __param(12, ITelemetryService)), ( __param(13, ICommandService)), ( __param(14, IInstantiationService)), ( __param(15, IDialogService)), ( __param(16, INotificationService)), ( __param(17, IOpenerService)), ( __param(18, IMcpSamplingService)), ( __param(19, IMcpElicitationService)), ( __param(20, IMcpSandboxService)), ( __param(21, IWorkbenchEnvironmentService))], McpServer));
+McpServer = McpServer_1 = ( __decorate([( __param(7, IMcpRegistry)), ( __param(8, IAllowedMcpServersService)), ( __param(9, IWorkspaceContextService)), ( __param(10, IExtensionService)), ( __param(11, ILoggerService)), ( __param(12, IOutputService)), ( __param(13, ITelemetryService)), ( __param(14, ICommandService)), ( __param(15, IInstantiationService)), ( __param(16, IDialogService)), ( __param(17, INotificationService)), ( __param(18, IOpenerService)), ( __param(19, IMcpSamplingService)), ( __param(20, IMcpElicitationService)), ( __param(21, IMcpSandboxService)), ( __param(22, IWorkbenchEnvironmentService))], McpServer));
 class McpPrompt {
     constructor(_server, _definition) {
         this._server = _server;
@@ -1142,7 +1231,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
         notificationService.notify({
             severity: Severity$1.Warning,
             message: ( localize(
-                12181,
+                13942,
                 "MCP server `{0}` has tools with invalid parameters which will be omitted.",
                 serverName
             )),
@@ -1152,7 +1241,7 @@ function warnInvalidTools(instaService, serverName, errorText) {
                     enabled: true,
                     id: "mcpBadSchema.show",
                     tooltip: "",
-                    label: ( localize(12182, "Show")),
+                    label: ( localize(13943, "Show")),
                     run: () => {
                         editorService.openEditor({
                             resource: undefined,

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

@@ -17,6 +17,7 @@ import { IWorkspaceFolder, IWorkspaceFolderData } from "../../../../platform/wor
 import { IWorkbenchLocalMcpServer } from "../../../services/mcp/common/mcpWorkbenchManagementService.js";
 import { ContributionEnablementState } from "../../chat/common/enablement.js";
 import { ToolProgress } from "../../chat/common/tools/languageModelToolsService.js";
+import { ExternalDiscoverySource } from "./mcpConfiguration.js";
 import { McpServerRequestHandler } from "@codingame/monaco-vscode-mcp-service-override/vscode/vs/workbench/contrib/mcp/common/mcpServerRequestHandler";
 import { MCP } from "./modelContextProtocol.js";
 import { UriTemplate } from "../../../../base/common/uriTemplate.js";
@@ -29,6 +30,26 @@ export declare const extensionMcpCollectionPrefix = "ext.";
  * {@link IMcpConfigPath.id} of the originating config path.
  */
 export declare const MCP_CONFIGURATION_COLLECTION_ID_PREFIX = "mcp.config.";
+export declare const MCP_PLUGIN_COLLECTION_ID_PREFIX = "plugin.";
+export declare const CURSOR_WORKSPACE_MCP_COLLECTION_ID_PREFIX = "cursor-workspace.";
+export declare enum McpCollectionProvenance {
+    UserProfile = "userProfile",// User profile `mcp.json`.
+    RemoteUser = "remoteUser",// Remote user profile `mcp.json`.
+    WorkspaceConfiguration = "workspaceConfiguration",// The `settings.mcp` section of a `.code-workspace` file.
+    WorkspaceFolderConfiguration = "workspaceFolderConfiguration",// `<workspace>/.vscode/mcp.json`.
+    WorkspaceDotMcp = "workspaceDotMcp",// `<workspace>/.mcp.json`.
+    ExternalConfiguration = "externalConfiguration",// Claude Desktop, GitHub Copilot, Windsurf, or Cursor user/workspace configuration.
+    Extension = "extension",// An extension-provided `McpServerDefinitionProvider`.
+    Plugin = "plugin"
+}
+/** Returns the collection provenance represented by a VS Code configuration target. */
+export declare function getMcpCollectionProvenance(target: ConfigurationTarget | undefined): McpCollectionProvenance | undefined;
+/**
+ * Prefix of the collection id used for MCP servers discovered from folder-root
+ * `.mcp.json` files (Claude-style `{ "mcpServers": { ... } }`). The suffix is
+ * the workspace folder index.
+ */
+export declare const WORKSPACE_DOT_MCP_COLLECTION_ID_PREFIX = "workspace-dot-mcp.";
 export declare function extensionPrefixedIdentifier(identifier: ExtensionIdentifier, id: string): string;
 /**
  * An McpCollection contains McpServers. There may be multiple collections for
@@ -39,6 +60,10 @@ export interface McpCollectionDefinition {
     readonly remoteAuthority: string | null;
     /** Globally-unique, stable ID for this definition */
     readonly id: string;
+    /** Broad origin category; external product identity is recorded separately in {@link discoverySource}. */
+    readonly provenance?: McpCollectionProvenance;
+    /** Exact external product when {@link provenance} is `ExternalConfiguration`. */
+    readonly discoverySource?: ExternalDiscoverySource;
     /** Human-readable label for the definition */
     readonly label: string;
     /** Definitions this collection contains. */
@@ -115,6 +140,8 @@ export interface McpServerDefinition {
     readonly label: string;
     /** Descriptor defining how the configuration should be launched. */
     readonly launch: McpServerLaunch;
+    /** Default working directory when {@link launch} does not specify one. */
+    readonly defaultCwd?: URI;
     /** Explicit roots. If undefined, all workspace folders. */
     readonly roots?: URI[] | undefined;
     /** If set, allows configuration variables to be resolved in the {@link launch} with the given context */
@@ -155,6 +182,7 @@ export declare namespace McpServerDefinition {
         readonly label: string;
         readonly cacheNonce: string;
         readonly launch: McpServerLaunch.Serialized;
+        readonly defaultCwd?: UriComponents;
         readonly variableReplacement?: McpServerDefinitionVariableReplacement.Serialized;
         readonly staticMetadata?: McpServerStaticMetadata;
         readonly sandboxEnabled?: boolean;
@@ -383,9 +411,9 @@ export declare enum McpToolVisibility {
  * - `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.
+ * - `agentHost`: resolves `connectionAuthority` to the owning Agent Host
+ *   connection and routes on the AHP `mcp://` side `channel`. Used for MCP
+ *   servers owned by an agent host.
  */
 export type IMcpToolCallUIData = {
     readonly kind: "local";
@@ -399,6 +427,8 @@ export type IMcpToolCallUIData = {
     readonly kind: "agentHost";
     /** URI of the UI resource for rendering (e.g., "ui://weather-server/dashboard") */
     readonly resourceUri: string;
+    /** Sanitized connection identifier used to route App sub-RPCs. */
+    readonly connectionAuthority: string;
     /** AHP `mcp://` channel URI for the originating server. */
     readonly channel: string;
     /** Stable identifier for the originating server (used as webview origin key). */
@@ -481,6 +511,7 @@ export declare function mcpOAuthClientSecretStorageKey(mcpServerUrl: string, cli
  */
 export interface McpServerTransportHTTP {
     readonly type: McpServerTransportType.HTTP;
+    readonly transport?: "sse" | "streamable-http";
     readonly uri: URI;
     readonly headers: [
         string,
@@ -497,6 +528,7 @@ export type McpServerLaunch = McpServerTransportStdio | McpServerTransportHTTP;
 export declare namespace McpServerLaunch {
     type Serialized = {
         type: McpServerTransportType.HTTP;
+        transport?: "sse" | "streamable-http";
         uri: UriComponents;
         headers: [
             string,
@@ -515,6 +547,8 @@ export declare namespace McpServerLaunch {
     };
     function toSerialized(launch: McpServerLaunch): McpServerLaunch.Serialized;
     function fromSerialized(launch: McpServerLaunch.Serialized): McpServerLaunch;
+    /** Converts an MCP server configuration into the shared launch representation. */
+    function fromServerConfiguration(configuration: IMcpServerConfiguration, sandbox?: IMcpSandboxConfiguration): McpServerLaunch | undefined;
     function hash(launch: McpServerLaunch): Promise<string>;
 }
 /**
@@ -712,11 +746,11 @@ export interface ISamplingResult {
 }
 export declare class McpError extends Error {
     readonly code: number;
-    readonly data?: unknown | undefined;
+    readonly data?: unknown;
     static methodNotFound(method: string): McpError;
     static notAllowed(): McpError;
     static unknown(e: Error): McpError;
-    constructor(code: number, message: string, data?: unknown | undefined);
+    constructor(code: number, message: string, data?: unknown);
 }
 export declare enum McpToolName {
     Prefix = "mcp_",

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

@@ -6,12 +6,14 @@ import { encodeHex, VSBuffer, decodeHex } from '../../../../base/common/buffer.j
 import { Disposable } from '../../../../base/common/lifecycle.js';
 import { equals } from '../../../../base/common/objects.js';
 import '../../../../base/common/observableInternal/index.js';
+import { isEqual } from '../../../../base/common/resources.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 { McpServerType } from '../../../../platform/mcp/common/mcpPlatformTypes.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';
@@ -19,6 +21,35 @@ import { ObservableMap } from '../../../../base/common/observableInternal/map.js
 
 const extensionMcpCollectionPrefix = "ext.";
 const MCP_CONFIGURATION_COLLECTION_ID_PREFIX = "mcp.config.";
+const MCP_PLUGIN_COLLECTION_ID_PREFIX = "plugin.";
+const CURSOR_WORKSPACE_MCP_COLLECTION_ID_PREFIX = "cursor-workspace.";
+var McpCollectionProvenance;
+(function(McpCollectionProvenance) {
+    McpCollectionProvenance["UserProfile"] = "userProfile";
+    McpCollectionProvenance["RemoteUser"] = "remoteUser";
+    McpCollectionProvenance["WorkspaceConfiguration"] = "workspaceConfiguration";
+    McpCollectionProvenance["WorkspaceFolderConfiguration"] = "workspaceFolderConfiguration";
+    McpCollectionProvenance["WorkspaceDotMcp"] = "workspaceDotMcp";
+    McpCollectionProvenance["ExternalConfiguration"] = "externalConfiguration";
+    McpCollectionProvenance["Extension"] = "extension";
+    McpCollectionProvenance["Plugin"] = "plugin";
+})(McpCollectionProvenance || (McpCollectionProvenance = {}));
+function getMcpCollectionProvenance(target) {
+    switch (target) {
+    case ConfigurationTarget.USER:
+    case ConfigurationTarget.USER_LOCAL:
+        return McpCollectionProvenance.UserProfile;
+    case ConfigurationTarget.USER_REMOTE:
+        return McpCollectionProvenance.RemoteUser;
+    case ConfigurationTarget.WORKSPACE:
+        return McpCollectionProvenance.WorkspaceConfiguration;
+    case ConfigurationTarget.WORKSPACE_FOLDER:
+        return McpCollectionProvenance.WorkspaceFolderConfiguration;
+    default:
+        return undefined;
+    }
+}
+const WORKSPACE_DOT_MCP_COLLECTION_ID_PREFIX = "workspace-dot-mcp.";
 function extensionPrefixedIdentifier(identifier, id) {
     return ExtensionIdentifier.toKey(identifier) + "/" + id;
 }
@@ -35,7 +66,7 @@ var McpCollectionSortOrder;
 var McpCollectionDefinition;
 (function(McpCollectionDefinition) {
     function equals$1(a, b) {
-        return a.id === b.id && a.remoteAuthority === b.remoteAuthority && a.label === b.label && a.trustBehavior === b.trustBehavior && equals(a.sandbox, b.sandbox);
+        return a.id === b.id && a.remoteAuthority === b.remoteAuthority && a.label === b.label && a.provenance === b.provenance && a.discoverySource === b.discoverySource && a.trustBehavior === b.trustBehavior && equals(a.sandbox, b.sandbox);
     }
     McpCollectionDefinition.equals = equals$1;
     function isWorkspaceDiscovered(collection) {
@@ -54,6 +85,45 @@ var McpServerStaticToolAvailability;
     McpServerStaticToolAvailability[McpServerStaticToolAvailability["Initial"] = 0] = "Initial";
     McpServerStaticToolAvailability[McpServerStaticToolAvailability["Dynamic"] = 1] = "Dynamic";
 })(McpServerStaticToolAvailability || (McpServerStaticToolAvailability = {}));
+function objectsEqualWithUris(one, other) {
+    if (one === other) {
+        return true;
+    }
+    if (URI.isUri(one) || URI.isUri(other)) {
+        return URI.isUri(one) && URI.isUri(other) && isEqual(one, other);
+    }
+    if (one === null || one === undefined || other === null || other === undefined) {
+        return false;
+    }
+    if (typeof one !== typeof other || typeof one !== "object") {
+        return false;
+    }
+    if (Array.isArray(one) !== Array.isArray(other)) {
+        return false;
+    }
+    if (Array.isArray(one) && Array.isArray(other)) {
+        return equals$1(one, other, objectsEqualWithUris);
+    }
+    const oneKeys = [];
+    for (const key in one) {
+        oneKeys.push(key);
+    }
+    oneKeys.sort();
+    const otherKeys = [];
+    for (const key in other) {
+        otherKeys.push(key);
+    }
+    otherKeys.sort();
+    if (!equals$1(oneKeys, otherKeys)) {
+        return false;
+    }
+    for (const key of oneKeys) {
+        if (!objectsEqualWithUris(Reflect.get(one, key), Reflect.get(other, key))) {
+            return false;
+        }
+    }
+    return true;
+}
 var McpServerDefinition;
 (function(McpServerDefinition) {
     function toSerialized(def) {
@@ -67,13 +137,14 @@ var McpServerDefinition;
             cacheNonce: def.cacheNonce,
             staticMetadata: def.staticMetadata,
             launch: McpServerLaunch.fromSerialized(def.launch),
+            defaultCwd: def.defaultCwd ? URI.revive(def.defaultCwd) : undefined,
             sandboxEnabled: def.sandboxEnabled,
             variableReplacement: def.variableReplacement ? McpServerDefinitionVariableReplacement.fromSerialized(def.variableReplacement) : undefined
         };
     }
     McpServerDefinition.fromSerialized = fromSerialized;
     function equals$2(a, b) {
-        return a.id === b.id && a.label === b.label && a.cacheNonce === b.cacheNonce && equals$1(a.roots, b.roots, (a, b) => ( a.toString()) === ( b.toString())) && equals(a.launch, b.launch) && equals(a.presentation, b.presentation) && equals(a.variableReplacement, b.variableReplacement) && equals(a.devMode, b.devMode) && a.sandboxEnabled === b.sandboxEnabled;
+        return a.id === b.id && a.label === b.label && a.cacheNonce === b.cacheNonce && isEqual(a.defaultCwd, b.defaultCwd) && equals$1(a.roots, b.roots, (a, b) => ( a.toString()) === ( b.toString())) && objectsEqualWithUris(a.launch, b.launch) && objectsEqualWithUris(a.presentation, b.presentation) && objectsEqualWithUris(a.variableReplacement, b.variableReplacement) && equals(a.devMode, b.devMode) && a.sandboxEnabled === b.sandboxEnabled;
     }
     McpServerDefinition.equals = equals$2;
 })(McpServerDefinition || (McpServerDefinition = {}));
@@ -163,6 +234,7 @@ var McpServerLaunch;
         case McpServerTransportType.HTTP:
             return {
                 type: launch.type,
+                transport: launch.transport,
                 uri: URI.revive(launch.uri),
                 headers: launch.headers,
                 oauth: launch.oauth,
@@ -181,6 +253,35 @@ var McpServerLaunch;
         }
     }
     McpServerLaunch.fromSerialized = fromSerialized;
+    function fromServerConfiguration(configuration, sandbox) {
+        if (configuration.type === McpServerType.LOCAL) {
+            return {
+                type: McpServerTransportType.Stdio,
+                command: configuration.command,
+                args: configuration.args ? [...configuration.args] : [],
+                env: configuration.env ? {
+                    ...configuration.env
+                } : {},
+                envFile: configuration.envFile,
+                cwd: configuration.cwd,
+                sandbox
+            };
+        }
+        try {
+            return {
+                type: McpServerTransportType.HTTP,
+                ...(configuration.transport === "sse" ? {
+                    transport: "sse"
+                } : {}),
+                uri: ( URI.parse(configuration.url)),
+                headers: Object.entries(configuration.headers ?? {}),
+                oauth: configuration.oauth
+            };
+        } catch {
+            return undefined;
+        }
+    }
+    McpServerLaunch.fromServerConfiguration = fromServerConfiguration;
     async function hash(launch) {
         const nonce = await crypto.subtle.digest("SHA-256", ( new TextEncoder()).encode(JSON.stringify(launch)));
         return encodeHex(VSBuffer.wrap(( new Uint8Array(nonce))));
@@ -199,13 +300,13 @@ var McpConnectionState;
     McpConnectionState.toString = s => {
         switch (s.state) {
         case Kind.Stopped:
-            return localize(12186, "Stopped");
+            return localize(13947, "Stopped");
         case Kind.Starting:
-            return localize(12187, "Starting");
+            return localize(13948, "Starting");
         case Kind.Running:
-            return localize(12188, "Running");
+            return localize(13949, "Running");
         case Kind.Error:
-            return localize(12189, "Error {0}", s.message);
+            return localize(13950, "Error {0}", s.message);
         default:
             assertNever();
         }
@@ -376,4 +477,4 @@ var ElicitationKind;
 })(ElicitationKind || (ElicitationKind = {}));
 const McpToolResourceLinkMimeType = "application/vnd.code.resource-link";
 
-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 };
+export { CURSOR_WORKSPACE_MCP_COLLECTION_ID_PREFIX, ElicitationKind, HasInstalledMcpServersContext, IAutostartResult, InstalledMcpServersViewId, LazyCollectionState, MCP_CONFIGURATION_COLLECTION_ID_PREFIX, MCP_PLUGIN_COLLECTION_ID_PREFIX, McpCapability, McpCollectionDefinition, McpCollectionProvenance, McpCollectionSortOrder, McpConnectionFailedError, McpConnectionState, McpError, McpResourceURI, McpServerCacheState, McpServerContainers, McpServerDefinition, McpServerDefinitionVariableReplacement, McpServerEditorTab, McpServerEnablementState, McpServerInstallState, McpServerLaunch, McpServerStaticToolAvailability, McpServerTransportType, McpServerTrust, McpServersGalleryStatusContext, McpStartServerInteraction, McpToolName, McpToolResourceLinkMimeType, McpToolVisibility, MpcResponseError, UserInteractionRequiredError, WORKSPACE_DOT_MCP_COLLECTION_ID_PREFIX, extensionMcpCollectionPrefix, extensionPrefixedIdentifier, getMcpCollectionProvenance, isMcpResourceTemplate, mcpOAuthClientSecretStorageKey, mcpPromptPrefix, mcpPromptReplaceSpecialChars };

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

@@ -38,6 +38,8 @@ export interface IMcpWorkbenchService {
     readonly onChange: Event<IWorkbenchMcpServer | undefined>;
     readonly onReset: Event<void>;
     readonly local: readonly IWorkbenchMcpServer[];
+    /** Resolves after the initial installed MCP server query attempt completes. Never rejects. */
+    readonly whenInitialLocalMcpServersLoaded: Promise<void>;
     getEnabledLocalMcpServers(): IWorkbenchLocalMcpServer[];
     queryLocal(): Promise<IWorkbenchMcpServer[]>;
     queryGallery(options?: IQueryOptions, token?: CancellationToken): Promise<IIterativePager<IWorkbenchMcpServer>>;