@codingame/monaco-vscode-mcp-service-override 26.0.1 → 26.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-mcp-service-override",
-  "version": "26.0.1",
+  "version": "26.1.1",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - mcp service-override",
   "keywords": [],
@@ -15,7 +15,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-api": "26.0.1"
+    "@codingame/monaco-vscode-api": "26.1.1"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -10,6 +10,8 @@ import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/pla
 import { IQuickInputService } from "@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service";
 import { StorageScope } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage";
 import { IWorkspaceFolderData } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace";
+import { IWorkspaceTrustRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
+import { IWorkspaceTrustManagementService } from "@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service";
 import { IConfigurationResolverService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service";
 import { IResolvedValue } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolverExpression";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
@@ -25,6 +27,8 @@ export declare class McpRegistry extends Disposable implements IMcpRegistry {
     private readonly _quickInputService;
     private readonly _labelService;
     private readonly _logService;
+    private readonly _workspaceTrustManagementService;
+    private readonly _workspaceTrustRequestService;
     readonly _serviceBrand: undefined;
     private readonly _collections;
     private readonly _delegates;
@@ -40,7 +44,7 @@ export declare class McpRegistry extends Disposable implements IMcpRegistry {
     get delegates(): IObservable<readonly IMcpHostDelegate[]>;
     private readonly _onDidChangeInputs;
     readonly onDidChangeInputs: import("@codingame/monaco-vscode-api/vscode/vs/base/common/event").Event<void>;
-    constructor(_instantiationService: IInstantiationService, _configurationResolverService: IConfigurationResolverService, _dialogService: IDialogService, _notificationService: INotificationService, _editorService: IEditorService, configurationService: IConfigurationService, _quickInputService: IQuickInputService, _labelService: ILabelService, _logService: ILogService);
+    constructor(_instantiationService: IInstantiationService, _configurationResolverService: IConfigurationResolverService, _dialogService: IDialogService, _notificationService: INotificationService, _editorService: IEditorService, configurationService: IConfigurationService, _quickInputService: IQuickInputService, _labelService: ILabelService, _logService: ILogService, _workspaceTrustManagementService: IWorkspaceTrustManagementService, _workspaceTrustRequestService: IWorkspaceTrustRequestService);
     registerDelegate(delegate: IMcpHostDelegate): IDisposable;
     registerCollection(collection: McpCollectionDefinition): IDisposable;
     getServerDefinition(collectionRef: McpDefinitionReference, definitionRef: McpDefinitionReference): IObservable<{

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

@@ -24,6 +24,7 @@ import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/pla
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { StorageScope, StorageTarget } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
+import { IWorkspaceTrustManagementService, IWorkspaceTrustRequestService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { IConfigurationResolverService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolver.service';
 import { ConfigurationResolverExpression } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/configurationResolver/common/configurationResolverExpression';
 import { AUX_WINDOW_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';
@@ -31,7 +32,7 @@ import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench
 import { IMcpDevModeDebugging } from './mcpDevMode.service.js';
 import { McpRegistryInputStorage } from './mcpRegistryInputStorage.js';
 import { McpServerConnection } from './mcpServerConnection.js';
-import { LazyCollectionState, McpServerTrust, UserInteractionRequiredError, McpStartServerInteraction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
+import { LazyCollectionState, UserInteractionRequiredError, McpServerTrust, McpStartServerInteraction } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { observableValue } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/observableValue';
 import { derived } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/observables/derived';
@@ -51,7 +52,9 @@ let McpRegistry = class McpRegistry extends Disposable {
         configurationService,
         _quickInputService,
         _labelService,
-        _logService
+        _logService,
+        _workspaceTrustManagementService,
+        _workspaceTrustRequestService
     ) {
         super();
         this._instantiationService = _instantiationService;
@@ -62,6 +65,8 @@ let McpRegistry = class McpRegistry extends Disposable {
         this._quickInputService = _quickInputService;
         this._labelService = _labelService;
         this._logService = _logService;
+        this._workspaceTrustManagementService = _workspaceTrustManagementService;
+        this._workspaceTrustRequestService = _workspaceTrustRequestService;
         this._collections = observableValue("collections", []);
         this._delegates = observableValue("delegates", []);
         this.collections = derived(reader => {
@@ -215,6 +220,15 @@ let McpRegistry = class McpRegistry extends Disposable {
             errorOnUserInteraction = false
         }
     ) {
+        if (collection.scope === StorageScope.WORKSPACE && !this._workspaceTrustManagementService.isWorkspaceTrusted()) {
+            if (errorOnUserInteraction) {
+                throw ( new UserInteractionRequiredError("workspaceTrust"));
+            } else if (!(await this._workspaceTrustRequestService.requestWorkspaceTrust({
+                message: ( localize(9350, "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;
@@ -288,7 +302,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             const originURI = r.definition.presentation?.origin?.uri || r.collection.presentation?.origin;
             let labelWithOrigin = originURI ? `[\`${r.definition.label}\`](${originURI})` : "`" + r.definition.label + "`";
             if (r.collection.source instanceof ExtensionIdentifier) {
-                labelWithOrigin += ` (${( localize(9350, "from {0}", r.collection.source.value))})`;
+                labelWithOrigin += ` (${( localize(9351, "from {0}", r.collection.source.value))})`;
             }
             return labelWithOrigin;
         }
@@ -298,12 +312,12 @@ let McpRegistry = class McpRegistry extends Disposable {
             const {
                 result
             } = await this._dialogService.prompt({
-                message: ( localize(9351, "Trust and run MCP server {0}?", def.definition.label)),
+                message: ( localize(9352, "Trust and run MCP server {0}?", def.definition.label)),
                 custom: {
                     icon: Codicon.shield,
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            9352,
+                            9353,
                             "The MCP server {0} was updated. MCP servers may add context to your chat session and lead to unexpected behavior. Do you want to trust and run this server?",
                             labelFor(def)
                         )))),
@@ -316,10 +330,10 @@ let McpRegistry = class McpRegistry extends Disposable {
                     }]
                 },
                 buttons: [{
-                    label: ( localize(9353, "Trust")),
+                    label: ( localize(9354, "Trust")),
                     run: () => true
                 }, {
-                    label: ( localize(9354, "Do not trust")),
+                    label: ( localize(9355, "Do not trust")),
                     run: () => false
                 }]
             });
@@ -329,12 +343,12 @@ let McpRegistry = class McpRegistry extends Disposable {
         const {
             result
         } = await this._dialogService.prompt({
-            message: ( localize(9355, "Trust and run {0} MCP servers?", definitions.length)),
+            message: ( localize(9356, "Trust and run {0} MCP servers?", definitions.length)),
             custom: {
                 icon: Codicon.shield,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        9356,
+                        9357,
                         "Several updated MCP servers were discovered:\n\n{0}\n\n MCP servers may add context to your chat session and lead to unexpected behavior. Do you want to trust and run these server?",
                         list
                     )))),
@@ -347,13 +361,13 @@ let McpRegistry = class McpRegistry extends Disposable {
                 }]
             },
             buttons: [{
-                label: ( localize(9353, "Trust")),
+                label: ( localize(9354, "Trust")),
                 run: () => "all"
             }, {
-                label: ( localize(9357, "Pick Trusted")),
+                label: ( localize(9358, "Pick Trusted")),
                 run: () => "pick"
             }, {
-                label: ( localize(9354, "Do not trust")),
+                label: ( localize(9355, "Do not trust")),
                 run: () => "none"
             }]
         });
@@ -510,14 +524,14 @@ let McpRegistry = class McpRegistry extends Disposable {
             }
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(9358, "Error starting {0}: {1}", definition.label, String(e))),
+                message: ( localize(9359, "Error starting {0}: {1}", definition.label, String(e))),
                 actions: {
                     primary: collection.presentation?.origin && [{
                         id: "mcp.launchError.openConfig",
                         class: undefined,
                         enabled: true,
                         tooltip: "",
-                        label: ( localize(9359, "Open Configuration")),
+                        label: ( localize(9360, "Open Configuration")),
                         run: () => this._editorService.openEditor({
                             resource: collection.presentation.origin,
                             options: {
@@ -541,6 +555,6 @@ let McpRegistry = class McpRegistry extends Disposable {
         );
     }
 };
-McpRegistry = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IConfigurationResolverService)), ( __param(2, IDialogService)), ( __param(3, INotificationService)), ( __param(4, IEditorService)), ( __param(5, IConfigurationService)), ( __param(6, IQuickInputService)), ( __param(7, ILabelService)), ( __param(8, ILogService))], McpRegistry));
+McpRegistry = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IConfigurationResolverService)), ( __param(2, IDialogService)), ( __param(3, INotificationService)), ( __param(4, IEditorService)), ( __param(5, IConfigurationService)), ( __param(6, IQuickInputService)), ( __param(7, ILabelService)), ( __param(8, ILogService)), ( __param(9, IWorkspaceTrustManagementService)), ( __param(10, IWorkspaceTrustRequestService))], McpRegistry));
 
 export { McpRegistry };

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

@@ -41,7 +41,7 @@ let McpSamplingLog = class McpSamplingLog extends Disposable {
         }
         const parts = [];
         const total = record.bins.reduce((sum, value) => sum + value, 0);
-        parts.push(( localize(9360, "{0} total requests in the last 7 days.", total)));
+        parts.push(( localize(9361, "{0} total requests in the last 7 days.", total)));
         parts.push(this._formatRecentRequests(record));
         return parts.join("\n");
     }

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

@@ -132,11 +132,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                 return this._getMatchingModel(opts);
             }
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                9361,
+                9362,
                 "Allow MCP tools from \"{0}\" to make LLM requests?",
                 opts.server.definition.label
             )), ( localize(
-                9362,
+                9363,
                 "The MCP server \"{0}\" has issued a request to make a language model call. Do you want to allow it to make requests during chat?",
                 opts.server.definition.label
             )), this.allowButtons(opts.server, "allowedDuringChat"));
