cd11fae (#299873)

* Cherry pick cd11fae

* bump version

Author: connor4312

package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-oss-dev",
-  "version": "1.110.0",
+  "version": "1.110.1",
   "distro": "d89d49b77ba5f8bdfdfe3b039067e7da38e25640",
   "author": {
     "name": "Microsoft Corporation"

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

@@ -26,6 +26,7 @@ import { observableConfigValue } from '../../../../platform/observable/common/pl
 import { IQuickInputButton, IQuickInputService, IQuickPickItem } from '../../../../platform/quickinput/common/quickInput.js';
 import { StorageScope, StorageTarget } from '../../../../platform/storage/common/storage.js';
 import { IWorkspaceFolderData } from '../../../../platform/workspace/common/workspace.js';
+import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '../../../../platform/workspace/common/workspaceTrust.js';
 import { IConfigurationResolverService } from '../../../services/configurationResolver/common/configurationResolver.js';
 import { ConfigurationResolverExpression, IResolvedValue } from '../../../services/configurationResolver/common/configurationResolverExpression.js';
 import { AUX_WINDOW_GROUP, IEditorService } from '../../../services/editor/common/editorService.js';
@@ -87,6 +88,8 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		@ILabelService private readonly _labelService: ILabelService,
 		@ILogService private readonly _logService: ILogService,
 		@IMcpSandboxService private readonly _mcpSandboxService: IMcpSandboxService,
+		@IWorkspaceTrustManagementService private readonly _workspaceTrustManagementService: IWorkspaceTrustManagementService,
+		@IWorkspaceTrustRequestService private readonly _workspaceTrustRequestService: IWorkspaceTrustRequestService,
 	) {
 		super();
 		this._mcpAccessValue = observableConfigValue(mcpAccessConfig, McpAccessValue.All, configurationService);
@@ -215,6 +218,14 @@ export class McpRegistry extends Disposable implements IMcpRegistry {
 		autoTrustChanges = false,
 		errorOnUserInteraction = false,
 	}: IMcpResolveConnectionOptions) {
+		if (collection.scope === StorageScope.WORKSPACE && !this._workspaceTrustManagementService.isWorkspaceTrusted()) {
+			if (errorOnUserInteraction) {
+				throw new UserInteractionRequiredError('workspaceTrust');
+			} else if (!await this._workspaceTrustRequestService.requestWorkspaceTrust({ message: localize('runTrust', "This MCP server definition is defined in your workspace files.") })) {
+				return false;
+			}
+		}
+
 		if (collection.trustBehavior === McpServerTrust.Kind.Trusted) {
 			this._logService.trace(`MCP server ${definition.id} is trusted, no trust prompt needed`);
 			return true;