@codingame/monaco-vscode-mcp-service-override 23.2.2 → 24.1.0

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

@@ -15,13 +15,13 @@ import { IImageResizeService } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { StorageScope } from '@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage';
-import { getAttachableImageExtension, ChatResponseResource } from '@codingame/monaco-vscode-2339d6ac-d6bb-53cd-95ee-81911735d1c7-common/vscode/vs/workbench/contrib/chat/common/chatModel';
+import { getAttachableImageExtension, ChatResponseResource } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatModel';
 import { LanguageModelPartAudience } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelToolsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelToolsService.service';
 import { IMcpRegistry } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpRegistryTypes.service';
 import { McpToolResourceLinkMimeType, McpResourceURI } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
-import { mcpServerToSourceData } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
+import { mcpServerToSourceData } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 let McpLanguageModelToolContribution = class McpLanguageModelToolContribution extends Disposable {
@@ -36,21 +36,27 @@ let McpLanguageModelToolContribution = class McpLanguageModelToolContribution ex
             const servers = mcpService.servers.read(reader);
             const toDelete = ( new Set(( previous.keys())));
             for (const server of servers) {
-                if (( previous.has(server))) {
+                const previousRec = previous.get(server);
+                if (previousRec) {
                     toDelete.delete(server);
-                    continue;
+                    if (!previousRec.source || equals(previousRec.source, mcpServerToSourceData(server, reader))) {
+                        continue;
+                    }
+                    previousRec.dispose();
                 }
                 const store = ( new DisposableStore());
+                const rec = { dispose: () => store.dispose() };
                 const toolSet = ( new Lazy(() => {
-                    const source = mcpServerToSourceData(server);
-                    const toolSet = store.add(this._toolsService.createToolSet(source, server.definition.id, server.definition.label, {
+                    const source = rec.source = mcpServerToSourceData(server);
+                    const referenceName = server.definition.label.toLowerCase().replace(/\s+/g, '-');
+                    const toolSet = store.add(this._toolsService.createToolSet(source, server.definition.id, referenceName, {
                         icon: Codicon.mcp,
-                        description: ( localize(8867, "{0}: All Tools", server.definition.label))
+                        description: ( localize(8999, "{0}: All Tools", server.definition.label))
                     }));
                     return { toolSet, source };
                 }));
                 this._syncTools(server, toolSet, store);
-                previous.set(server, store);
+                previous.set(server, rec);
             }
             for (const key of toDelete) {
                 previous.deleteAndDispose(key);
@@ -138,14 +144,14 @@ let McpToolImplementation = class McpToolImplementation {
         const tool = this._tool;
         const server = this._server;
         const mcpToolWarning = ( localize(
-            8868,
+            9000,
             "Note that MCP servers or malicious conversation content may attempt to misuse '{0}' through tools.",
             this._productService.nameShort
         ));
         const title = tool.definition.annotations?.title || tool.definition.title || ('`' + tool.definition.name + '`');
         const confirm = {};
         if (!tool.definition.annotations?.readOnlyHint) {
-            confirm.title = ( new MarkdownString(( localize(8869, "Run {0}", title))));
+            confirm.title = ( new MarkdownString(( localize(9001, "Run {0}", title))));
             confirm.message = ( new MarkdownString(tool.definition.description, { supportThemeIcons: true }));
             confirm.disclaimer = mcpToolWarning;
             confirm.allowAutoConfirm = true;
@@ -155,9 +161,9 @@ let McpToolImplementation = class McpToolImplementation {
         }
         return {
             confirmationMessages: confirm,
-            invocationMessage: ( new MarkdownString(( localize(8870, "Running {0}", title)))),
-            pastTenseMessage: ( new MarkdownString(( localize(8871, "Ran {0} ", title)))),
-            originMessage: ( localize(8872, "{0} (MCP Server)", server.definition.label)),
+            invocationMessage: ( new MarkdownString(( localize(9002, "Running {0}", title)))),
+            pastTenseMessage: ( new MarkdownString(( localize(9003, "Ran {0} ", title)))),
+            originMessage: ( localize(9004, "{0} (MCP Server)", server.definition.label)),
             toolSpecificData: {
                 kind: 'input',
                 rawInput: context.parameters
@@ -270,7 +276,7 @@ let McpToolImplementation = class McpToolImplementation {
                         asResource: true,
                     });
                     if (isForModel) {
-                        const permalink = invocation.context && ChatResponseResource.createUri(invocation.context.sessionId, invocation.callId, result.content.length, basename(uri));
+                        const permalink = invocation.context && ChatResponseResource.createUri(invocation.context.sessionResource, invocation.callId, result.content.length, basename(uri));
                         addAsLinkedResource(permalink || uri, item.resource.mimeType);
                     }
                 }

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

@@ -18,7 +18,7 @@ import { ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/plat
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { McpAccessValue, mcpAccessConfig } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/platform/mcp/common/mcpManagement';
+import { McpAccessValue, mcpAccessConfig } from '@codingame/monaco-vscode-api/vscode/vs/platform/mcp/common/mcpManagement';
 import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { observableConfigValue } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/platformObservableUtils';
@@ -251,7 +251,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(8873, 'from {0}', r.collection.source.value))})`;
+                labelWithOrigin += ` (${( localize(9005, 'from {0}', r.collection.source.value))})`;
             }
             return labelWithOrigin;
         }
@@ -259,12 +259,12 @@ let McpRegistry = class McpRegistry extends Disposable {
             const def = definitions[0];
             const originURI = def.definition.presentation?.origin?.uri;
             const { result } = await this._dialogService.prompt({
-                message: ( localize(8874, 'Trust and run MCP server {0}?', def.definition.label)),
+                message: ( localize(9006, 'Trust and run MCP server {0}?', def.definition.label)),
                 custom: {
                     icon: Codicon.shield,
                     markdownDetails: [{
                             markdown: ( new MarkdownString(( localize(
-                                8875,
+                                9007,
                                 '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)
                             )))),
@@ -275,20 +275,20 @@ let McpRegistry = class McpRegistry extends Disposable {
                         }]
                 },
                 buttons: [
-                    { label: ( localize(8876, 'Trust')), run: () => true },
-                    { label: ( localize(8877, 'Do not trust')), run: () => false }
+                    { label: ( localize(9008, 'Trust')), run: () => true },
+                    { label: ( localize(9009, 'Do not trust')), run: () => false }
                 ],
             });
             return result === undefined ? undefined : (result ? [def.definition.id] : []);
         }
         const list = ( definitions.map(d => `- ${labelFor(d)}`)).join('\n');
         const { result } = await this._dialogService.prompt({
-            message: ( localize(8878, 'Trust and run {0} MCP servers?', definitions.length)),
+            message: ( localize(9010, 'Trust and run {0} MCP servers?', definitions.length)),
             custom: {
                 icon: Codicon.shield,
                 markdownDetails: [{
                         markdown: ( new MarkdownString(( localize(
-                            8879,
+                            9011,
                             '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
                         )))),
@@ -299,9 +299,9 @@ let McpRegistry = class McpRegistry extends Disposable {
                     }]
             },
             buttons: [
-                { label: ( localize(8876, 'Trust')), run: () => 'all' },
-                { label: ( localize(8880, 'Pick Trusted')), run: () => 'pick' },
-                { label: ( localize(8877, 'Do not trust')), run: () => 'none' },
+                { label: ( localize(9008, 'Trust')), run: () => 'all' },
+                { label: ( localize(9012, 'Pick Trusted')), run: () => 'pick' },
+                { label: ( localize(9009, 'Do not trust')), run: () => 'none' },
             ],
         });
         if (result === undefined) {
@@ -440,7 +440,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             }
             this._notificationService.notify({
                 severity: Severity.Error,
-                message: ( localize(8881, 'Error starting {0}: {1}', definition.label, String(e))),
+                message: ( localize(9013, 'Error starting {0}: {1}', definition.label, String(e))),
                 actions: {
                     primary: collection.presentation?.origin && [
                         {
@@ -448,7 +448,7 @@ let McpRegistry = class McpRegistry extends Disposable {
                             class: undefined,
                             enabled: true,
                             tooltip: '',
-                            label: ( localize(8882, 'Open Configuration')),
+                            label: ( localize(9014, 'Open Configuration')),
                             run: () => this._editorService.openEditor({
                                 resource: collection.presentation.origin,
                                 options: { selection: definition.presentation?.origin?.range }
@@ -459,7 +459,7 @@ let McpRegistry = class McpRegistry extends Disposable {
             });
             return;
         }
-        return this._instantiationService.createInstance(McpServerConnection, collection, definition, delegate, launch, logger, opts.errorOnUserInteraction);
+        return this._instantiationService.createInstance(McpServerConnection, collection, definition, delegate, launch, logger, opts.errorOnUserInteraction, opts.taskManager);
     }
 };
 McpRegistry = ( __decorate([

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

@@ -6,10 +6,12 @@ import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { FileSystemProviderCapabilities, FileType, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileReadStreamOptions, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability, IFileSystemProviderWithFileReadWriteCapability, IFileWriteOptions, IStat, IWatchOptions } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files";
 import { IFileService } from "@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service";
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
+import { IWebContentExtractorService } from "@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service";
 import { IWorkbenchContribution } from "@codingame/monaco-vscode-api/vscode/vs/workbench/common/contributions";
 export declare class McpResourceFilesystem extends Disposable implements IWorkbenchContribution, IFileSystemProviderWithFileReadWriteCapability, IFileSystemProviderWithFileAtomicReadCapability, IFileSystemProviderWithFileReadStreamCapability {
     private readonly _instantiationService;
     private readonly _fileService;
+    private readonly _webContentExtractorService;
     /** Defer getting the MCP service since this is a BlockRestore and no need to make it unnecessarily. */
     private readonly _mcpServiceLazy;
     /**
@@ -24,7 +26,7 @@ export declare class McpResourceFilesystem extends Disposable implements IWorkbe
     private readonly _onDidChangeFile;
     readonly onDidChangeFile: Event<readonly IFileChange[]>;
     readonly capabilities: FileSystemProviderCapabilities;
-    constructor(_instantiationService: IInstantiationService, _fileService: IFileService);
+    constructor(_instantiationService: IInstantiationService, _fileService: IFileService, _webContentExtractorService: IWebContentExtractorService);
     readFile(resource: URI): Promise<Uint8Array>;
     readFileStream(resource: URI, opts: IFileReadStreamOptions, token: CancellationToken): ReadableStreamEvents<Uint8Array>;
     watch(uri: URI, _opts: IWatchOptions): IDisposable;

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

@@ -15,9 +15,11 @@ import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { FileSystemProviderCapabilities, FileChangeType, createFileSystemProviderError, FileSystemProviderErrorCode, FileType } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { IWebContentExtractorService } from '@codingame/monaco-vscode-api/vscode/vs/platform/webContentExtractor/common/webContentExtractor.service';
 import { McpServer } from './mcpServer.js';
 import { McpResourceURI, McpCapability } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import { IMcpService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service';
+import { canLoadMcpNetworkResourceDirectly } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypesUtils';
 import { autorun } from '@codingame/monaco-vscode-api/vscode/vs/base/common/observableInternal/reactions/autorun';
 
 const MOMENTARY_CACHE_DURATION = 3000;
@@ -25,10 +27,11 @@ let McpResourceFilesystem = class McpResourceFilesystem extends Disposable {
     get _mcpService() {
         return this._mcpServiceLazy.value;
     }
-    constructor(_instantiationService, _fileService) {
+    constructor(_instantiationService, _fileService, _webContentExtractorService) {
         super();
         this._instantiationService = _instantiationService;
         this._fileService = _fileService;
+        this._webContentExtractorService = _webContentExtractorService;
         this._mcpServiceLazy = ( new Lazy(() => this._instantiationService.invokeFunction(a => a.get(IMcpService))));
         this._momentaryCache = ( new ResourceMap());
         this.onDidChangeCapabilities = Event.None;
@@ -197,17 +200,30 @@ let McpResourceFilesystem = class McpResourceFilesystem extends Disposable {
     }
     async _readURIInner(uri, token) {
         const { resourceURI, server } = this._decodeURI(uri);
+        const matchedServer = this._mcpService.servers.get().find(s => s.definition.id === server.definition.id);
+        if (canLoadMcpNetworkResourceDirectly(resourceURI, matchedServer)) {
+            const extractURI = ( URI.parse(( resourceURI.toString())));
+            const result = (await this._webContentExtractorService.extract([extractURI], { followRedirects: false })).at(0);
+            if (result?.status === 'ok') {
+                return {
+                    contents: [{ uri: ( resourceURI.toString()), text: result.result }],
+                    resourceURI,
+                    forSameURI: [{ uri: ( resourceURI.toString()), text: result.result }]
+                };
+            }
+        }
         const res = await McpServer.callOn(server, r => r.readResource({ uri: ( resourceURI.toString()) }, token), token);
         return {
             contents: res.contents,
             resourceURI,
-            forSameURI: res.contents.filter(c => equalsUrlPath(c.uri, resourceURI)),
+            forSameURI: res.contents.filter(c => equalsUrlPath(c.uri, resourceURI))
         };
     }
 };
 McpResourceFilesystem = ( __decorate([
     ( __param(0, IInstantiationService)),
-    ( __param(1, IFileService))
+    ( __param(1, IFileService)),
+    ( __param(2, IWebContentExtractorService))
 ], McpResourceFilesystem));
 function equalsUrlPath(a, b) {
     return equalsIgnoreCase(( new URL(a)).pathname, b.pathname);

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

@@ -2,7 +2,7 @@
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
 import { Disposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
-import { observableMemento } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/platform/observable/common/observableMemento';
+import { observableMemento } from '@codingame/monaco-vscode-api/vscode/vs/platform/observable/common/observableMemento';
 import { StorageScope, StorageTarget } 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';
 
@@ -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(8883, '{0} total requests in the last 7 days.', total)));
+        parts.push(( localize(9015, '{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.d.ts

@@ -6,7 +6,7 @@ import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/
 import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
-import { IMcpServerSamplingConfiguration } from "@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
+import { IMcpServerSamplingConfiguration } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration";
 import { IMcpServer, ISamplingOptions, ISamplingResult } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes";
 import { IMcpSamplingService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes.service";
 export declare class McpSamplingService extends Disposable implements IMcpSamplingService {

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

@@ -1,5 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
+import { asArray } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arrays';
 import { mapFindFirst } from '@codingame/monaco-vscode-api/vscode/vs/base/common/arraysFind';
 import { Sequencer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/async';
 import { decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
@@ -18,8 +19,8 @@ import '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/noti
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
 import { ChatMessageRole } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
-import { McpCommandIds } from '@codingame/monaco-vscode-08fd81c0-7fd8-5f7c-9776-f918dd532714-common/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
-import { mcpServerSamplingSection } from '@codingame/monaco-vscode-dc3fa21d-a483-5b99-a7ab-173235644a34-common/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
+import { McpCommandIds } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpCommandIds';
+import { mcpServerSamplingSection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpConfiguration';
 import { McpSamplingLog } from './mcpSamplingLog.js';
 import { McpError } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/mcp/common/mcpTypes';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
@@ -48,17 +49,17 @@ let McpSamplingService = class McpSamplingService extends Disposable {
     }
     async sample(opts, token = CancellationToken.None) {
         const messages = ( opts.params.messages.map((message) => {
-            const content = message.content.type === 'text'
-                ? { type: 'text', value: message.content.text }
-                : message.content.type === 'image' || message.content.type === 'audio'
-                    ? { type: 'image_url', value: { mimeType: message.content.mimeType, data: decodeBase64(message.content.data) } }
-                    : undefined;
-            if (!content) {
+            const content = ( asArray(message.content).map((part) => part.type === 'text'
+                ? { type: 'text', value: part.text }
+                : part.type === 'image' || part.type === 'audio'
+                    ? { type: 'image_url', value: { mimeType: part.mimeType, data: decodeBase64(part.data) } }
+                    : undefined)).filter(isDefined);
+            if (!content.length) {
                 return undefined;
             }
             return {
                 role: message.role === 'assistant' ? ChatMessageRole.Assistant : ChatMessageRole.User,
-                content: [content]
+                content,
             };
         })).filter(isDefined);
         if (opts.params.systemPrompt) {
@@ -106,11 +107,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
         const model = await this._getMatchingModelInner(opts.server, opts.isDuringToolCall, opts.params.modelPreferences);
         if (model === ModelMatch.UnsureAllowedDuringChat) {
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                8884,
+                9016,
                 'Allow MCP tools from "{0}" to make LLM requests?',
                 opts.server.definition.label
             )), ( localize(
-                8885,
+                9017,
                 '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'));
@@ -121,11 +122,11 @@ let McpSamplingService = class McpSamplingService extends Disposable {
         }
         else if (model === ModelMatch.UnsureAllowedOutsideChat) {
             const retry = await this._showContextual(opts.isDuringToolCall, ( localize(
-                8886,
+                9018,
                 'Allow MCP server "{0}" to make LLM requests?',
                 opts.server.definition.label
             )), ( localize(
-                8887,
+                9019,
                 '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'));
@@ -141,12 +142,12 @@ let McpSamplingService = class McpSamplingService extends Disposable {
             const newlyPickedModels = opts.isDuringToolCall
                 ? await this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server)
                 : await this._notify(( localize(
-                8888,
+                9020,
                 'MCP server "{0}" triggered a language model request, but it has no allowlisted models.',
                 opts.server.definition.label
             )), {
-                    [( localize(8889, 'Configure'))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
-                    [( localize(8890, 'Cancel'))]: () => Promise.resolve(undefined),
+                    [( localize(9021, 'Configure'))]: () => this._commandService.executeCommand(McpCommandIds.ConfigureSamplingModels, opts.server),
+                    [( localize(9022, 'Cancel'))]: () => Promise.resolve(undefined),
                 });
             if (newlyPickedModels) {
                 return this._getMatchingModel(opts);
@@ -157,19 +158,19 @@ let McpSamplingService = class McpSamplingService extends Disposable {
     }
     allowButtons(server, key) {
         return {
-            [( localize(8891, 'Allow in this Session'))]: async () => {
+            [( localize(9023, 'Allow in this Session'))]: async () => {
                 this._sessionSets[key].set(server.definition.id, true);
                 return true;
             },
-            [( localize(8892, 'Always'))]: async () => {
+            [( localize(9024, 'Always'))]: async () => {
                 await this.updateConfig(server, c => c[key] = true);
                 return true;
             },
-            [( localize(8893, 'Not Now'))]: async () => {
+            [( localize(9025, 'Not Now'))]: async () => {
                 this._sessionSets[key].set(server.definition.id, false);
                 return false;
             },
-            [( localize(8894, 'Never'))]: async () => {
+            [( localize(9026, 'Never'))]: async () => {
                 await this.updateConfig(server, c => c[key] = false);
                 return false;
             },

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

@@ -130,6 +130,8 @@ export declare class McpServer extends Disposable implements IMcpServer {
     private readonly _openerService;
     private readonly _samplingService;
     private readonly _elicitationService;
+    /** Shared task manager that survives reconnections */
+    private readonly _taskManager;
     /**
      * Helper function to call the function on the handler once it's online. The
      * connection started if it is not already.
@@ -189,14 +191,16 @@ export declare class McpServer extends Disposable implements IMcpServer {
 export declare class McpTool implements IMcpTool {
     private readonly _server;
     private readonly _definition;
+    private readonly _elicitationService;
     readonly id: string;
     readonly referenceName: string;
     readonly icons: IMcpIcons;
     get definition(): MCP.Tool;
-    constructor(_server: McpServer, idPrefix: string, _definition: ValidatedMcpTool);
+    constructor(_server: McpServer, idPrefix: string, _definition: ValidatedMcpTool, _elicitationService: IMcpElicitationService);
     call(params: Record<string, unknown>, context?: IMcpToolCallContext, token?: CancellationToken): Promise<MCP.CallToolResult>;
     callWithProgress(params: Record<string, unknown>, progress: ToolProgress, context?: IMcpToolCallContext, token?: CancellationToken): Promise<MCP.CallToolResult>;
-    _callWithProgress(params: Record<string, unknown>, progress: ToolProgress, context?: IMcpToolCallContext, token?: CancellationToken, allowRetry?: boolean): Promise<MCP.CallToolResult>;
+    _callWithProgress(params: Record<string, unknown>, progress: ToolProgress | undefined, context?: IMcpToolCallContext, token?: Readonly<CancellationToken>, allowRetry?: boolean): Promise<MCP.CallToolResult>;
+    private _handleElicitationErr;
     compare(other: IMcpTool): number;
 }
 export {};