@@ -150,11 +150,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                 return this._getMatchingModel(opts);
             }
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                9363,
+                9364,
                 "Allow MCP server \"{0}\" to make LLM requests?",
                 opts.server.definition.label
             )), ( localize(
-                9364,
+                9365,
                 "The MCP server \"{0}\" has issued a request to make a language model call. Do you want to allow it to make requests, outside of tool calls during chat?",
                 opts.server.definition.label
             )), this.allowButtons(opts.server, "allowedOutsideChat"));
@@ -166,12 +166,12 @@ let McpSamplingService = class McpSamplingService extends Disposable {
             throw McpError.notAllowed();
         } else if (model === ModelMatch.NoMatchingModel) {
             const newlyPickedModels = opts.isDuringToolCall ? await this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server) : await this._notify(( localize(
-                9365,
+                9366,
                 "MCP server \"{0}\" triggered a language model request, but it has no allowlisted models.",
                 opts.server.definition.label
             )), {
-                [( localize(9366, "Configure"))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
-                [( localize(9367, "Cancel"))]: () => Promise.resolve(undefined)
+                [( localize(9367, "Configure"))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
+                [( localize(9368, "Cancel"))]: () => Promise.resolve(undefined)
             });
             if (newlyPickedModels) {
                 return this._getMatchingModel(opts);
@@ -182,19 +182,19 @@ let McpSamplingService = class McpSamplingService extends Disposable {
     }
     allowButtons(server, key) {
         return {
-            [( localize(9368, "Allow in this Session"))]: async () => {
+            [( localize(9369, "Allow in this Session"))]: async () => {
                 this._sessionSets[key].set(server.definition.id, true);
                 return true;
             },
-            [( localize(9369, "Always"))]: async () => {
+            [( localize(9370, "Always"))]: async () => {
                 await this.updateConfig(server, c => c[key] = true);
                 return true;
             },
-            [( localize(9370, "Not Now"))]: async () => {
+            [( localize(9371, "Not Now"))]: async () => {
                 this._sessionSets[key].set(server.definition.id, false);
                 return false;
             },
-            [( localize(9371, "Never"))]: async () => {
+            [( localize(9372, "Never"))]: async () => {
                 await this.updateConfig(server, c => c[key] = false);
                 return false;
             }

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

@@ -49,7 +49,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         this._state.set({
             state: McpConnectionState.Kind.Starting
         }, undefined);
-        this._logger.info(( localize(9381, "Starting server {0}", this.definition.label)));
+        this._logger.info(( localize(9382, "Starting server {0}", this.definition.label)));
         try {
             const launch = this._delegate.start(this._collection, this.definition, this.launchDefinition, {
                 errorOnUserInteraction: this._errorOnUserInteraction
@@ -82,7 +82,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         store.add(autorun(reader => {
             const state = launch.state.read(reader);
             this._state.set(state, undefined);
-            this._logger.info(( localize(9382, "Connection state: {0}", (McpConnectionState.toString(state)))));
+            this._logger.info(( localize(9383, "Connection state: {0}", (McpConnectionState.toString(state)))));
             if (state.state === McpConnectionState.Kind.Running && !didStart) {
                 didStart = true;
                 McpServerRequestHandler.create(this._instantiationService, {
@@ -121,7 +121,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         };
     }
     async stop() {
-        this._logger.info(( localize(9383, "Stopping server {0}", this.definition.label)));
+        this._logger.info(( localize(9384, "Stopping server {0}", this.definition.label)));
         this._launch.value?.object.stop();
         await this._waitForState(McpConnectionState.Kind.Stopped, McpConnectionState.Kind.Error);
     }

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpService.js

@@ -120,7 +120,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             numberOfRequests += ( Object.keys(accessRequest)).length;
         });
         if (numberOfRequests > 0) {
-            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(14107, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(14108, "Sign in requested"))));
             this._accountBadgeDisposable.value = this.activityService.showAccountsActivity({
                 badge
             });
@@ -194,17 +194,17 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
         } = await this.dialogService.prompt({
             type: Severity.Info,
             message: ( localize(
-                14108,
+                14109,
                 "The MCP server '{0}' wants to access the {1} account '{2}'.",
                 mcpServerName,
                 provider.label,
                 accountName
             )),
             buttons: [{
-                label: ( localize(14109, "&&Allow")),
+                label: ( localize(14110, "&&Allow")),
                 run: () => SessionPromptChoice.Allow
             }, {
-                label: ( localize(14110, "&&Deny")),
+                label: ( localize(14111, "&&Deny")),
                 run: () => SessionPromptChoice.Deny
             }],
             cancelButton: {
@@ -246,17 +246,17 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             }
         });
         items.push({
-            label: ( localize(14111, "Sign in to another account"))
+            label: ( localize(14112, "Sign in to another account"))
         });
         quickPick.items = items;
         quickPick.title = ( localize(
-            14112,
+            14113,
             "The MCP server '{0}' wants to access a {1} account",
             mcpServerName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            14113,
+            14114,
             "Select an account for '{0}' to use or Esc to cancel",
             mcpServerName
         ));
@@ -336,7 +336,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             group: "3_accessRequests",
             command: {
                 id: `${providerId}${mcpServerId}Access`,
-                title: ( localize(14114, "Grant access to {0} for {1}... (1)", provider.label, mcpServerName))
+                title: ( localize(14115, "Grant access to {0} for {1}... (1)", provider.label, mcpServerName))
             }
         }));
         const accessCommand = CommandsRegistry.registerCommand({
@@ -380,7 +380,7 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             group: "2_signInRequests",
             command: {
                 id: commandId,
-                title: ( localize(14115, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
+                title: ( localize(14116, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({