@codingame/monaco-vscode-api 18.4.0 → 19.0.1

package/vscode/src/vs/workbench/api/common/extHostLanguageFeatures.js

@@ -13,15 +13,15 @@ import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { Range as Range$1 } from '../../../editor/common/core/range.js';
 import { Selection } from '../../../editor/common/core/selection.js';
-import { NewSymbolNameTriggerKind as NewSymbolNameTriggerKind$1, CompletionItemInsertTextRule, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1, InlineEditTriggerKind as InlineEditTriggerKind$1 } from '../../../editor/common/languages.js';
+import { NewSymbolNameTriggerKind as NewSymbolNameTriggerKind$1, CompletionItemInsertTextRule, InlineCompletionTriggerKind as InlineCompletionTriggerKind$1 } from '../../../editor/common/languages.js';
 import { encodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
 import { localize } from '../../../nls.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
-import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Cache } from './cache.js';
 import { ISuggestResultDtoField, ISuggestDataDtoField, MainContext } from './extHost.protocol.js';
-import { DocumentSymbol as DocumentSymbol$1, Range, SymbolTag, SymbolKind, DefinitionLink, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, Selection as Selection$1, CodeActionTriggerKind, WorkspaceEdit, Diagnostic, DataTransfer, DataTransferItem, TextEdit, WorkspaceSymbol, CompletionContext, MarkdownString, CompletionItemTag, CompletionItemKind, IconPath, PartialAcceptInfo, InlineCompletionEndOfLifeReason, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DocumentSelector } from './extHostTypeConverters.js';
-import { DocumentSymbol, Range as Range$2, CodeActionKind, CodeAction, InternalDataTransferItem, DataTransfer as DataTransfer$1, DocumentDropOrPasteEditKind, NewSymbolNameTriggerKind, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, CompletionList, SnippetString, InlineCompletionTriggerKind, InlineEditTriggerKind, Location, Disposable, SyntaxTokenType } from './extHostTypes.js';
+import { DocumentSymbol as DocumentSymbol$1, Range, SymbolTag, SymbolKind, DefinitionLink, Position, Hover, EvaluatableExpression, InlineValueContext, InlineValue, DocumentHighlight, MultiDocumentHighlight, location, Selection as Selection$1, CodeActionTriggerKind, WorkspaceEdit, Diagnostic, DataTransfer, DataTransferItem, TextEdit, WorkspaceSymbol, CompletionContext, MarkdownString, CompletionItemTag, CompletionItemKind, CompletionCommand, IconPath, PartialAcceptInfo, InlineCompletionEndOfLifeReason, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DocumentSelector } from './extHostTypeConverters.js';
+import { DocumentSymbol, Range as Range$2, CodeActionKind, CodeAction, InternalDataTransferItem, DataTransfer as DataTransfer$1, DocumentDropOrPasteEditKind, NewSymbolNameTriggerKind, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, CompletionList, SnippetString, InlineCompletionTriggerKind, InlineCompletionsDisposeReasonKind, Location, Disposable, SyntaxTokenType } from './extHostTypes.js';
 
 class DocumentSymbolAdapter {
     constructor(_documents, _provider) {
@@ -541,7 +541,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2582,
+                2598,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1109,10 +1109,7 @@ class InlineCompletionAdapter {
         if (!result) {
             return undefined;
         }
-        if (token.isCancellationRequested) {
-            return undefined;
-        }
-        const normalizedResult = Array.isArray(result) ? result : result.items;
+        const { resultItems, list } = Array.isArray(result) ? { resultItems: result, list: undefined } : { resultItems: result.items, list: result };
         const commands = this._isAdditionsProposedApiEnabled ? Array.isArray(result) ? [] : result.commands || [] : [];
         const enableForwardStability = this._isAdditionsProposedApiEnabled && !Array.isArray(result) ? result.enableForwardStability : undefined;
         let disposableStore = undefined;
@@ -1120,11 +1117,12 @@ class InlineCompletionAdapter {
             dispose() {
                 disposableStore?.dispose();
             },
-            items: normalizedResult
+            items: resultItems,
+            list,
         });
         return {
             pid,
-            items: ( normalizedResult.map((item, idx) => {
+            items: ( resultItems.map((item, idx) => {
                 let command = undefined;
                 if (item.command) {
                     if (!disposableStore) {
@@ -1165,85 +1163,33 @@ class InlineCompletionAdapter {
                 if (!disposableStore) {
                     disposableStore = ( new DisposableStore());
                 }
-                return this._commands.toInternal(c, disposableStore);
+                return CompletionCommand.from(c, this._commands, disposableStore);
             })),
             suppressSuggestions: false,
             enableForwardStability,
         };
     }
-    async provideInlineEditsForRange(resource, range, context, token) {
-        if (!this._provider.provideInlineEditsForRange) {
-            return undefined;
-        }
-        checkProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
-        const doc = this._documents.getDocument(resource);
-        const r = Range.to(range);
-        const result = await this._provider.provideInlineEditsForRange(doc, r, {
-            selectedCompletionInfo: context.selectedSuggestionInfo
-                ? {
-                    range: Range.to(context.selectedSuggestionInfo.range),
-                    text: context.selectedSuggestionInfo.text
+    disposeCompletions(pid, reason) {
+        const completionList = this._references.get(pid);
+        if (this._provider.handleListEndOfLifetime && this._isAdditionsProposedApiEnabled && completionList?.list) {
+            function translateReason(reason) {
+                switch (reason.kind) {
+                    case 'lostRace':
+                        return { kind: InlineCompletionsDisposeReasonKind.LostRace };
+                    case 'tokenCancellation':
+                        return { kind: InlineCompletionsDisposeReasonKind.TokenCancellation };
+                    case 'other':
+                        return { kind: InlineCompletionsDisposeReasonKind.Other };
+                    case 'empty':
+                        return { kind: InlineCompletionsDisposeReasonKind.Empty };
+                    case 'notTaken':
+                        return { kind: InlineCompletionsDisposeReasonKind.NotTaken };
+                    default:
+                        return { kind: InlineCompletionsDisposeReasonKind.Other };
                 }
-                : undefined,
-            triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
-            userPrompt: context.userPrompt,
-            requestUuid: context.requestUuid,
-        }, token);
-        if (!result) {
-            return undefined;
-        }
-        if (token.isCancellationRequested) {
-            return undefined;
+            }
+            this._provider.handleListEndOfLifetime(completionList.list, translateReason(reason));
         }
-        const normalizedResult = Array.isArray(result) ? result : result.items;
-        const commands = this._isAdditionsProposedApiEnabled ? Array.isArray(result) ? [] : result.commands || [] : [];
-        const enableForwardStability = this._isAdditionsProposedApiEnabled && !Array.isArray(result) ? result.enableForwardStability : undefined;
-        let disposableStore = undefined;
-        const pid = this._references.createReferenceId({
-            dispose() {
-                disposableStore?.dispose();
-            },
-            items: normalizedResult
-        });
-        return {
-            pid,
-            items: ( normalizedResult.map((item, idx) => {
-                let command = undefined;
-                if (item.command) {
-                    if (!disposableStore) {
-                        disposableStore = ( new DisposableStore());
-                    }
-                    command = this._commands.toInternal(item.command, disposableStore);
-                }
-                let action = undefined;
-                if (item.action) {
-                    if (!disposableStore) {
-                        disposableStore = ( new DisposableStore());
-                    }
-                    action = this._commands.toInternal(item.action, disposableStore);
-                }
-                const insertText = item.insertText;
-                return ({
-                    insertText: typeof insertText === 'string' ? insertText : { snippet: insertText.value },
-                    filterText: item.filterText,
-                    range: item.range ? Range.from(item.range) : undefined,
-                    command,
-                    action,
-                    idx: idx,
-                    completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
-                });
-            })),
-            commands: ( commands.map(c => {
-                if (!disposableStore) {
-                    disposableStore = ( new DisposableStore());
-                }
-                return this._commands.toInternal(c, disposableStore);
-            })),
-            suppressSuggestions: false,
-            enableForwardStability,
-        };
-    }
-    disposeCompletions(pid) {
         const data = this._references.disposeReferenceId(pid);
         data?.dispose();
     }
@@ -1282,85 +1228,6 @@ class InlineCompletionAdapter {
         }
     }
 }
-class InlineEditAdapter {
-    async provideInlineEdits(uri, context, token) {
-        const doc = this._documents.getDocument(uri);
-        const result = await this._provider.provideInlineEdit(doc, {
-            triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
-            requestUuid: context.requestUuid,
-        }, token);
-        if (!result) {
-            return undefined;
-        }
-        if (token.isCancellationRequested) {
-            return undefined;
-        }
-        let disposableStore = undefined;
-        const pid = this._references.createReferenceId({
-            dispose() {
-                disposableStore?.dispose();
-            },
-            item: result
-        });
-        let acceptCommand = undefined;
-        if (result.accepted) {
-            if (!disposableStore) {
-                disposableStore = ( new DisposableStore());
-            }
-            acceptCommand = this._commands.toInternal(result.accepted, disposableStore);
-        }
-        let rejectCommand = undefined;
-        if (result.rejected) {
-            if (!disposableStore) {
-                disposableStore = ( new DisposableStore());
-            }
-            rejectCommand = this._commands.toInternal(result.rejected, disposableStore);
-        }
-        let shownCommand = undefined;
-        if (result.shown) {
-            if (!disposableStore) {
-                disposableStore = ( new DisposableStore());
-            }
-            shownCommand = this._commands.toInternal(result.shown, disposableStore);
-        }
-        let action = undefined;
-        if (result.action) {
-            if (!disposableStore) {
-                disposableStore = ( new DisposableStore());
-            }
-            action = this._commands.toInternal(result.action, disposableStore);
-        }
-        if (!disposableStore) {
-            disposableStore = ( new DisposableStore());
-        }
-        const langResult = {
-            pid,
-            text: result.text,
-            range: Range.from(result.range),
-            showRange: Range.from(result.showRange),
-            accepted: acceptCommand,
-            rejected: rejectCommand,
-            shown: shownCommand,
-            action,
-            commands: result.commands?.map(c => this._commands.toInternal(c, disposableStore)),
-        };
-        return langResult;
-    }
-    disposeEdit(pid) {
-        const data = this._references.disposeReferenceId(pid);
-        data?.dispose();
-    }
-    constructor(_extension, _documents, _provider, _commands) {
-        this._documents = _documents;
-        this._provider = _provider;
-        this._commands = _commands;
-        this._references = ( new ReferenceMap());
-        this.languageTriggerKindToVSCodeTriggerKind = {
-            [InlineEditTriggerKind$1.Automatic]: InlineEditTriggerKind.Automatic,
-            [InlineEditTriggerKind$1.Invoke]: InlineEditTriggerKind.Invoke,
-        };
-    }
-}
 class ReferenceMap {
     constructor() {
         this._references = ( new Map());
@@ -1818,7 +1685,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2583,
+                2599,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -2201,14 +2068,11 @@ class ExtHostLanguageFeatures {
             const subscription = provider.onDidChange(_ => this._proxy.$emitInlineCompletionsChange(eventHandle));
             result = Disposable.from(result, subscription);
         }
-        this._proxy.$registerInlineCompletionsSupport(handle, this._transformDocumentSelector(selector, extension), adapter.supportsHandleEvents, ExtensionIdentifier.toKey(extension.identifier.value), metadata?.yieldTo?.map(extId => ExtensionIdentifier.toKey(extId)) || [], metadata?.displayName, metadata?.debounceDelayMs, eventHandle);
+        this._proxy.$registerInlineCompletionsSupport(handle, this._transformDocumentSelector(selector, extension), adapter.supportsHandleEvents, ExtensionIdentifier.toKey(extension.identifier.value), extension.version, metadata?.groupId ? ExtensionIdentifier.toKey(metadata.groupId) : undefined, metadata?.yieldTo?.map(extId => ExtensionIdentifier.toKey(extId)) || [], metadata?.displayName, metadata?.debounceDelayMs, eventHandle);
         return result;
     }
     $provideInlineCompletions(handle, resource, position, context, token) {
-        return this._withAdapter(handle, InlineCompletionAdapter, adapter => adapter.provideInlineCompletions(URI.revive(resource), position, context, token), undefined, token);
-    }
-    $provideInlineEditsForRange(handle, resource, range, context, token) {
-        return this._withAdapter(handle, InlineCompletionAdapter, adapter => adapter.provideInlineEditsForRange(URI.revive(resource), range, context, token), undefined, token);
+        return this._withAdapter(handle, InlineCompletionAdapter, adapter => adapter.provideInlineCompletions(URI.revive(resource), position, context, token), undefined, undefined);
     }
     $handleInlineCompletionDidShow(handle, pid, idx, updatedInsertText) {
         this._withAdapter(handle, InlineCompletionAdapter, async (adapter) => {
@@ -2230,20 +2094,8 @@ class ExtHostLanguageFeatures {
             adapter.handleRejection(pid, idx);
         }, undefined, undefined);
     }
-    $freeInlineCompletionsList(handle, pid) {
-        this._withAdapter(handle, InlineCompletionAdapter, async (adapter) => { adapter.disposeCompletions(pid); }, undefined, undefined);
-    }
-    registerInlineEditProvider(extension, selector, provider) {
-        const adapter = ( new InlineEditAdapter(extension, this._documents, provider, this._commands.converter));
-        const handle = this._addNewAdapter(adapter, extension);
-        this._proxy.$registerInlineEditProvider(handle, this._transformDocumentSelector(selector, extension), extension.identifier, provider.displayName || extension.name);
-        return this._createDisposable(handle);
-    }
-    $provideInlineEdit(handle, resource, context, token) {
-        return this._withAdapter(handle, InlineEditAdapter, adapter => adapter.provideInlineEdits(URI.revive(resource), context, token), undefined, token);
-    }
-    $freeInlineEdit(handle, pid) {
-        this._withAdapter(handle, InlineEditAdapter, async (adapter) => { adapter.disposeEdit(pid); }, undefined, undefined);
+    $freeInlineCompletionsList(handle, pid, reason) {
+        this._withAdapter(handle, InlineCompletionAdapter, async (adapter) => { adapter.disposeCompletions(pid, reason); }, undefined, undefined);
     }
     registerSignatureHelpProvider(extension, selector, provider, metadataOrTriggerChars) {
         const metadata = Array.isArray(metadataOrTriggerChars)

package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.d.ts

@@ -2,7 +2,7 @@ import type * as vscode from "vscode";
 import { CancellationToken } from "../../../base/common/cancellation.js";
 import { IDisposable } from "../../../base/common/lifecycle.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
-import { IPreparedToolInvocation, IToolInvocation, IToolResult } from "../../contrib/chat/common/languageModelToolsService.js";
+import { IPreparedToolInvocation, IToolInvocation, IToolInvocationPreparationContext, IToolResult } from "../../contrib/chat/common/languageModelToolsService.js";
 import { Dto, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto } from "./extHost.protocol.js";
 import { ExtHostLanguageModels } from "./extHostLanguageModels.js";
@@ -19,6 +19,6 @@ export declare class ExtHostLanguageModelTools implements ExtHostLanguageModelTo
     getTools(extension: IExtensionDescription): vscode.LanguageModelToolInformation[];
     $invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
     private getModel;
-    $prepareToolInvocation(toolId: string, input: any, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
+    $prepareToolInvocation(toolId: string, context: IToolInvocationPreparationContext, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     registerTool(extension: IExtensionDescription, id: string, tool: vscode.LanguageModelTool<any>): IDisposable;
 }

package/vscode/src/vs/workbench/api/common/extHostLanguageModelTools.js

@@ -173,12 +173,17 @@ class ExtHostLanguageModelTools {
         }
         return model;
     }
-    async $prepareToolInvocation(toolId, input, token) {
+    async $prepareToolInvocation(toolId, context, token) {
         const item = this._registeredTools.get(toolId);
         if (!item) {
             throw ( new Error(`Unknown tool ${toolId}`));
         }
-        const options = { input };
+        const options = {
+            input: context.parameters,
+            chatRequestId: context.chatRequestId,
+            chatSessionId: context.chatSessionId,
+            chatInteractionId: context.chatInteractionId
+        };
         if (isProposedApiEnabled(item.extension, 'chatParticipantPrivate') && item.tool.prepareInvocation2) {
             const result = await item.tool.prepareInvocation2(options, token);
             if (!result) {

package/vscode/src/vs/workbench/api/common/extHostLanguageModels.js

@@ -21,7 +21,6 @@ import { LanguageModelChatMessage2 } from './extHostTypeConverters.js';
 import { LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelDataPart, LanguageModelError, LanguageModelChatMessageRole } from './extHostTypes.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { VSBuffer } from '../../../base/common/buffer.js';
-import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../contrib/chat/common/modelPicker/modelPickerWidget.js';
 
 var ExtHostLanguageModels_1;
 const IExtHostLanguageModels = ( createDecorator('IExtHostLanguageModels'));
@@ -161,7 +160,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             targetExtensions: metadata.extensions,
             isDefault: metadata.isDefault,
             isUserSelectable: metadata.isUserSelectable,
-            modelPickerCategory: metadata.category ?? DEFAULT_MODEL_PICKER_CATEGORY,
+            modelPickerCategory: metadata.category,
             capabilities: metadata.capabilities,
         });
         const responseReceivedListener = provider.onDidReceiveLanguageModelResponse2?.(({ extensionId, participant, tokenCount }) => {
@@ -382,7 +381,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         try {
             const detail = justification
-                ? ( localize(2584, "Justification: {1}", to.displayName, justification))
+                ? ( localize(2600, "Justification: {1}", to.displayName, justification))
                 : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], { forceNewSession: { detail } });
             this.$updateModelAccesslist([{ from: from.identifier, to: to.identifier, enabled: true }]);

package/vscode/src/vs/workbench/api/common/extHostLogService.js

@@ -8,7 +8,7 @@ import { IExtHostInitDataService } from './extHostInitDataService.js';
 let ExtHostLogService = class ExtHostLogService extends LogService {
     constructor(isWorker, loggerService, initData) {
         const id = initData.remote.isRemote ? 'remoteexthost' : isWorker ? 'workerexthost' : 'exthost';
-        const name = initData.remote.isRemote ? ( localize(2585, "Extension Host (Remote)")) : isWorker ? ( localize(2586, "Extension Host (Worker)")) : ( localize(2587, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2601, "Extension Host (Remote)")) : isWorker ? ( localize(2602, "Extension Host (Worker)")) : ( localize(2603, "Extension Host"));
         super(loggerService.createLogger(id, { name }));
     }
 };

package/vscode/src/vs/workbench/api/common/extHostMcp.d.ts

@@ -1,6 +1,7 @@
 import * as vscode from "vscode";
 import { Disposable, IDisposable } from "../../../base/common/lifecycle.js";
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
+import { ILogService } from "../../../platform/log/common/log.service.js";
 import { McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
 import { ExtHostMcpShape, MainThreadMcpShape } from "./extHost.protocol.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
@@ -10,12 +11,13 @@ export interface IExtHostMpcService extends ExtHostMcpShape {
     registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpServerDefinitionProvider): IDisposable;
 }
 export declare class ExtHostMcpService extends Disposable implements IExtHostMpcService {
+    private readonly _logService;
     private readonly _extHostInitData;
     protected _proxy: MainThreadMcpShape;
     private readonly _initialProviderPromises;
     private readonly _sseEventSources;
     private readonly _unresolvedMcpServers;
-    constructor(extHostRpc: IExtHostRpcService, _extHostInitData: IExtHostInitDataService);
+    constructor(extHostRpc: IExtHostRpcService, _logService: ILogService, _extHostInitData: IExtHostInitDataService);
     $startMcp(id: number, launch: McpServerLaunch.Serialized): void;
     protected _startMcp(id: number, launch: McpServerLaunch): void;
     $stopMcp(id: number): void;

package/vscode/src/vs/workbench/api/common/extHostMcp.js

@@ -6,13 +6,14 @@ import { Disposable, DisposableMap, DisposableStore, toDisposable } from '../../
 import { SSEParser } from '../../../base/common/sseParser.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
-import { LogLevel } from '../../../platform/log/common/log.js';
+import { LogLevel, canLog } from '../../../platform/log/common/log.js';
+import { ILogService } from '../../../platform/log/common/log.service.js';
 import { StorageScope } from '../../../platform/storage/common/storage.js';
 import { McpServerLaunch, McpServerTransportType, McpConnectionState, extensionPrefixedIdentifier } from '../../contrib/mcp/common/mcpTypes.js';
 import { MainContext } from './extHost.protocol.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { McpServerDefinition } from './extHostTypeConverters.js';
-import { parseWWWAuthenticateHeader, getMetadataWithDefaultValues, getDefaultMetadataForUrl, isAuthorizationProtectedResourceMetadata, AUTH_SERVER_METADATA_DISCOVERY_PATH, isAuthorizationServerMetadata } from '../../../base/common/oauth.js';
+import { parseWWWAuthenticateHeader, getMetadataWithDefaultValues, getDefaultMetadataForUrl, isAuthorizationProtectedResourceMetadata, getResourceServerBaseUrlFromDiscoveryUrl, AUTH_SERVER_METADATA_DISCOVERY_PATH, isAuthorizationServerMetadata } from '../../../base/common/oauth.js';
 import { URI } from '../../../base/common/uri.js';
 import { MCP } from '../../contrib/mcp/common/modelContextProtocol.js';
 import { CancellationError } from '../../../base/common/errors.js';
@@ -21,8 +22,9 @@ import { IExtHostInitDataService } from './extHostInitDataService.js';
 
 const IExtHostMpcService = ( createDecorator('IExtHostMpcService'));
 let ExtHostMcpService = class ExtHostMcpService extends Disposable {
-    constructor(extHostRpc, _extHostInitData) {
+    constructor(extHostRpc, _logService, _extHostInitData) {
         super();
+        this._logService = _logService;
         this._extHostInitData = _extHostInitData;
         this._initialProviderPromises = ( new Set());
         this._sseEventSources = this._register(( new DisposableMap()));
@@ -34,7 +36,7 @@ let ExtHostMcpService = class ExtHostMcpService extends Disposable {
     }
     _startMcp(id, launch) {
         if (launch.type === McpServerTransportType.HTTP) {
-            this._sseEventSources.set(id, ( new McpHTTPHandle(id, launch, this._proxy)));
+            this._sseEventSources.set(id, ( new McpHTTPHandle(id, launch, this._proxy, this._logService)));
             return;
         }
         throw ( new Error('not implemented'));
@@ -130,7 +132,8 @@ let ExtHostMcpService = class ExtHostMcpService extends Disposable {
 };
 ExtHostMcpService = ( __decorate([
     ( __param(0, IExtHostRpcService)),
-    ( __param(1, IExtHostInitDataService))
+    ( __param(1, ILogService)),
+    ( __param(2, IExtHostInitDataService))
 ], ExtHostMcpService));
 var HttpMode;
 (function (HttpMode) {
@@ -138,12 +141,15 @@ var HttpMode;
     HttpMode[HttpMode["Http"] = 1] = "Http";
     HttpMode[HttpMode["SSE"] = 2] = "SSE";
 })(HttpMode || (HttpMode = {}));
+const MAX_FOLLOW_REDIRECTS = 5;
+const REDIRECT_STATUS_CODES = [301, 302, 303, 307, 308];
 class McpHTTPHandle extends Disposable {
-    constructor(_id, _launch, _proxy) {
+    constructor(_id, _launch, _proxy, _logService) {
         super();
         this._id = _id;
         this._launch = _launch;
         this._proxy = _proxy;
+        this._logService = _logService;
         this._requestSequencer = ( new Sequencer());
         this._postEndpoint = ( new DeferredPromise());
         this._mode = { value: HttpMode.Unknown };
@@ -185,7 +191,6 @@ class McpHTTPHandle extends Disposable {
         await this._addAuthHeader(headers);
         const res = await this._fetchWithAuthRetry(( this._launch.uri.toString(true)), {
             method: 'POST',
-            signal: this._abortCtrl.signal,
             headers,
             body: asBytes,
         }, headers);
@@ -205,7 +210,7 @@ class McpHTTPHandle extends Disposable {
             const retryWithSessionId = this._mode.value === HttpMode.Http && !!this._mode.sessionId && (res.status === 400 || res.status === 404);
             this._proxy.$onDidChangeState(this._id, {
                 state: McpConnectionState.Kind.Error,
-                message: `${res.status} status sending message to ${this._launch.uri}: ${await this._getErrText(res)}` + retryWithSessionId ? `; will retry with new session ID` : '',
+                message: `${res.status} status sending message to ${this._launch.uri}: ${await this._getErrText(res)}` + (retryWithSessionId ? `; will retry with new session ID` : ''),
                 shouldRetry: retryWithSessionId,
             });
             return;
@@ -281,9 +286,8 @@ class McpHTTPHandle extends Disposable {
                 ...Object.fromEntries(this._launch.headers)
             };
         }
-        const resourceMetadataResponse = await fetch(resourceMetadata, {
+        const resourceMetadataResponse = await this._fetch(resourceMetadata, {
             method: 'GET',
-            signal: this._abortCtrl.signal,
             headers: {
                 ...additionalHeaders,
                 'Accept': 'application/json',
@@ -297,6 +301,12 @@ class McpHTTPHandle extends Disposable {
         }
         const body = await resourceMetadataResponse.json();
         if (isAuthorizationProtectedResourceMetadata(body)) {
+            const resolvedResource = getResourceServerBaseUrlFromDiscoveryUrl(resourceMetadata);
+            if (body.resource !== resolvedResource) {
+                throw ( new Error(
+                    `Protected Resource Metadata resource "${body.resource}" does not match MCP server resolved resource "${resolvedResource}". The MCP server must follow OAuth spec https://datatracker.ietf.org/doc/html/rfc9728#PRConfigurationValidation`
+                ));
+            }
             return body;
         }
         else {
@@ -307,9 +317,8 @@ class McpHTTPHandle extends Disposable {
         const authorizationServerUrl = ( new URL(authorizationServer));
         const extraPath = authorizationServerUrl.pathname === '/' ? '' : authorizationServerUrl.pathname;
         const pathToFetch = ( ( new URL(AUTH_SERVER_METADATA_DISCOVERY_PATH, authorizationServer)).toString()) + extraPath;
-        let authServerMetadataResponse = await fetch(pathToFetch, {
+        let authServerMetadataResponse = await this._fetch(pathToFetch, {
             method: 'GET',
-            signal: this._abortCtrl.signal,
             headers: {
                 ...addtionalHeaders,
                 'Accept': 'application/json',
@@ -317,9 +326,8 @@ class McpHTTPHandle extends Disposable {
             }
         });
         if (authServerMetadataResponse.status !== 200) {
-            authServerMetadataResponse = await fetch(( URI.joinPath(( URI.parse(authorizationServer)), '.well-known', 'openid-configuration').toString(true)), {
+            authServerMetadataResponse = await this._fetch(( URI.joinPath(( URI.parse(authorizationServer)), '.well-known', 'openid-configuration').toString(true)), {
                 method: 'GET',
-                signal: this._abortCtrl.signal,
                 headers: {
                     ...addtionalHeaders,
                     'Accept': 'application/json',
@@ -395,7 +403,6 @@ class McpHTTPHandle extends Disposable {
                 }
                 res = await this._fetchWithAuthRetry(( this._launch.uri.toString(true)), {
                     method: 'GET',
-                    signal: this._abortCtrl.signal,
                     headers,
                 }, headers);
             }
@@ -407,7 +414,9 @@ class McpHTTPHandle extends Disposable {
                 this._log(LogLevel.Debug, `${res.status} status connecting to ${this._launch.uri} for async notifications; they will be disabled: ${await this._getErrText(res)}`);
                 return;
             }
-            retry = 0;
+            if (res.headers.get('content-type')?.toLowerCase().includes('text/event-stream')) {
+                retry = 0;
+            }
             const parser = ( new SSEParser(event => {
                 if (event.type === 'message') {
                     this._proxy.$onDidReceiveMessage(this._id, event.data);
@@ -435,7 +444,6 @@ class McpHTTPHandle extends Disposable {
         try {
             res = await this._fetchWithAuthRetry(( this._launch.uri.toString(true)), {
                 method: 'GET',
-                signal: this._abortCtrl.signal,
                 headers,
             }, headers);
             if (res.status >= 300) {
@@ -469,9 +477,8 @@ class McpHTTPHandle extends Disposable {
             'Content-Length': String(asBytes.length),
         };
         await this._addAuthHeader(headers);
-        const res = await fetch(url, {
+        const res = await this._fetch(url, {
             method: 'POST',
-            signal: this._abortCtrl.signal,
             headers,
             body: asBytes,
         });
@@ -531,7 +538,7 @@ class McpHTTPHandle extends Disposable {
         }
     }
     async _fetchWithAuthRetry(url, init, headers) {
-        const doFetch = () => fetch(url, init);
+        const doFetch = () => this._fetch(url, init);
         let res = await doFetch();
         if (res.status === 401) {
             if (!this._authMetadata) {
@@ -545,6 +552,50 @@ class McpHTTPHandle extends Disposable {
         }
         return res;
     }
+    async _fetch(url, init) {
+        if (canLog(this._logService.getLevel(), LogLevel.Trace)) {
+            const traceObj = { ...init, headers: { ...init.headers } };
+            if (traceObj.body) {
+                traceObj.body = ( new TextDecoder()).decode(traceObj.body);
+            }
+            if (traceObj.headers?.Authorization) {
+                traceObj.headers.Authorization = '***';
+            }
+            this._log(LogLevel.Trace, `Fetching ${url} with options: ${JSON.stringify(traceObj)}`);
+        }
+        let currentUrl = url;
+        let response;
+        for (let redirectCount = 0; redirectCount < MAX_FOLLOW_REDIRECTS; redirectCount++) {
+            response = await fetch(currentUrl, {
+                ...init,
+                signal: this._abortCtrl.signal,
+                redirect: 'manual'
+            });
+            if (!REDIRECT_STATUS_CODES.includes(response.status)) {
+                break;
+            }
+            const location = response.headers.get('location');
+            if (!location) {
+                break;
+            }
+            const nextUrl = ( ( new URL(location, currentUrl)).toString());
+            this._log(LogLevel.Trace, `Redirect (${response.status}) from ${currentUrl} to ${nextUrl}`);
+            currentUrl = nextUrl;
+            if (response.status === 303 || ((response.status === 301 || response.status === 302) && init.method === 'POST')) {
+                init.method = 'GET';
+                delete init.body;
+            }
+        }
+        if (canLog(this._logService.getLevel(), LogLevel.Trace)) {
+            const headers = {};
+            response.headers.forEach((value, key) => { headers[key] = value; });
+            this._log(LogLevel.Trace, `Fetched ${currentUrl}: ${JSON.stringify({
+                status: response.status,
+                headers: headers,
+            })}`);
+        }
+        return response;
+    }
 }
 function isJSON(str) {
     try {

package/vscode/src/vs/workbench/api/common/extHostNotebook.d.ts

@@ -17,7 +17,7 @@ import { IExtHostConsumerFileSystem } from "./extHostFileSystemConsumer.js";
 import { ITextQuery } from "../../services/search/common/search.js";
 import { IExtHostSearch } from "./extHostSearch.js";
 import { IRawClosedNotebookFileMatch } from "../../contrib/search/common/searchNotebookHelpers.js";
-import { NotebookPriorityInfo } from "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common/vscode/vs/workbench/contrib/search/common/search";
+import { NotebookPriorityInfo } from "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search";
 import { ILogService } from "../../../platform/log/common/log.service.js";
 export declare class ExtHostNotebookController implements ExtHostNotebookShape {
     private _textDocumentsAndEditors;