rationalize configuration

Author: connor4312

src/vs/workbench/api/common/extHostMcp.ts

@@ -20,6 +20,8 @@ import { AUTH_SERVER_METADATA_DISCOVERY_PATH, getDefaultMetadataForUrl, getMetad
 import { URI } from '../../../base/common/uri.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
 import { CancellationError } from '../../../base/common/errors.js';
+import { ConfigurationTarget } from '../../../platform/configuration/common/configuration.js';
+import { IExtHostInitDataService } from './extHostInitDataService.js';
 
 export const IExtHostMpcService = createDecorator<IExtHostMpcService>('IExtHostMpcService');
 
@@ -38,6 +40,7 @@ export class ExtHostMcpService extends Disposable implements IExtHostMpcService
 
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
+		@IExtHostInitDataService private readonly _extHostInitData: IExtHostInitDataService
 	) {
 		super();
 		this._proxy = extHostRpc.getProxy(MainContext.MainThreadMcp);
@@ -105,6 +108,7 @@ export class ExtHostMcpService extends Disposable implements IExtHostMpcService
 			scope: StorageScope.WORKSPACE,
 			canResolveLaunch: typeof provider.resolveMcpServerDefinition === 'function',
 			extensionId: extension.identifier.value,
+			configTarget: this._extHostInitData.remote.isRemote ? ConfigurationTarget.USER_REMOTE : ConfigurationTarget.USER,
 		};
 
 		const update = async () => {
@@ -124,7 +128,7 @@ export class ExtHostMcpService extends Disposable implements IExtHostMpcService
 					id,
 					label: item.label,
 					cacheNonce: item.version,
-					launch: Convert.McpServerDefinition.from(item)
+					launch: Convert.McpServerDefinition.from(item),
 				});
 			}
 

src/vs/workbench/api/node/extHostMcpNode.ts

