@codingame/monaco-vscode-mcp-service-override 34.1.3 → 35.0.0

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

@@ -86,7 +86,7 @@ let NativeFilesystemMcpDiscovery = class NativeFilesystemMcpDiscovery extends Fi
         this.suffix = "";
         if (remoteAuthority) {
             this.suffix = " " + ( localize(
-                11457,
+                12088,
                 " on {0}",
                 labelService.getHostLabel(Schemas.vscodeRemote, remoteAuthority)
             ));

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(11501, "Context key that has the number of registered MCP servers"))
+        description: ( localize(12132, "Context key that has the number of registered MCP servers"))
     }));
     McpContextKeys.hasUnknownTools = ( new RawContextKey("mcp.hasUnknownTools", undefined, {
         type: "boolean",
-        description: ( localize(11502, "Indicates whether there are MCP servers with unknown tools."))
+        description: ( localize(12133, "Indicates whether there are MCP servers with unknown tools."))
     }));
     McpContextKeys.hasServersWithErrors = ( new RawContextKey("mcp.hasServersWithErrors", undefined, {
         type: "boolean",
-        description: ( localize(11503, "Indicates whether there are any MCP servers with errors."))
+        description: ( localize(12134, "Indicates whether there are any MCP servers with errors."))
     }));
     McpContextKeys.toolsCount = ( new RawContextKey("mcp.toolsCount", undefined, {
         type: "number",
-        description: ( localize(11504, "Context key that has the number of registered MCP tools"))
+        description: ( localize(12135, "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/mcpLanguageModelToolContribution.js

@@ -71,7 +71,8 @@ let McpLanguageModelToolContribution = class McpLanguageModelToolContribution ex
                     const toolSet = store.add(
                         this._toolsService.createToolSet(source, server.definition.id, referenceName, {
                             icon: Codicon.mcp,
-                            description: ( localize(11505, "{0}: All Tools", server.definition.label))
+                            description: ( localize(12136, "{0}: All Tools", server.definition.label)),
+                            deprecated: true
                         })
                     );
                     return {
@@ -191,7 +192,7 @@ let McpToolImplementation = class McpToolImplementation {
         });
         const isSandboxedServer = sandboxEnabled === true;
         const mcpToolWarning = ( localize(
-            11506,
+            12137,
             "Note that MCP servers or malicious conversation content may attempt to misuse '{0}' through tools.",
             this._productService.nameShort
         ));
@@ -200,7 +201,7 @@ let McpToolImplementation = class McpToolImplementation {
         if (!isSandboxedServer) {
             confirm = {};
             if (!tool.definition.annotations?.readOnlyHint) {
-                confirm.title = ( new MarkdownString(( localize(11507, "Run {0}", title))));
+                confirm.title = ( new MarkdownString(( localize(12138, "Run {0}", title))));
                 confirm.message = ( new MarkdownString(tool.definition.description, {
                     supportThemeIcons: true
                 }));
@@ -214,13 +215,14 @@ let McpToolImplementation = class McpToolImplementation {
         const mcpUiEnabled = this._configurationService.getValue(mcpAppsEnabledConfig);
         return {
             confirmationMessages: confirm,
-            invocationMessage: ( new MarkdownString(( localize(11508, "Running {0}", title)))),
-            pastTenseMessage: ( new MarkdownString(( localize(11509, "Ran {0} ", title)))),
-            originMessage: ( localize(11510, "{0} (MCP Server)", server.definition.label)),
+            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)),
             toolSpecificData: {
                 kind: "input",
                 rawInput: context.parameters,
                 mcpAppData: mcpUiEnabled && tool.uiResourceUri ? {
+                    kind: "local",
                     resourceUri: tool.uiResourceUri,
                     serverDefinitionId: server.definition.id,
                     collectionId: server.collection.id

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

@@ -227,7 +227,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             if (errorOnUserInteraction) {
                 throw ( new UserInteractionRequiredError("workspaceTrust"));
             } else if (!(await this._workspaceTrustRequestService.requestWorkspaceTrust({
-                message: ( localize(11511, "This MCP server definition is defined in your workspace files."))
+                message: ( localize(12142, "This MCP server definition is defined in your workspace files."))
             }))) {
                 return false;
             }
@@ -305,7 +305,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(11512, "from {0}", r.collection.source.value))})`;
+                labelWithOrigin += ` (${( localize(12143, "from {0}", r.collection.source.value))})`;
             }
             return labelWithOrigin;
         }
@@ -315,12 +315,12 @@ let McpRegistry = class McpRegistry extends Disposable {
             const {
                 result
             } = await this._dialogService.prompt({
-                message: ( localize(11513, "Trust and run MCP server {0}?", def.definition.label)),
+                message: ( localize(12144, "Trust and run MCP server {0}?", def.definition.label)),
                 custom: {
                     icon: Codicon.shield,
                     markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            11514,
+                            12145,
                             "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)
                         )))),
@@ -333,10 +333,10 @@ let McpRegistry = class McpRegistry extends Disposable {
                     }]
                 },
                 buttons: [{
-                    label: ( localize(11515, "Trust")),
+                    label: ( localize(12146, "Trust")),
                     run: () => true
                 }, {
-                    label: ( localize(11516, "Do not trust")),
+                    label: ( localize(12147, "Do not trust")),
                     run: () => false
                 }]
             });
@@ -346,12 +346,12 @@ let McpRegistry = class McpRegistry extends Disposable {
         const {
             result
         } = await this._dialogService.prompt({
-            message: ( localize(11517, "Trust and run {0} MCP servers?", definitions.length)),
+            message: ( localize(12148, "Trust and run {0} MCP servers?", definitions.length)),
             custom: {
                 icon: Codicon.shield,
                 markdownDetails: [{
                     markdown: ( new MarkdownString(( localize(
-                        11518,
+                        12149,
                         "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
                     )))),
@@ -364,13 +364,13 @@ let McpRegistry = class McpRegistry extends Disposable {
                 }]
             },
             buttons: [{
-                label: ( localize(11515, "Trust")),
+                label: ( localize(12146, "Trust")),
                 run: () => "all"
             }, {
-                label: ( localize(11519, "Pick Trusted")),
+                label: ( localize(12150, "Pick Trusted")),
                 run: () => "pick"
             }, {
-                label: ( localize(11516, "Do not trust")),
+                label: ( localize(12147, "Do not trust")),
                 run: () => "none"
             }]
         });
@@ -533,14 +533,14 @@ let McpRegistry = class McpRegistry extends Disposable {
             }
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(11520, "Error starting {0}: {1}", definition.label, String(e))),
+                message: ( localize(12151, "Error starting {0}: {1}", definition.label, String(e))),
                 actions: {
                     primary: collection.presentation?.origin && [{
                         id: "mcp.launchError.openConfig",
                         class: undefined,
                         enabled: true,
                         tooltip: "",
-                        label: ( localize(11521, "Open Configuration")),
+                        label: ( localize(12152, "Open Configuration")),
                         run: () => this._editorService.openEditor({
                             resource: collection.presentation.origin,
                             options: {

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(11522, "{0} total requests in the last 7 days.", total)));
+        parts.push(( localize(12153, "{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

@@ -131,11 +131,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                 return this._getMatchingModel(opts);
             }
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                11523,
+                12154,
                 "Allow MCP tools from \"{0}\" to make LLM requests?",
                 opts.server.definition.label
             )), ( localize(
-                11524,
+                12155,
                 "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"));
@@ -149,11 +149,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
                 return this._getMatchingModel(opts);
             }
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                11525,
+                12156,
                 "Allow MCP server \"{0}\" to make LLM requests?",
                 opts.server.definition.label
             )), ( localize(
-                11526,
+                12157,
                 "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"));
@@ -165,12 +165,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(
-                11527,
+                12158,
                 "MCP server \"{0}\" triggered a language model request, but it has no allowlisted models.",
                 opts.server.definition.label
             )), {
-                [( localize(11528, "Configure"))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
-                [( localize(11529, "Cancel"))]: () => Promise.resolve(undefined)
+                [( localize(12159, "Configure"))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
+                [( localize(12160, "Cancel"))]: () => Promise.resolve(undefined)
             });
             if (newlyPickedModels) {
                 return this._getMatchingModel(opts);
@@ -181,19 +181,19 @@ let McpSamplingService = class McpSamplingService extends Disposable {
     }
     allowButtons(server, key) {
         return {
-            [( localize(11530, "Allow in this Session"))]: async () => {
+            [( localize(12161, "Allow in this Session"))]: async () => {
                 this._sessionSets[key].set(server.definition.id, true);
                 return true;
             },
-            [( localize(11531, "Always"))]: async () => {
+            [( localize(12162, "Always"))]: async () => {
                 await this.updateConfig(server, c => c[key] = true);
                 return true;
             },
-            [( localize(11532, "Not Now"))]: async () => {
+            [( localize(12163, "Not Now"))]: async () => {
                 this._sessionSets[key].set(server.definition.id, false);
                 return false;
             },
-            [( localize(11533, "Never"))]: async () => {
+            [( localize(12164, "Never"))]: async () => {
                 await this.updateConfig(server, c => c[key] = false);
                 return false;
             }

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

@@ -103,11 +103,11 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         const suggestionLines = [];
         if (allowedDomainsList.length) {
             const shown = ( allowedDomainsList.map(domain => `"${domain}"`)).join(", ");
-            suggestionLines.push(( localize(11534, "Add to `sandbox.network.allowedDomains`: {0}", shown)));
+            suggestionLines.push(( localize(12165, "Add to `sandbox.network.allowedDomains`: {0}", shown)));
         }
         if (allowWriteList.length) {
             const shown = ( allowWriteList.map(path => `"${path}"`)).join(", ");
-            suggestionLines.push(( localize(11535, "Add to `sandbox.filesystem.allowWrite`: {0}", shown)));
+            suggestionLines.push(( localize(12166, "Add to `sandbox.filesystem.allowWrite`: {0}", shown)));
         }
         const sandboxConfig = {};
         if (allowedDomainsList.length) {
@@ -122,7 +122,7 @@ let McpSandboxService = class McpSandboxService extends Disposable {
         }
         return {
             message: ( localize(
-                11536,
+                12167,
                 "The MCP server {0} reported potential sandbox blocks. VS Code found possible sandbox configuration updates:\n{1}",
                 serverLabel,
                 suggestionLines.join("\n")

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

@@ -52,7 +52,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         this._state.set({
             state: McpConnectionState.Kind.Starting
         }, undefined);
-        this._logger.info(( localize(11552, "Starting server {0}", this.definition.label)));
+        this._logger.info(( localize(12183, "Starting server {0}", this.definition.label)));
         try {
             const launch = this._delegate.start(this._collection, this.definition, this.launchDefinition, {
                 errorOnUserInteraction: this._errorOnUserInteraction
@@ -89,7 +89,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(11553, "Connection state: {0}", (McpConnectionState.toString(state)))));
+            this._logger.info(( localize(12184, "Connection state: {0}", (McpConnectionState.toString(state)))));
             if (state.state === McpConnectionState.Kind.Running && !didStart) {
                 didStart = true;
                 McpServerRequestHandler.create(this._instantiationService, {
@@ -128,7 +128,7 @@ let McpServerConnection = class McpServerConnection extends Disposable {
         };
     }
     async stop() {
-        this._logger.info(( localize(11554, "Stopping server {0}", this.definition.label)));
+        this._logger.info(( localize(12185, "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/contrib/mcp/common/mcpService.d.ts

@@ -1,11 +1,11 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IObservable, IReader, ITransaction } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
+import { IObservable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/observable";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
-import { ContributionEnablementState, EnablementModel, IEnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement";
+import { CollisionEnablementModel, EnablementModel } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement";
 import { McpCollisionBehavior } 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 { McpServerMetadataCache } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpServer";
@@ -50,16 +50,11 @@ export declare class McpService extends Disposable implements IMcpService {
  *
  * When collision behavior is `suffix`, delegates everything unchanged.
  */
-export declare class McpCollisionEnablementModel implements IEnablementModel {
-    private readonly _base;
+export declare class McpCollisionEnablementModel extends CollisionEnablementModel {
     /**
      * For each server definition ID, the list of all definition IDs that share
      * the same (case-insensitive) label, in priority order (lowest collection
      * order first). Empty when collision behavior is `suffix`.
      */
-    private readonly _collisionGroups;
-    constructor(_base: EnablementModel, registry: IMcpRegistry, collisionBehavior: IObservable<McpCollisionBehavior>);
-    readEnabled(key: string, reader?: IReader): ContributionEnablementState;
-    setEnabled(key: string, state: ContributionEnablementState, tx?: ITransaction): void;
-    remove(key: string): void;
+    constructor(base: EnablementModel, registry: IMcpRegistry, collisionBehavior: IObservable<McpCollisionBehavior>);
 }

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

@@ -11,7 +11,7 @@ import { mcpAutoStartConfig, McpAutoStartValue } from '@codingame/monaco-vscode-
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
 import { IStorageService } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service';
-import { EnablementModel, isContributionEnabled, ContributionEnablementState } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
+import { EnablementModel, isContributionEnabled, CollisionEnablementModel } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/enablement';
 import { mcpServerCollisionBehaviorSection, McpCollisionBehavior } 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 { McpPrefixGenerator, McpServerMetadataCache, McpServer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpServer';
@@ -216,10 +216,9 @@ McpService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IM
 function defsEqual(server, def) {
     return server.collection.id === def.collectionDefinition.id && server.definition.id === def.serverDefinition.id;
 }
-class McpCollisionEnablementModel {
-    constructor(_base, registry, collisionBehavior) {
-        this._base = _base;
-        this._collisionGroups = derived(reader => {
+class McpCollisionEnablementModel extends CollisionEnablementModel {
+    constructor(base, registry, collisionBehavior) {
+        const collisionGroups = derived(reader => {
             if (collisionBehavior.read(reader) !== McpCollisionBehavior.Disable) {
                 return ( new Map());
             }
@@ -247,49 +246,7 @@ class McpCollisionEnablementModel {
             }
             return groups;
         });
-    }
-    readEnabled(key, reader) {
-        const baseState = this._base.readEnabled(key, reader);
-        if (!isContributionEnabled(baseState)) {
-            return baseState;
-        }
-        const group = this._collisionGroups.read(reader).get(key);
-        if (!group) {
-            return baseState;
-        }
-        for (const otherId of group) {
-            if (otherId === key) {
-                return baseState;
-            }
-            if (isContributionEnabled(this._base.readEnabled(otherId, reader))) {
-                return ContributionEnablementState.DisabledProfile;
-            }
-        }
-        return baseState;
-    }
-    setEnabled(key, state, tx) {
-        const isEnabling = state === ContributionEnablementState.EnabledProfile || state === ContributionEnablementState.EnabledWorkspace;
-        const group = isEnabling ? this._collisionGroups.get().get(key) : undefined;
-        if (!group) {
-            this._base.setEnabled(key, state, tx);
-            return;
-        }
-        const updateGroup = innerTx => {
-            this._base.setEnabled(key, state, innerTx);
-            for (const otherId of group) {
-                if (otherId !== key) {
-                    this._base.setEnabled(otherId, ContributionEnablementState.DisabledWorkspace, innerTx);
-                }
-            }
-        };
-        if (tx) {
-            updateGroup(tx);
-        } else {
-            transaction(innerTx => updateGroup(innerTx));
-        }
-    }
-    remove(key) {
-        this._base.remove(key);
+        super(base, collisionGroups);
     }
 }
 

package/vscode/src/vs/workbench/services/authentication/browser/authenticationMcpAccessService.d.ts

@@ -27,6 +27,18 @@ export interface AllowedMcpServer {
      * Undefined for stdio servers, which have no URL.
      */
     url?: string;
+    /**
+     * Set when the grant is for an MCP server hosted by an agent host (which runs the server in the
+     * CLI/agent-host process rather than registering it with the workbench `IMcpService`). Carries the
+     * host `authority` and its display `label` so management surfaces can present agent-host servers in
+     * their own section instead of filtering them out as "unknown". Agent hosts
+     * may be ephemeral and not always connected, but we still want to be able to
+     * display grants we know about and will respect.
+     */
+    agentHost?: {
+        authority: string;
+        label: string;
+    };
 }
 export declare class AuthenticationMcpAccessService extends Disposable implements IAuthenticationMcpAccessService {
     private readonly _storageService;

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

@@ -96,6 +96,9 @@ let AuthenticationMcpAccessService = class AuthenticationMcpAccessService extend
                 if (mcpServer.url !== undefined) {
                     allowList[index].url = mcpServer.url;
                 }
+                if (mcpServer.agentHost !== undefined) {
+                    allowList[index].agentHost = mcpServer.agentHost;
+                }
             }
         }
         const userManagedServers = allowList.filter(server => !server.trusted);

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(16698, "Sign in requested"))));
+            const badge = ( new NumberBadge(numberOfRequests, () => ( localize(17361, "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(
-                16699,
+                17362,
                 "The MCP server '{0}' wants to access the {1} account '{2}'.",
                 mcpServerName,
                 provider.label,
                 accountName
             )),
             buttons: [{
-                label: ( localize(16700, "&&Allow")),
+                label: ( localize(17363, "&&Allow")),
                 run: () => SessionPromptChoice.Allow
             }, {
-                label: ( localize(16701, "&&Deny")),
+                label: ( localize(17364, "&&Deny")),
                 run: () => SessionPromptChoice.Deny
             }],
             cancelButton: {
@@ -246,17 +246,17 @@ let AuthenticationMcpService = class AuthenticationMcpService extends Disposable
             }
         });
         items.push({
-            label: ( localize(16702, "Sign in to another account"))
+            label: ( localize(17365, "Sign in to another account"))
         });
         quickPick.items = items;
         quickPick.title = ( localize(
-            16703,
+            17366,
             "The MCP server '{0}' wants to access a {1} account",
             mcpServerName,
             this._authenticationService.getProvider(providerId).label
         ));
         quickPick.placeholder = ( localize(
-            16704,
+            17367,
             "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(16705, "Grant access to {0} for {1}... (1)", provider.label, mcpServerName))
+                title: ( localize(17368, "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(16706, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
+                title: ( localize(17369, "Sign in with {0} to use {1} (1)", provider.label, mcpServerName))
             }
         }));
         const signInCommand = CommandsRegistry.registerCommand({

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

@@ -1,15 +0,0 @@
-import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IAgentPluginService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/plugins/agentPluginService.service";
-import { IMcpRegistry } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service";
-import { IMcpDiscovery } from "./mcpDiscovery.js";
-export declare class PluginMcpDiscovery extends Disposable implements IMcpDiscovery {
-    private readonly _agentPluginService;
-    private readonly _mcpRegistry;
-    readonly fromGallery = false;
-    private readonly _collections;
-    constructor(_agentPluginService: IAgentPluginService, _mcpRegistry: IMcpRegistry);
-    start(): void;
-    private createCollectionState;
-    private _toServerDefinition;
-    private _toLaunch;
-}