@codingame/monaco-vscode-mcp-service-override 36.2.7 → 37.1.0

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/installedMcpServersDiscovery.js

@@ -5,7 +5,6 @@ import { Throttler } from '@codingame/monaco-vscode-api/vscode/vs/base/common/as
 import { Disposable, DisposableMap, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
 import '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/index';
-import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { ITextModelService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/resolverService.service';
 import { ConfigurationTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
@@ -13,7 +12,7 @@ import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/st
 import { getMcpServerMapping } from '../mcpConfigFileUtils.js';
 import { mcpConfigurationSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import { MCP_CONFIGURATION_COLLECTION_ID_PREFIX, McpServerTransportType, McpServerLaunch, McpServerTrust, McpCollectionSortOrder, McpCollectionDefinition, McpServerDefinition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { MCP_CONFIGURATION_COLLECTION_ID_PREFIX, McpServerLaunch, McpServerTrust, McpCollectionSortOrder, getMcpCollectionProvenance, McpCollectionDefinition, McpServerDefinition } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpWorkbenchService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
@@ -78,25 +77,18 @@ let InstalledMcpServersDiscovery = class InstalledMcpServersDiscovery extends Di
                     definitions = [mcpConfigPath, []];
                     collections.set(collectionId, definitions);
                 }
-                const launch = config.type === "http" ? {
-                    type: McpServerTransportType.HTTP,
-                    uri: ( URI.parse(config.url)),
-                    headers: Object.entries(config.headers || {}),
-                    oauth: config.oauth
-                } : {
-                    type: McpServerTransportType.Stdio,
-                    command: config.command,
-                    args: config.args || [],
-                    env: config.env || {},
-                    envFile: config.envFile,
-                    cwd: config.cwd,
-                    sandbox: server.rootSandbox
-                };
+                const launch = McpServerLaunch.fromServerConfiguration(config, server.rootSandbox);
+                if (!launch) {
+                    this.logService.warn(`Skipping invalid MCP server configuration: ${server.name}`);
+                    continue;
+                }
+                const defaultCwd = config.type === "http" ? undefined : mcpConfigPath?.workspaceFolder?.uri;
                 definitions[1].push({
                     id: `${collectionId}.${server.name}`,
                     label: server.name,
                     launch,
                     sandboxEnabled: config.type === "http" ? undefined : config.sandboxEnabled,
+                    defaultCwd,
                     cacheNonce: await McpServerLaunch.hash(launch),
                     roots: mcpConfigPath?.workspaceFolder ? [mcpConfigPath.workspaceFolder.uri] : undefined,
                     variableReplacement: {
@@ -120,6 +112,7 @@ let InstalledMcpServersDiscovery = class InstalledMcpServersDiscovery extends Di
                 const newServerDefinitions = observableValue(this, serverDefinitions);
                 const newCollection = {
                     id,
+                    provenance: getMcpCollectionProvenance(mcpConfigPath?.target),
                     label: mcpConfigPath?.label ?? "",
                     order: mcpConfigPath?.order ?? McpCollectionSortOrder.User,
                     presentation: {

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

@@ -8,7 +8,7 @@ import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILabelService } from "@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service";
 import { INativeMcpDiscoveryData } from "../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js";
 import { Dto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
-import { DiscoverySource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
+import { ExternalDiscoverySource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { McpCollectionDefinition, McpServerDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
 import { IMcpDiscovery } from "./mcpDiscovery.js";
@@ -20,11 +20,11 @@ export declare abstract class FilesystemMcpDiscovery extends Disposable implemen
     private readonly _mcpRegistry;
     readonly fromGallery: boolean;
     protected readonly _fsDiscoveryEnabled: IObservable<{
-        [K in DiscoverySource]: boolean;
+        [K in ExternalDiscoverySource]: boolean;
     } | undefined>;
     constructor(configurationService: IConfigurationService, _fileService: IFileService, _mcpRegistry: IMcpRegistry);
-    protected _isDiscoveryEnabled(reader: IReader, discoverySource: DiscoverySource): boolean;
-    protected watchFile(file: URI, collection: WritableMcpCollectionDefinition, discoverySource: DiscoverySource, adaptFile: (contents: VSBuffer) => Promise<McpServerDefinition[] | undefined>): IDisposable;
+    protected _isDiscoveryEnabled(reader: IReader, discoverySource: ExternalDiscoverySource): boolean;
+    protected watchFile(file: URI, collection: WritableMcpCollectionDefinition, discoverySource: ExternalDiscoverySource, adaptFile: (contents: VSBuffer) => Promise<McpServerDefinition[] | undefined>): IDisposable;
     abstract start(): void;
 }
 /**

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.js

@@ -15,8 +15,8 @@ import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { mcpDiscoverySection, discoverySourceLabel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import { McpCollectionSortOrder, McpServerTrust } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
-import { ClaudeDesktopMpcDiscoveryAdapter, CursorDesktopMpcDiscoveryAdapter, WindsurfDesktopMpcDiscoveryAdapter } from './nativeMcpDiscoveryAdapters.js';
+import { McpCollectionSortOrder, McpServerTrust, McpCollectionProvenance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { ClaudeDesktopMpcDiscoveryAdapter, CopilotMpcDiscoveryAdapter, CursorDesktopMpcDiscoveryAdapter, WindsurfDesktopMpcDiscoveryAdapter } from './nativeMcpDiscoveryAdapters.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
@@ -86,13 +86,14 @@ let NativeFilesystemMcpDiscovery = class NativeFilesystemMcpDiscovery extends Fi
         this.suffix = "";
         if (remoteAuthority) {
             this.suffix = " " + ( localize(
-                12088,
+                14064,
                 " on {0}",
                 labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority)
             ));
         }
         this.adapters = [
             instantiationService.createInstance(ClaudeDesktopMpcDiscoveryAdapter, remoteAuthority),
+            instantiationService.createInstance(CopilotMpcDiscoveryAdapter, remoteAuthority),
             instantiationService.createInstance(CursorDesktopMpcDiscoveryAdapter, remoteAuthority),
             instantiationService.createInstance(WindsurfDesktopMpcDiscoveryAdapter, remoteAuthority)
         ];
@@ -104,6 +105,7 @@ let NativeFilesystemMcpDiscovery = class NativeFilesystemMcpDiscovery extends Fi
         const details = {
             ...detailsDto,
             homedir: URI.revive(detailsDto.homedir),
+            copilotHome: detailsDto.copilotHome ? URI.revive(detailsDto.copilotHome) : undefined,
             xdgHome: detailsDto.xdgHome ? URI.revive(detailsDto.xdgHome) : undefined,
             winAppData: detailsDto.winAppData ? URI.revive(detailsDto.winAppData) : undefined
         };
@@ -114,6 +116,8 @@ let NativeFilesystemMcpDiscovery = class NativeFilesystemMcpDiscovery extends Fi
             }
             const collection = {
                 id: adapter.id,
+                provenance: McpCollectionProvenance.ExternalConfiguration,
+                discoverySource: adapter.discoverySource,
                 label: discoverySourceLabel[adapter.discoverySource] + this.suffix,
                 remoteAuthority: adapter.remoteAuthority,
                 configTarget: ConfigurationTarget.USER,

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

@@ -2,33 +2,41 @@ import { VSBuffer } from "@codingame/monaco-vscode-api/vscode/vs/base/common/buf
 import { Mutable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/types";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { INativeMcpDiscoveryData } from "../../../../../platform/mcp/common/nativeMcpDiscoveryHelper.js";
-import { DiscoverySource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
+import { ExternalDiscoverySource } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
 import { McpCollectionSortOrder, McpServerDefinition } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
 export interface NativeMpcDiscoveryAdapter {
     readonly remoteAuthority: string | null;
     readonly id: string;
     readonly order: number;
-    readonly discoverySource: DiscoverySource;
+    readonly discoverySource: ExternalDiscoverySource;
     getFilePath(details: INativeMcpDiscoveryData): URI | undefined;
     adaptFile(contents: VSBuffer, details: INativeMcpDiscoveryData): Promise<McpServerDefinition[] | undefined>;
 }
-export declare function claudeConfigToServerDefinition(idPrefix: string, contents: VSBuffer, cwd?: URI): Promise<Mutable<McpServerDefinition>[] | undefined>;
+export declare function claudeConfigToServerDefinition(idPrefix: string, contents: VSBuffer, options?: {
+    cwd?: URI;
+    defaultCwd?: URI;
+}): Promise<Mutable<McpServerDefinition>[] | undefined>;
 export declare class ClaudeDesktopMpcDiscoveryAdapter implements NativeMpcDiscoveryAdapter {
     readonly remoteAuthority: string | null;
     id: string;
     readonly order = McpCollectionSortOrder.Filesystem;
-    readonly discoverySource: DiscoverySource;
+    readonly discoverySource: ExternalDiscoverySource;
     constructor(remoteAuthority: string | null);
     getFilePath({ platform, winAppData, xdgHome, homedir }: INativeMcpDiscoveryData): URI | undefined;
     adaptFile(contents: VSBuffer, { homedir }: INativeMcpDiscoveryData): Promise<McpServerDefinition[] | undefined>;
 }
+export declare class CopilotMpcDiscoveryAdapter extends ClaudeDesktopMpcDiscoveryAdapter {
+    readonly discoverySource: ExternalDiscoverySource;
+    constructor(remoteAuthority: string | null);
+    getFilePath({ copilotHome, homedir }: INativeMcpDiscoveryData): URI | undefined;
+}
 export declare class WindsurfDesktopMpcDiscoveryAdapter extends ClaudeDesktopMpcDiscoveryAdapter {
-    readonly discoverySource: DiscoverySource;
+    readonly discoverySource: ExternalDiscoverySource;
     constructor(remoteAuthority: string | null);
     getFilePath({ homedir }: INativeMcpDiscoveryData): URI | undefined;
 }
 export declare class CursorDesktopMpcDiscoveryAdapter extends ClaudeDesktopMpcDiscoveryAdapter {
-    readonly discoverySource: DiscoverySource;
+    readonly discoverySource: ExternalDiscoverySource;
     constructor(remoteAuthority: string | null);
     getFilePath({ homedir }: INativeMcpDiscoveryData): URI | undefined;
 }

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAdapters.js

@@ -1,10 +1,10 @@
 
 import { Platform } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { DiscoverySource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { ExternalDiscoverySource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { McpServerTransportType, McpServerLaunch, McpCollectionSortOrder } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 
-async function claudeConfigToServerDefinition(idPrefix, contents, cwd) {
+async function claudeConfigToServerDefinition(idPrefix, contents, options) {
     let parsed;
     try {
         parsed = JSON.parse(( contents.toString()));
@@ -22,14 +22,20 @@ async function claudeConfigToServerDefinition(idPrefix, contents, cwd) {
             command: server.command,
             env: server.env || {},
             envFile: undefined,
-            cwd: cwd?.fsPath,
+            cwd: options?.cwd?.fsPath,
             sandbox: undefined
         };
+        const defaultCwd = launch.type === McpServerTransportType.Stdio ? options?.defaultCwd : undefined;
+        const nonceLaunch = defaultCwd && launch.type === McpServerTransportType.Stdio ? {
+            ...launch,
+            cwd: defaultCwd.fsPath
+        } : launch;
         return {
             id: `${idPrefix}.${name}`,
             label: name,
             launch,
-            cacheNonce: await McpServerLaunch.hash(launch)
+            defaultCwd,
+            cacheNonce: await McpServerLaunch.hash(nonceLaunch)
         };
     })));
 }
@@ -37,7 +43,7 @@ class ClaudeDesktopMpcDiscoveryAdapter {
     constructor(remoteAuthority) {
         this.remoteAuthority = remoteAuthority;
         this.order = McpCollectionSortOrder.Filesystem;
-        this.discoverySource = DiscoverySource.ClaudeDesktop;
+        this.discoverySource = ExternalDiscoverySource.ClaudeDesktop;
         this.id = `claude-desktop.${this.remoteAuthority}`;
     }
     getFilePath(
@@ -70,13 +76,30 @@ class ClaudeDesktopMpcDiscoveryAdapter {
             homedir
         }
     ) {
-        return claudeConfigToServerDefinition(this.id, contents, homedir);
+        return claudeConfigToServerDefinition(this.id, contents, {
+            cwd: homedir
+        });
+    }
+}
+class CopilotMpcDiscoveryAdapter extends ClaudeDesktopMpcDiscoveryAdapter {
+    constructor(remoteAuthority) {
+        super(remoteAuthority);
+        this.discoverySource = ExternalDiscoverySource.Copilot;
+        this.id = `copilot.${this.remoteAuthority}`;
+    }
+    getFilePath(
+        {
+            copilotHome,
+            homedir
+        }
+    ) {
+        return URI.joinPath(copilotHome ?? URI.joinPath(homedir, ".copilot"), "mcp-config.json");
     }
 }
 class WindsurfDesktopMpcDiscoveryAdapter extends ClaudeDesktopMpcDiscoveryAdapter {
     constructor(remoteAuthority) {
         super(remoteAuthority);
-        this.discoverySource = DiscoverySource.Windsurf;
+        this.discoverySource = ExternalDiscoverySource.Windsurf;
         this.id = `windsurf.${this.remoteAuthority}`;
     }
     getFilePath(
@@ -90,7 +113,7 @@ class WindsurfDesktopMpcDiscoveryAdapter extends ClaudeDesktopMpcDiscoveryAdapte
 class CursorDesktopMpcDiscoveryAdapter extends ClaudeDesktopMpcDiscoveryAdapter {
     constructor(remoteAuthority) {
         super(remoteAuthority);
-        this.discoverySource = DiscoverySource.CursorGlobal;
+        this.discoverySource = ExternalDiscoverySource.CursorGlobal;
         this.id = `cursor.${this.remoteAuthority}`;
     }
     getFilePath(
@@ -102,4 +125,4 @@ class CursorDesktopMpcDiscoveryAdapter extends ClaudeDesktopMpcDiscoveryAdapter
     }
 }
 
-export { ClaudeDesktopMpcDiscoveryAdapter, CursorDesktopMpcDiscoveryAdapter, WindsurfDesktopMpcDiscoveryAdapter, claudeConfigToServerDefinition };
+export { ClaudeDesktopMpcDiscoveryAdapter, CopilotMpcDiscoveryAdapter, CursorDesktopMpcDiscoveryAdapter, WindsurfDesktopMpcDiscoveryAdapter, claudeConfigToServerDefinition };

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

@@ -5,8 +5,8 @@ import { IRemoteAgentService } from "@codingame/monaco-vscode-api/vscode/vs/work
 import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
 import { IMcpDiscovery } from "./mcpDiscovery.js";
 /**
- * Discovers MCP servers defined in `.mcp.json` files at workspace folder roots.
- * Uses the Claude-style format: `{ "mcpServers": { ... } }`.
+ * Discovers workspace-root `.mcp.json` files using the Claude-style `{ "mcpServers": { ... } }` format.
+ * Servers inherit workspace trust, matching `.vscode/mcp.json`.
  */
 export declare class WorkspaceDotMcpDiscovery extends Disposable implements IMcpDiscovery {
     private readonly _fileService;

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/workspaceDotMcpDiscovery.js

@@ -10,7 +10,7 @@ import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/st
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import { McpCollectionSortOrder, McpServerTrust } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { WORKSPACE_DOT_MCP_COLLECTION_ID_PREFIX, McpCollectionSortOrder, McpServerTrust, McpCollectionProvenance } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { claudeConfigToServerDefinition } from './nativeMcpDiscoveryAdapters.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 
@@ -39,14 +39,15 @@ let WorkspaceDotMcpDiscovery = class WorkspaceDotMcpDiscovery extends Disposable
     }
     _watchFolder(folder) {
         const configFile = joinPath(folder.uri, ".mcp.json");
-        const collectionId = `workspace-dot-mcp.${folder.index}`;
+        const collectionId = `${WORKSPACE_DOT_MCP_COLLECTION_ID_PREFIX}${folder.index}`;
         const serverDefinitions = observableValue(this, []);
         const collection = {
             id: collectionId,
+            provenance: McpCollectionProvenance.WorkspaceDotMcp,
             label: `${folder.name}/.mcp.json`,
             remoteAuthority: this._remoteAgentService.getConnection()?.remoteAuthority || null,
             scope: StorageScope.WORKSPACE,
-            trustBehavior: McpServerTrust.Kind.TrustedOnNonce,
+            trustBehavior: McpServerTrust.Kind.Trusted,
             serverDefinitions,
             configTarget: ConfigurationTarget.WORKSPACE_FOLDER,
             order: McpCollectionSortOrder.WorkspaceFolder + 1,
@@ -56,11 +57,14 @@ let WorkspaceDotMcpDiscovery = class WorkspaceDotMcpDiscovery extends Disposable
         };
         const store = ( new DisposableStore());
         const collectionRegistration = store.add(( new MutableDisposable()));
+        let isLazyCollection = true;
         const updateFile = async () => {
             let definitions = [];
             try {
                 const contents = await this._fileService.readFile(configFile);
-                const defs = await claudeConfigToServerDefinition(collectionId, contents.value, folder.uri);
+                const defs = await claudeConfigToServerDefinition(collectionId, contents.value, {
+                    defaultCwd: folder.uri
+                });
                 if (defs) {
                     for (const d of defs) {
                         d.roots = [folder.uri];
@@ -72,7 +76,8 @@ let WorkspaceDotMcpDiscovery = class WorkspaceDotMcpDiscovery extends Disposable
                 collectionRegistration.clear();
             } else {
                 serverDefinitions.set(definitions, undefined);
-                if (!collectionRegistration.value) {
+                if (isLazyCollection || !collectionRegistration.value) {
+                    isLazyCollection = false;
                     collectionRegistration.value = this._mcpRegistry.registerCollection(collection);
                 }
             }
@@ -83,7 +88,16 @@ let WorkspaceDotMcpDiscovery = class WorkspaceDotMcpDiscovery extends Disposable
             excludes: []
         }));
         store.add(watcher.onDidChange(() => throttler.schedule()));
-        updateFile();
+        let initialUpdate;
+        const loadInitial = () => initialUpdate ??= updateFile();
+        collectionRegistration.value = this._mcpRegistry.registerCollection({
+            ...collection,
+            lazy: {
+                isCached: false,
+                load: loadInitial
+            }
+        });
+        void loadInitial();
         this._collections.set(( folder.uri.toString()), store);
     }
 };

package/vscode/src/vs/workbench/contrib/mcp/common/discovery/workspaceMcpDiscoveryAdapter.js

@@ -10,9 +10,9 @@ import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/fi
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
-import { DiscoverySource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { ExternalDiscoverySource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
-import { McpCollectionSortOrder, McpServerTrust } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { McpCollectionSortOrder, McpServerTrust, McpCollectionProvenance, CURSOR_WORKSPACE_MCP_COLLECTION_ID_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { FilesystemMcpDiscovery } from './nativeMcpDiscoveryAbstract.js';
 import { claudeConfigToServerDefinition } from './nativeMcpDiscoveryAdapters.js';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
@@ -46,7 +46,9 @@ let CursorWorkspaceMcpDiscoveryAdapter = class CursorWorkspaceMcpDiscoveryAdapte
     watchFolder(folder) {
         const configFile = joinPath(folder.uri, ".cursor", "mcp.json");
         const collection = {
-            id: `cursor-workspace.${folder.index}`,
+            id: `${CURSOR_WORKSPACE_MCP_COLLECTION_ID_PREFIX}${folder.index}`,
+            provenance: McpCollectionProvenance.ExternalConfiguration,
+            discoverySource: ExternalDiscoverySource.CursorWorkspace,
             label: `${folder.name}/.cursor/mcp.json`,
             remoteAuthority: this._remoteAgentService.getConnection()?.remoteAuthority || null,
             scope: StorageScope.WORKSPACE,
@@ -61,9 +63,11 @@ let CursorWorkspaceMcpDiscoveryAdapter = class CursorWorkspaceMcpDiscoveryAdapte
         this._collections.set(( folder.uri.toString()), this.watchFile(
             URI.joinPath(folder.uri, ".cursor", "mcp.json"),
             collection,
-            DiscoverySource.CursorWorkspace,
+            ExternalDiscoverySource.CursorWorkspace,
             async contents => {
-                const defs = await claudeConfigToServerDefinition(collection.id, contents, folder.uri);
+                const defs = await claudeConfigToServerDefinition(collection.id, contents, {
+                    defaultCwd: folder.uri
+                });
                 defs?.forEach(d => d.roots = [folder.uri]);
                 return defs;
             }

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

@@ -14,19 +14,19 @@ var McpContextKeys;
 (function(McpContextKeys) {
     McpContextKeys.serverCount = ( new RawContextKey("mcp.serverCount", undefined, {
         type: "number",
-        description: ( localize(12132, "Context key that has the number of registered MCP servers"))
+        description: ( localize(14110, "Context key that has the number of registered MCP servers"))
     }));
     McpContextKeys.hasUnknownTools = ( new RawContextKey("mcp.hasUnknownTools", undefined, {
         type: "boolean",
-        description: ( localize(12133, "Indicates whether there are MCP servers with unknown tools."))
+        description: ( localize(14111, "Indicates whether there are MCP servers with unknown tools."))
     }));
     McpContextKeys.hasServersWithErrors = ( new RawContextKey("mcp.hasServersWithErrors", undefined, {
         type: "boolean",
-        description: ( localize(12134, "Indicates whether there are any MCP servers with errors."))
+        description: ( localize(14112, "Indicates whether there are any MCP servers with errors."))
     }));
     McpContextKeys.toolsCount = ( new RawContextKey("mcp.toolsCount", undefined, {
         type: "number",
-        description: ( localize(12135, "Context key that has the number of registered MCP tools"))
+        description: ( localize(14113, "Context key that has the number of registered MCP tools"))
     }));
 })(McpContextKeys || (McpContextKeys = {}));
 let McpContextKeysController = class McpContextKeysController extends Disposable {

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

@@ -0,0 +1,13 @@
+import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
+import { McpServerStatus } from "@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/state";
+export interface IMcpEditorAgentHostServer {
+    readonly name: string;
+    readonly enabled: boolean;
+    readonly status: McpServerStatus;
+}
+export interface IMcpEditorAgentHostSessionServers {
+    readonly resource: URI;
+    readonly servers: readonly IMcpEditorAgentHostServer[];
+}
+export declare function getActiveAgentHostMcpSessionResource(sessionResource: URI | undefined): URI | undefined;
+export declare function countRunningMcpServersInOtherSessions(currentSession: URI, sessions: readonly IMcpEditorAgentHostSessionServers[]): Map<string, number>;

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

@@ -0,0 +1,36 @@
+
+import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-root/state';
+import { McpServerStatus } from '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-session/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-chat/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-terminal/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-changeset/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-resource-watch/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation/state';
+import '@codingame/monaco-vscode-api/vscode/vs/platform/agentHost/common/state/protocol/channels-automation-run/state';
+import { isAgentHostTarget } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService';
+import { getChatSessionType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/model/chatUri';
+
+function getActiveAgentHostMcpSessionResource(sessionResource) {
+    return sessionResource && isAgentHostTarget(getChatSessionType(sessionResource)) ? sessionResource : undefined;
+}
+function countRunningMcpServersInOtherSessions(currentSession, sessions) {
+    const counts = ( new Map());
+    for (const session of sessions) {
+        if (isEqual(session.resource, currentSession)) {
+            continue;
+        }
+        const running = ( new Set());
+        for (const server of session.servers) {
+            if (server.enabled && server.status === McpServerStatus.Ready) {
+                running.add(server.name);
+            }
+        }
+        for (const name of running) {
+            counts.set(name, (counts.get(name) ?? 0) + 1);
+        }
+    }
+    return counts;
+}
+
+export { countRunningMcpServersInOtherSessions, getActiveAgentHostMcpSessionResource };

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

@@ -71,7 +71,7 @@ let McpLanguageModelToolContribution = class McpLanguageModelToolContribution ex
                     const toolSet = store.add(
                         this._toolsService.createToolSet(source, server.definition.id, referenceName, {
                             icon: Codicon.mcp,
-                            description: ( localize(12136, "{0}: All Tools", server.definition.label)),
+                            description: ( localize(14114, "{0}: All Tools", server.definition.label)),
                             deprecated: true
                         })
                     );
@@ -192,7 +192,7 @@ let McpToolImplementation = class McpToolImplementation {
         });
         const isSandboxedServer = sandboxEnabled === true;
         const mcpToolWarning = ( localize(
-            12137,
+            14115,
             "Note that MCP servers or malicious conversation content may attempt to misuse '{0}' through tools.",
             this._productService.nameShort
         ));
@@ -201,7 +201,7 @@ let McpToolImplementation = class McpToolImplementation {
         if (!isSandboxedServer) {
             confirm = {};
             if (!tool.definition.annotations?.readOnlyHint) {
-                confirm.title = ( new MarkdownString(( localize(12138, "Run {0}", title))));
+                confirm.title = ( new MarkdownString(( localize(14116, "Run {0}", title))));
                 confirm.message = ( new MarkdownString(tool.definition.description, {
                     supportThemeIcons: true
                 }));
@@ -215,9 +215,9 @@ let McpToolImplementation = class McpToolImplementation {
         const mcpUiEnabled = this._configurationService.getValue(mcpAppsEnabledConfig);
         return {
             confirmationMessages: confirm,
-            invocationMessage: ( new MarkdownString(( localize(12139, "Running {0}", title)))),
-            pastTenseMessage: ( new MarkdownString(( localize(12140, "Ran {0} ", title)))),
-            originMessage: ( localize(12141, "{0} (MCP Server)", server.definition.label)),
+            invocationMessage: ( new MarkdownString(( localize(14117, "Running {0}", title)))),
+            pastTenseMessage: ( new MarkdownString(( localize(14118, "Ran {0} ", title)))),
+            originMessage: ( localize(14119, "{0} (MCP Server)", server.definition.label)),
             toolSpecificData: {
                 kind: "input",
                 rawInput: context.parameters,

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

@@ -35,6 +35,7 @@ export declare class McpRegistry extends Disposable implements IMcpRegistry {
     private readonly _collections;
     private readonly _delegates;
     private readonly _mcpAccessValue;
+    private readonly _strictPluginOnlyCustomization;
     readonly collections: IObservable<readonly McpCollectionDefinition[]>;
     private readonly _workspaceStorage;
     private readonly _profileStorage;
@@ -75,5 +76,6 @@ export declare class McpRegistry extends Disposable implements IMcpRegistry {
     }[]): Promise<string[] | undefined>;
     private _updateStorageWithExpressionInputs;
     private _replaceVariablesInLaunch;
+    private isCollectionAllowed;
     resolveConnection(opts: IMcpResolveConnectionOptions): Promise<IMcpServerConnection | undefined>;
 }