@@ -15,12 +15,14 @@ import { McpConnectionState, McpServerLaunch, McpServerTransportStdio, McpServer
 import { ExtHostMcpService } from '../common/extHostMcp.js';
 import { IExtHostRpcService } from '../common/extHostRpcService.js';
 import * as path from '../../../base/common/path.js';
+import { IExtHostInitDataService } from '../common/extHostInitDataService.js';
 
 export class NodeExtHostMpcService extends ExtHostMcpService {
 	constructor(
 		@IExtHostRpcService extHostRpc: IExtHostRpcService,
+		@IExtHostInitDataService initDataService: IExtHostInitDataService,
 	) {
-		super(extHostRpc);
+		super(extHostRpc, initDataService);
 	}
 
 	private nodeServers = new Map<number, {

src/vs/workbench/contrib/chat/browser/chat.contribution.ts

@@ -253,6 +253,7 @@ configurationRegistry.registerConfiguration({
 		[mcpServerSamplingSection]: {
 			type: 'object',
 			description: nls.localize('chat.mcp.serverSampling', "Configures which models are exposed to MCP servers for sampling (making model requests in the background). This setting can be edited in a graphical way under the `{0}` command.", 'MCP: ' + nls.localize('mcp.list', 'List Servers')),
+			scope: ConfigurationScope.RESOURCE,
 			additionalProperties: {
 				type: 'object',
 				properties: {

src/vs/workbench/contrib/mcp/common/discovery/configMcpDiscovery.ts

@@ -164,6 +164,7 @@ export class ConfigMcpDiscovery extends Disposable implements IMcpDiscovery {
 					remoteAuthority: src.path.remoteAuthority || null,
 					serverDefinitions: src.serverDefinitions,
 					isTrustedByDefault: true,
+					configTarget: src.path.target,
 					scope: src.path.scope,
 				});
 			}

src/vs/workbench/contrib/mcp/common/discovery/extensionMcpDiscovery.ts

@@ -7,6 +7,7 @@ import { Disposable, DisposableMap } from '../../../../../base/common/lifecycle.
 import { observableValue } from '../../../../../base/common/observable.js';
 import { isFalsyOrWhitespace } from '../../../../../base/common/strings.js';
 import { localize } from '../../../../../nls.js';
+import { ConfigurationTarget } from '../../../../../platform/configuration/common/configuration.js';
 import { IMcpCollectionContribution } from '../../../../../platform/extensions/common/extensions.js';
 import { IStorageService, StorageScope, StorageTarget } from '../../../../../platform/storage/common/storage.js';
 import { IExtensionService } from '../../../../services/extensions/common/extensions.js';
@@ -85,6 +86,7 @@ export class ExtensionMcpDiscovery extends Disposable implements IMcpDiscovery {
 						remoteAuthority: null,
 						isTrustedByDefault: true,
 						scope: StorageScope.WORKSPACE,
+						configTarget: ConfigurationTarget.USER,
 						serverDefinitions: observableValue<McpServerDefinition[]>(this, serverDefs?.map(McpServerDefinition.fromSerialized) || []),
 						lazy: {
 							isCached: !!serverDefs,

src/vs/workbench/contrib/mcp/common/discovery/nativeMcpDiscoveryAbstract.ts

@@ -10,7 +10,7 @@ import { Schemas } from '../../../../../base/common/network.js';
 import { autorunWithStore, IObservable, IReader, ISettableObservable, observableValue } from '../../../../../base/common/observable.js';
 import { URI } from '../../../../../base/common/uri.js';
 import { localize } from '../../../../../nls.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { IInstantiationService } from '../../../../../platform/instantiation/common/instantiation.js';
 import { ILabelService } from '../../../../../platform/label/common/label.js';
@@ -144,6 +144,7 @@ export abstract class NativeFilesystemMcpDiscovery extends FilesystemMcpDiscover
 				id: adapter.id,
 				label: discoverySourceLabel[adapter.discoverySource] + this.suffix,
 				remoteAuthority: adapter.remoteAuthority,
+				configTarget: ConfigurationTarget.USER,
 				scope: StorageScope.PROFILE,
 				isTrustedByDefault: false,
 				serverDefinitions: observableValue<readonly McpServerDefinition[]>(this, []),

src/vs/workbench/contrib/mcp/common/discovery/workspaceMcpDiscoveryAdapter.ts

@@ -7,7 +7,7 @@ import { DisposableMap, IDisposable } from '../../../../../base/common/lifecycle
 import { observableValue } from '../../../../../base/common/observable.js';
 import { joinPath } from '../../../../../base/common/resources.js';
 import { URI } from '../../../../../base/common/uri.js';
-import { IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
+import { ConfigurationTarget, IConfigurationService } from '../../../../../platform/configuration/common/configuration.js';
 import { IFileService } from '../../../../../platform/files/common/files.js';
 import { StorageScope } from '../../../../../platform/storage/common/storage.js';
 import { IWorkspaceContextService, IWorkspaceFolder } from '../../../../../platform/workspace/common/workspace.js';
@@ -56,6 +56,7 @@ export class CursorWorkspaceMcpDiscoveryAdapter extends FilesystemMcpDiscovery i
 			scope: StorageScope.WORKSPACE,
 			isTrustedByDefault: false,
 			serverDefinitions: observableValue(this, []),
+			configTarget: ConfigurationTarget.WORKSPACE_FOLDER,
 			presentation: {
 				origin: configFile,
 				order: McpCollectionSortOrder.WorkspaceFolder + 1,

src/vs/workbench/contrib/mcp/common/mcpSamplingService.ts

@@ -10,7 +10,7 @@ import { Event } from '../../../../base/common/event.js';
 import { isDefined } from '../../../../base/common/types.js';
 import { localize } from '../../../../nls.js';
 import { ICommandService } from '../../../../platform/commands/common/commands.js';
-import { IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
+import { ConfigurationTarget, getConfigValueInTarget, IConfigurationService } from '../../../../platform/configuration/common/configuration.js';
 import { IDialogService } from '../../../../platform/dialogs/common/dialogs.js';
 import { ExtensionIdentifier } from '../../../../platform/extensions/common/extensions.js';
 import { INotificationService, Severity } from '../../../../platform/notification/common/notification.js';
@@ -226,21 +226,54 @@ export class McpSamplingService implements IMcpSamplingService {
 		return foundModelIds[0]; // Return the first matching model
 	}
 
+	private _configKey(server: IMcpServer) {
+		return `${server.collection.label}: ${server.definition.label}`;
+	}
+
 	public getConfig(server: IMcpServer): IMcpServerSamplingConfiguration {
-		const mapping = this._configurationService.getValue<Record<string, IMcpServerSamplingConfiguration>>(mcpServerSamplingSection);
-		return mapping[server.definition.id] || {};
+		return this._getConfig(server).value || {};
 	}
 
-	public async updateConfig(server: IMcpServer, mutate: (r: IMcpServerSamplingConfiguration) => unknown) {
+	/**
+	 * _getConfig reads the sampling config reads the `{ server: data }` mapping
+	 * from the appropriate config. We read from the most specific possible
+	 * config up to the default configuration location that the MCP server itself
+	 * is defined in. We don't go further because then workspace-specific servers
+	 * would get in the user settings which is not meaningful and could lead
+	 * to confusion.
+	 *
+	 * todo@connor4312: generalize this for other esttings when we have them
+	 */
+	private _getConfig(server: IMcpServer) {
 		const def = server.readDefinitions().get();
-		const mapping = this._configurationService.getValue<Record<string, IMcpServerSamplingConfiguration>>(mcpServerSamplingSection, { resource: def.collection?.presentation?.origin });
+		const mostSpecificConfig = ConfigurationTarget.MEMORY;
+		const leastSpecificConfig = def.collection?.configTarget || ConfigurationTarget.USER;
+		const key = this._configKey(server);
+		const resource = def.collection?.presentation?.origin;
+
+		const configValue = this._configurationService.inspect<Record<string, IMcpServerSamplingConfiguration>>(mcpServerSamplingSection, { resource });
+		for (let target = mostSpecificConfig; target >= leastSpecificConfig; target--) {
+			const mapping = getConfigValueInTarget(configValue, target);
+			const config = mapping?.[key];
+			if (config) {
+				return { value: config, key, mapping, target, resource };
+			}
+		}
+
+		return { value: undefined, mapping: undefined, key, target: leastSpecificConfig, resource };
+	}
+
+	public async updateConfig(server: IMcpServer, mutate: (r: IMcpServerSamplingConfiguration) => unknown) {
+		const { value, mapping, key, target, resource } = this._getConfig(server);
 
-		const newConfig = { ...mapping[server.definition.id] };
+		const newConfig = { ...value };
 		mutate(newConfig);
 
 		await this._configurationService.updateValue(
 			mcpServerSamplingSection,
-			{ ...mapping, [server.definition.id]: newConfig },
+			{ ...mapping, [key]: newConfig },
+			{ resource },
+			target,
 		);
 		return newConfig;
 	}

src/vs/workbench/contrib/mcp/common/mcpTypes.ts

@@ -54,6 +54,8 @@ export interface McpCollectionDefinition {
 	readonly isTrustedByDefault: boolean;
 	/** Scope where associated collection info should be stored. */
 	readonly scope: StorageScope;
+	/** Configuration target where configuration related to this server should be stored. */
+	readonly configTarget: ConfigurationTarget;
 
 	/** Resolves a server definition. If present, always called before a server starts. */
 	resolveServerLanch?(definition: McpServerDefinition): Promise<McpServerLaunch | undefined>;
@@ -94,6 +96,7 @@ export namespace McpCollectionDefinition {
 		readonly scope: StorageScope;
 		readonly canResolveLaunch: boolean;
 		readonly extensionId: string;
+		readonly configTarget: ConfigurationTarget;
 	}
 
 	export function equals(a: McpCollectionDefinition, b: McpCollectionDefinition): boolean {

src/vs/workbench/contrib/mcp/test/common/mcpRegistry.test.ts

@@ -155,7 +155,8 @@ suite('Workbench - MCP - Registry', () => {
 			remoteAuthority: null,
 			serverDefinitions: observableValue('serverDefs', []),
 			isTrustedByDefault: true,
-			scope: StorageScope.APPLICATION
+			scope: StorageScope.APPLICATION,
+			configTarget: ConfigurationTarget.USER,
 		};
 
 		// Create base definition that can be reused

src/vs/workbench/contrib/mcp/test/common/mcpRegistryTypes.ts

@@ -167,6 +167,7 @@ export class TestMcpRegistry implements IMcpRegistry {
 		id: 'test-collection',
 		remoteAuthority: null,
 		label: 'Test Collection',
+		configTarget: ConfigurationTarget.USER,
 		serverDefinitions: observableValue(this, [{
 			id: 'test-server',
 			label: 'Test Server',

src/vs/workbench/contrib/mcp/test/common/mcpServerConnection.test.ts

@@ -20,6 +20,7 @@ import { IMcpHostDelegate, IMcpMessageTransport } from '../../common/mcpRegistry
 import { McpServerConnection } from '../../common/mcpServerConnection.js';
 import { McpCollectionDefinition, McpConnectionState, McpServerDefinition, McpServerTransportType } from '../../common/mcpTypes.js';
 import { TestMcpMessageTransport } from './mcpRegistryTypes.js';
+import { ConfigurationTarget } from '../../../../../platform/configuration/common/configuration.js';
 
 class TestMcpHostDelegate extends Disposable implements IMcpHostDelegate {
 	private readonly _transport: TestMcpMessageTransport;
@@ -86,7 +87,8 @@ suite('Workbench - MCP - ServerConnection', () => {
 			remoteAuthority: null,
 			serverDefinitions: observableValue('serverDefs', []),
 			isTrustedByDefault: true,
-			scope: StorageScope.APPLICATION
+			scope: StorageScope.APPLICATION,
+			configTarget: ConfigurationTarget.USER,
 		};
 
 		// Create server definition