@codingame/monaco-vscode-api 20.5.0 → 21.0.0

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

@@ -4,7 +4,7 @@ import { raceCancellationError } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { NotImplementedError, isCancellationError } from '../../../base/common/errors.js';
 import { IdGenerator } from '../../../base/common/idGenerator.js';
-import { DisposableStore } from '../../../base/common/lifecycle.js';
+import { DisposableStore, Disposable } from '../../../base/common/lifecycle.js';
 import { mixin, equals } from '../../../base/common/objects.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
 import { regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
@@ -20,8 +20,13 @@ import { ExtensionIdentifier } from '../../../platform/extensions/common/extensi
 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, 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';
+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, InlineCompletionDisplayLocationKind, PartialAcceptInfo, InlineCompletionEndOfLifeReason, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DocumentSelector } from './extHostTypeConverters.js';
+import { DocumentSymbol, CodeAction, InternalDataTransferItem, DataTransfer as DataTransfer$1, DocumentDropOrPasteEditKind, NewSymbolNameTriggerKind, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, CompletionList, InlineCompletionTriggerKind, InlineCompletionDisplayLocationKind as InlineCompletionDisplayLocationKind$1, InlineCompletionsDisposeReasonKind, Disposable as Disposable$1, SyntaxTokenType } from './extHostTypes.js';
+import { Emitter } from '../../../base/common/event.js';
+import { Range as Range$2 } from './extHostTypes/range.js';
+import { CodeActionKind } from './extHostTypes/codeActionKind.js';
+import { SnippetString } from './extHostTypes/snippetString.js';
+import { Location } from './extHostTypes/location.js';
 
 class DocumentSymbolAdapter {
     constructor(_documents, _provider) {
@@ -541,7 +546,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2625,
+                2630,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1106,6 +1111,7 @@ class InlineCompletionAdapter {
             triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
             requestUuid: context.requestUuid,
             requestIssuedDateTime: context.requestIssuedDateTime,
+            earliestShownDateTime: context.earliestShownDateTime,
         }, token);
         if (!result) {
             return undefined;
@@ -1123,6 +1129,7 @@ class InlineCompletionAdapter {
         });
         return {
             pid,
+            languageId: doc.languageId,
             items: ( resultItems.map((item, idx) => {
                 let command = undefined;
                 if (item.command) {
@@ -1153,11 +1160,14 @@ class InlineCompletionAdapter {
                     displayLocation: (item.displayLocation && this._isAdditionsProposedApiEnabled) ? {
                         range: Range.from(item.displayLocation.range),
                         label: item.displayLocation.label,
+                        kind: item.displayLocation.kind ? InlineCompletionDisplayLocationKind.from(item.displayLocation.kind) : InlineCompletionDisplayLocationKind$1.Code,
                     } : undefined,
                     warning: (item.warning && this._isAdditionsProposedApiEnabled) ? {
                         message: MarkdownString.from(item.warning.message),
                         icon: item.warning.icon ? IconPath.fromThemeIcon(item.warning.icon) : undefined,
                     } : undefined,
+                    correlationId: this._isAdditionsProposedApiEnabled ? item.correlationId : undefined,
+                    suggestionId: undefined,
                 });
             })),
             commands: ( commands.map(c => {
@@ -1686,7 +1696,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2626,
+                2631,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1716,9 +1726,13 @@ class AdapterData {
         this.extension = extension;
     }
 }
-class ExtHostLanguageFeatures {
+class ExtHostLanguageFeatures extends Disposable {
     static { this._handlePool = 0; }
+    get inlineCompletionsUnificationState() {
+        return this._inlineCompletionsUnificationState;
+    }
     constructor(mainContext, _uriTransformer, _documents, _commands, _diagnostics, _logService, _apiDeprecation, _extensionTelemetry) {
+        super();
         this._uriTransformer = _uriTransformer;
         this._documents = _documents;
         this._commands = _commands;
@@ -1727,13 +1741,20 @@ class ExtHostLanguageFeatures {
         this._apiDeprecation = _apiDeprecation;
         this._extensionTelemetry = _extensionTelemetry;
         this._adapter = ( new Map());
+        this._onDidChangeInlineCompletionsUnificationState = this._register(( new Emitter()));
+        this.onDidChangeInlineCompletionsUnificationState = this._onDidChangeInlineCompletionsUnificationState.event;
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadLanguageFeatures));
+        this._inlineCompletionsUnificationState = {
+            codeUnification: false,
+            modelUnification: false,
+            expAssignments: []
+        };
     }
     _transformDocumentSelector(selector, extension) {
         return DocumentSelector.from(selector, this._uriTransformer, extension);
     }
     _createDisposable(handle) {
-        return ( new Disposable(() => {
+        return ( new Disposable$1(() => {
             this._adapter.delete(handle);
             this._proxy.$unregister(handle);
         }));
@@ -1802,7 +1823,7 @@ class ExtHostLanguageFeatures {
         let result = this._createDisposable(handle);
         if (eventHandle !== undefined) {
             const subscription = provider.onDidChangeCodeLenses(_ => this._proxy.$emitCodeLensEvent(eventHandle));
-            result = Disposable.from(result, subscription);
+            result = Disposable$1.from(result, subscription);
         }
         return result;
     }
@@ -1873,7 +1894,7 @@ class ExtHostLanguageFeatures {
         let result = this._createDisposable(handle);
         if (eventHandle !== undefined) {
             const subscription = provider.onDidChangeInlineValues(_ => this._proxy.$emitInlineValuesEvent(eventHandle));
-            result = Disposable.from(result, subscription);
+            result = Disposable$1.from(result, subscription);
         }
         return result;
     }
@@ -2022,7 +2043,7 @@ class ExtHostLanguageFeatures {
         let result = this._createDisposable(handle);
         if (eventHandle) {
             const subscription = provider.onDidChangeSemanticTokens(_ => this._proxy.$emitDocumentSemanticTokensEvent(eventHandle));
-            result = Disposable.from(result, subscription);
+            result = Disposable$1.from(result, subscription);
         }
         return result;
     }
@@ -2067,9 +2088,9 @@ class ExtHostLanguageFeatures {
         let result = this._createDisposable(handle);
         if (eventHandle !== undefined) {
             const subscription = provider.onDidChange(_ => this._proxy.$emitInlineCompletionsChange(eventHandle));
-            result = Disposable.from(result, subscription);
+            result = Disposable$1.from(result, subscription);
         }
-        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);
+        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, metadata?.excludes?.map(extId => ExtensionIdentifier.toKey(extId)) || [], eventHandle);
         return result;
     }
     $provideInlineCompletions(handle, resource, position, context, token) {
@@ -2098,6 +2119,10 @@ class ExtHostLanguageFeatures {
     $freeInlineCompletionsList(handle, pid, reason) {
         this._withAdapter(handle, InlineCompletionAdapter, async (adapter) => { adapter.disposeCompletions(pid, reason); }, undefined, undefined);
     }
+    $acceptInlineCompletionsUnificationState(state) {
+        this._inlineCompletionsUnificationState = state;
+        this._onDidChangeInlineCompletionsUnificationState.fire();
+    }
     registerSignatureHelpProvider(extension, selector, provider, metadataOrTriggerChars) {
         const metadata = Array.isArray(metadataOrTriggerChars)
             ? { triggerCharacters: metadataOrTriggerChars, retriggerCharacters: [] }
@@ -2125,7 +2150,7 @@ class ExtHostLanguageFeatures {
         let result = this._createDisposable(handle);
         if (eventHandle !== undefined) {
             const subscription = provider.onDidChangeInlayHints(uri => this._proxy.$emitInlayHintsEvent(eventHandle));
-            result = Disposable.from(result, subscription);
+            result = Disposable$1.from(result, subscription);
         }
         return result;
     }
@@ -2171,7 +2196,7 @@ class ExtHostLanguageFeatures {
         let result = this._createDisposable(handle);
         if (eventHandle !== undefined) {
             const subscription = provider.onDidChangeFoldingRanges(() => this._proxy.$emitFoldingRangeEvent(eventHandle));
-            result = Disposable.from(result, subscription);
+            result = Disposable$1.from(result, subscription);
         }
         return result;
     }

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

@@ -6,11 +6,11 @@ import { IDisposable } from "../../../base/common/lifecycle.js";
 import { UriComponents } from "../../../base/common/uri.js";
 import { ExtensionIdentifier, IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { ILogService } from "../../../platform/log/common/log.service.js";
-import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadataAndIdentifier } from "../../contrib/chat/common/languageModels.js";
+import { IChatMessage, IChatResponsePart, ILanguageModelChatMetadataAndIdentifier } from "../../contrib/chat/common/languageModels.js";
+import { SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import { ExtHostLanguageModelsShape } from "./extHost.protocol.js";
 import { IExtHostAuthentication } from "./extHostAuthentication.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
-import { SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 export interface IExtHostLanguageModels extends ExtHostLanguageModels {
 }
 export declare const IExtHostLanguageModels: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtHostLanguageModels>;
@@ -30,9 +30,9 @@ export declare class ExtHostLanguageModels implements ExtHostLanguageModelsShape
     private readonly _ignoredFileProviders;
     constructor(extHostRpc: IExtHostRpcService, _logService: ILogService, _extHostAuthentication: IExtHostAuthentication);
     dispose(): void;
-    registerLanguageModelProvider(extension: IExtensionDescription, vendor: string, provider: vscode.LanguageModelChatProvider2): IDisposable;
+    registerLanguageModelChatProvider(extension: IExtensionDescription, vendor: string, provider: vscode.LanguageModelChatProvider): IDisposable;
     private _clearModelCache;
-    $prepareLanguageModelProvider(vendor: string, options: {
+    $provideLanguageModelChatInfo(vendor: string, options: {
         silent: boolean;
     }, token: CancellationToken): Promise<ILanguageModelChatMetadataAndIdentifier[]>;
     $startChatRequest(modelId: string, requestId: number, from: ExtensionIdentifier, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: vscode.LanguageModelChatRequestOptions, token: CancellationToken): Promise<void>;
@@ -42,7 +42,7 @@ export declare class ExtHostLanguageModels implements ExtHostLanguageModelsShape
     selectLanguageModels(extension: IExtensionDescription, selector: vscode.LanguageModelChatSelector): Promise<vscode.LanguageModelChat[]>;
     private _sendChatRequest;
     private _convertMessages;
-    $acceptResponsePart(requestId: number, chunk: IChatResponseFragment | IChatResponseFragment[]): Promise<void>;
+    $acceptResponsePart(requestId: number, chunk: SerializableObjectWithBuffers<IChatResponsePart | IChatResponsePart[]>): Promise<void>;
     $acceptResponseDone(requestId: number, error: SerializedError | undefined): Promise<void>;
     private _getAuthAccess;
     private _isUsingAuth;

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

@@ -1,6 +1,7 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { AsyncIterableSource, AsyncIterableObject, RunOnceScheduler } from '../../../base/common/async.js';
+import { VSBuffer } from '../../../base/common/buffer.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { transformErrorForSerialization, transformErrorFromSerialization } from '../../../base/common/errors.js';
 import { Emitter, Event } from '../../../base/common/event.js';
@@ -12,29 +13,20 @@ import { ExtensionIdentifierMap, ExtensionIdentifier, ExtensionIdentifierSet } f
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { Progress } from '../../../platform/progress/common/progress.js';
+import { DEFAULT_MODEL_PICKER_CATEGORY } from '../../contrib/chat/common/modelPicker/modelPickerWidget.js';
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from '../../services/authentication/common/authentication.js';
-import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
 import { MainContext } from './extHost.protocol.js';
 import { IExtHostAuthentication } from './extHostAuthentication.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 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';
+import { LanguageModelTextPart, LanguageModelThinkingPart, LanguageModelDataPart, LanguageModelToolCallPart, LanguageModelChatToolMode, LanguageModelError, LanguageModelChatMessageRole } from './extHostTypes.js';
 
 var ExtHostLanguageModels_1;
 const IExtHostLanguageModels = ( createDecorator('IExtHostLanguageModels'));
-class LanguageModelResponseStream {
-    constructor(option, stream) {
-        this.option = option;
-        this.stream = ( new AsyncIterableSource());
-        this.stream = stream ?? ( new AsyncIterableSource());
-    }
-}
 class LanguageModelResponse {
     constructor() {
-        this._responseStreams = ( new Map());
         this._defaultStream = ( new AsyncIterableSource());
         this._isDone = false;
         const that = this;
@@ -54,65 +46,36 @@ class LanguageModelResponse {
             },
         };
     }
-    *_streams() {
-        if (this._responseStreams.size > 0) {
-            for (const [, value] of this._responseStreams) {
-                yield value.stream;
-            }
-        }
-        else {
-            yield this._defaultStream;
-        }
-    }
-    handleFragment(fragments) {
+    handleResponsePart(parts) {
         if (this._isDone) {
             return;
         }
-        const partsByIndex = ( new Map());
-        for (const fragment of Iterable.wrap(fragments)) {
+        const lmResponseParts = [];
+        for (const part of Iterable.wrap(parts)) {
             let out;
-            if (fragment.part.type === 'text') {
-                out = new LanguageModelTextPart(fragment.part.value, fragment.part.audience);
-            }
-            else if (fragment.part.type === 'data') {
-                out = new LanguageModelTextPart('');
+            if (part.type === 'text') {
+                out = new LanguageModelTextPart(part.value, part.audience);
             }
-            else {
-                out = new LanguageModelToolCallPart(fragment.part.toolCallId, fragment.part.name, fragment.part.parameters);
+            else if (part.type === 'thinking') {
+                out = new LanguageModelThinkingPart(part.value, part.id, part.metadata);
             }
-            const array = partsByIndex.get(fragment.index);
-            if (!array) {
-                partsByIndex.set(fragment.index, [out]);
+            else if (part.type === 'data') {
+                out = new LanguageModelDataPart(part.data.buffer, part.mimeType, part.audience);
             }
             else {
-                array.push(out);
+                out = new LanguageModelToolCallPart(part.toolCallId, part.name, part.parameters);
             }
+            lmResponseParts.push(out);
         }
-        for (const [index, parts] of partsByIndex) {
-            let res = this._responseStreams.get(index);
-            if (!res) {
-                if (this._responseStreams.size === 0) {
-                    res = ( new LanguageModelResponseStream(index, this._defaultStream));
-                }
-                else {
-                    res = ( new LanguageModelResponseStream(index));
-                }
-                this._responseStreams.set(index, res);
-            }
-            res.stream.emitMany(parts);
-        }
+        this._defaultStream.emitMany(lmResponseParts);
     }
     reject(err) {
         this._isDone = true;
-        for (const stream of this._streams()) {
-            stream.reject(err);
-        }
+        this._defaultStream.reject(err);
     }
     resolve() {
         this._isDone = true;
-        for (const stream of this._streams()) {
-            stream.resolve();
-        }
+        this._defaultStream.resolve();
     }
 }
 let ExtHostLanguageModels = class ExtHostLanguageModels {
@@ -136,12 +99,12 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         this._onDidChangeModelAccess.dispose();
         this._onDidChangeProviders.dispose();
     }
-    registerLanguageModelProvider(extension, vendor, provider) {
-        this._languageModelProviders.set(vendor, { extension: extension.identifier, extensionName: extension.displayName || extension.name, provider });
+    registerLanguageModelChatProvider(extension, vendor, provider) {
+        this._languageModelProviders.set(vendor, { extension: extension, provider });
         this._proxy.$registerLanguageModelProvider(vendor);
         let providerChangeEventDisposable;
-        if (provider.onDidChange) {
-            providerChangeEventDisposable = provider.onDidChange(() => {
+        if (provider.onDidChangeLanguageModelChatInformation) {
+            providerChangeEventDisposable = provider.onDidChangeLanguageModelChatInformation(() => {
                 this._proxy.$onLMProviderChange(vendor);
             });
         }
@@ -159,39 +122,40 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             }
         });
     }
-    async $prepareLanguageModelProvider(vendor, options, token) {
+    async $provideLanguageModelChatInfo(vendor, options, token) {
         const data = this._languageModelProviders.get(vendor);
         if (!data) {
             return [];
         }
         this._clearModelCache(vendor);
-        const modelInformation = (await data.provider.prepareLanguageModelChat(options, token)) ?? [];
+        const modelInformation = (data.provider.provideLanguageModelChatInformation ? await data.provider.provideLanguageModelChatInformation(options, token) : await data.provider.prepareLanguageModelChatInformation(options, token)) ?? [];
         const modelMetadataAndIdentifier = ( modelInformation.map(m => {
             let auth;
-            if (m.auth) {
+            if (m.requiresAuthorization && isProposedApiEnabled(data.extension, 'chatProvider')) {
                 auth = {
-                    providerLabel: data.extensionName,
-                    accountLabel: typeof m.auth === 'object' ? m.auth.label : undefined
+                    providerLabel: data.extension.displayName || data.extension.name,
+                    accountLabel: typeof m.requiresAuthorization === 'object' ? m.requiresAuthorization.label : undefined
                 };
             }
             return {
                 metadata: {
-                    extension: data.extension,
+                    extension: data.extension.identifier,
                     id: m.id,
                     vendor,
                     name: m.name ?? '',
                     family: m.family ?? '',
-                    cost: m.cost,
-                    description: m.description,
+                    detail: m.detail,
+                    tooltip: m.tooltip,
                     version: m.version,
                     maxInputTokens: m.maxInputTokens,
                     maxOutputTokens: m.maxOutputTokens,
                     auth,
                     isDefault: m.isDefault,
                     isUserSelectable: m.isUserSelectable,
+                    statusIcon: m.statusIcon,
                     modelPickerCategory: m.category ?? DEFAULT_MODEL_PICKER_CATEGORY,
                     capabilities: m.capabilities ? {
-                        vision: m.capabilities.vision,
+                        vision: m.capabilities.imageInput,
                         toolCalling: !!m.capabilities.toolCalling,
                         agentMode: !!m.capabilities.toolCalling
                     } : undefined,
@@ -219,7 +183,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         const queue = [];
         const sendNow = () => {
             if (queue.length > 0) {
-                this._proxy.$reportResponsePart(requestId, queue);
+                this._proxy.$reportResponsePart(requestId, ( new SerializableObjectWithBuffers(queue)));
                 queue.length = 0;
             }
         };
@@ -236,28 +200,31 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         };
         const progress = ( new Progress(async (fragment) => {
             if (token.isCancellationRequested) {
-                this._logService.warn(`[CHAT](${data.extension.value}) CANNOT send progress because the REQUEST IS CANCELLED`);
+                this._logService.warn(`[CHAT](${data.extension.identifier.value}) CANNOT send progress because the REQUEST IS CANCELLED`);
                 return;
             }
             let part;
-            if (fragment.part instanceof LanguageModelToolCallPart) {
-                part = { type: 'tool_use', name: fragment.part.name, parameters: fragment.part.input, toolCallId: fragment.part.callId };
+            if (fragment instanceof LanguageModelToolCallPart) {
+                part = { type: 'tool_use', name: fragment.name, parameters: fragment.input, toolCallId: fragment.callId };
+            }
+            else if (fragment instanceof LanguageModelTextPart) {
+                part = { type: 'text', value: fragment.value, audience: fragment.audience };
             }
-            else if (fragment.part instanceof LanguageModelTextPart) {
-                part = { type: 'text', value: fragment.part.value, audience: fragment.part.audience };
+            else if (fragment instanceof LanguageModelDataPart) {
+                part = { type: 'data', mimeType: fragment.mimeType, data: VSBuffer.wrap(fragment.data), audience: fragment.audience };
             }
-            else if (fragment.part instanceof LanguageModelDataPart) {
-                part = { type: 'data', value: { mimeType: fragment.part.mimeType, data: VSBuffer.wrap(fragment.part.data) }, audience: fragment.part.audience };
+            else if (fragment instanceof LanguageModelThinkingPart) {
+                part = { type: 'thinking', value: fragment.value, id: fragment.id, metadata: fragment.metadata };
             }
             if (!part) {
-                this._logService.warn(`[CHAT](${data.extension.value}) UNKNOWN part ${JSON.stringify(fragment)}`);
+                this._logService.warn(`[CHAT](${data.extension.identifier.value}) UNKNOWN part ${JSON.stringify(fragment)}`);
                 return;
             }
-            sendSoon({ index: fragment.index, part });
+            sendSoon(part);
         }));
         let value;
         try {
-            value = data.provider.provideLanguageModelChatResponse(knownModel.info, ( messages.value.map(LanguageModelChatMessage2.to)), { ...options, modelOptions: options.modelOptions ?? {}, extensionId: ExtensionIdentifier.toKey(from) }, progress, token);
+            value = data.provider.provideLanguageModelChatResponse(knownModel.info, ( messages.value.map(LanguageModelChatMessage2.to)), { ...options, modelOptions: options.modelOptions ?? {}, requestInitiator: ExtensionIdentifier.toKey(from), toolMode: options.toolMode ?? LanguageModelChatToolMode.Auto }, progress, token);
         }
         catch (err) {
             throw err;
@@ -338,8 +305,9 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
     async selectLanguageModels(extension, selector) {
         const models = await this._proxy.$selectChatModels({ ...selector, extension: extension.identifier });
         const result = [];
-        for (const identifier of models) {
-            const model = await this.getLanguageModelByIdentifier(extension, identifier);
+        const modelPromises = ( models.map(identifier => this.getLanguageModelByIdentifier(extension, identifier)));
+        const modelResults = await Promise.all(modelPromises);
+        for (const model of modelResults) {
             if (model) {
                 result.push(model);
             }
@@ -384,7 +352,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
     async $acceptResponsePart(requestId, chunk) {
         const data = this._pendingRequest.get(requestId);
         if (data) {
-            data.res.handleFragment(chunk);
+            data.res.handleResponsePart(chunk.value);
         }
     }
     async $acceptResponseDone(requestId, error) {
@@ -412,7 +380,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         try {
             const detail = justification
-                ? ( localize(2627, "Justification: {1}", to.displayName, justification))
+                ? ( localize(2632, "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/extHostLanguages.js

@@ -1,11 +1,12 @@
 
 import { MainContext } from './extHost.protocol.js';
 import { Position, TokenType, Range as Range$1, DocumentSelector } from './extHostTypeConverters.js';
-import { Range, StandardTokenType, LanguageStatusSeverity } from './extHostTypes.js';
+import { StandardTokenType, LanguageStatusSeverity } from './extHostTypes.js';
 import Severity$1 from '../../../base/common/severity.js';
 import { disposableTimeout } from '../../../base/common/async.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { Range } from './extHostTypes/range.js';
 
 class ExtHostLanguages {
     constructor(mainContext, _documents, _commands, _uriTransformer) {

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(2628, "Extension Host (Remote)")) : isWorker ? ( localize(2629, "Extension Host (Worker)")) : ( localize(2630, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2633, "Extension Host (Remote)")) : isWorker ? ( localize(2634, "Extension Host (Worker)")) : ( localize(2635, "Extension Host"));
         super(loggerService.createLogger(id, { name }));
     }
 };

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

@@ -240,9 +240,12 @@ class McpHTTPHandle extends Disposable {
         let resourceMetadataChallenge;
         if (( originalResponse.headers.has('WWW-Authenticate'))) {
             const authHeader = originalResponse.headers.get('WWW-Authenticate');
-            const { scheme, params } = parseWWWAuthenticateHeader(authHeader);
-            if (scheme === 'Bearer' && params['resource_metadata']) {
-                resourceMetadataChallenge = params['resource_metadata'];
+            const challenges = parseWWWAuthenticateHeader(authHeader);
+            for (const challenge of challenges) {
+                if (challenge.scheme === 'Bearer' && challenge.params['resource_metadata']) {
+                    resourceMetadataChallenge = challenge.params['resource_metadata'];
+                    break;
+                }
             }
         }
         let serverMetadataUrl;
@@ -282,7 +285,7 @@ class McpHTTPHandle extends Disposable {
         const defaultMetadata = getDefaultMetadataForUrl(( new URL(baseUrl)));
         defaultMetadata.scopes_supported = scopesSupported ?? defaultMetadata.scopes_supported ?? [];
         this._authMetadata = {
-            authorizationServer: ( URI.parse(serverMetadataUrl)),
+            authorizationServer: ( URI.parse(baseUrl)),
             serverMetadata: defaultMetadata,
             resourceMetadata: resource
         };
@@ -314,7 +317,9 @@ class McpHTTPHandle extends Disposable {
             return body;
         }
         else {
-            throw ( new Error(`Invalid resource metadata: ${JSON.stringify(body)}`));
+            throw ( new Error(
+                `Invalid resource metadata. Expected to follow shape of https://datatracker.ietf.org/doc/html/rfc9728#name-protected-resource-metadata (Hints: is scopes_supported an array? Is resource a string?). Current payload: ${JSON.stringify(body)}`
+            ));
         }
     }
     async _getAuthorizationServerMetadata(authorizationServer, addtionalHeaders) {
@@ -365,37 +370,35 @@ class McpHTTPHandle extends Disposable {
         if (res.status === 202) {
             return;
         }
-        switch (res.headers.get('Content-Type')?.toLowerCase()) {
-            case 'text/event-stream': {
-                const parser = ( new SSEParser(event => {
-                    if (event.type === 'message') {
-                        this._proxy.$onDidReceiveMessage(this._id, event.data);
-                    }
-                    else if (event.type === 'endpoint') {
-                        this._log(LogLevel.Warning, `Received SSE endpoint from a POST to ${this._launch.uri}, will fall back to legacy SSE`);
-                        this._sseFallbackWithMessage(message);
-                        throw ( new CancellationError());
-                    }
-                }));
-                try {
-                    await this._doSSE(parser, res);
+        const contentType = res.headers.get('Content-Type')?.toLowerCase() || '';
+        if (contentType.startsWith('text/event-stream')) {
+            const parser = ( new SSEParser(event => {
+                if (event.type === 'message') {
+                    this._proxy.$onDidReceiveMessage(this._id, event.data);
                 }
-                catch (err) {
-                    this._log(LogLevel.Warning, `Error reading SSE stream: ${String(err)}`);
+                else if (event.type === 'endpoint') {
+                    this._log(LogLevel.Warning, `Received SSE endpoint from a POST to ${this._launch.uri}, will fall back to legacy SSE`);
+                    this._sseFallbackWithMessage(message);
+                    throw ( new CancellationError());
                 }
-                break;
+            }));
+            try {
+                await this._doSSE(parser, res);
             }
-            case 'application/json':
-                this._proxy.$onDidReceiveMessage(this._id, await res.text());
-                break;
-            default: {
-                const responseBody = await res.text();
-                if (isJSON(responseBody)) {
-                    this._proxy.$onDidReceiveMessage(this._id, responseBody);
-                }
-                else {
-                    this._log(LogLevel.Warning, `Unexpected ${res.status} response for request: ${responseBody}`);
-                }
+            catch (err) {
+                this._log(LogLevel.Warning, `Error reading SSE stream: ${String(err)}`);
+            }
+        }
+        else if (contentType.startsWith('application/json')) {
+            this._proxy.$onDidReceiveMessage(this._id, await res.text());
+        }
+        else {
+            const responseBody = await res.text();
+            if (isJSON(responseBody)) {
+                this._proxy.$onDidReceiveMessage(this._id, responseBody);
+            }
+            else {
+                this._log(LogLevel.Warning, `Unexpected ${res.status} response for request: ${responseBody}`);
             }
         }
     }

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-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search";
+import { NotebookPriorityInfo } from "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-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;
@@ -67,7 +67,7 @@ export declare class ExtHostNotebookController implements ExtHostNotebookShape {
     registerNotebookSerializer(extension: IExtensionDescription, viewType: string, serializer: vscode.NotebookSerializer, options?: vscode.NotebookDocumentContentOptions, registration?: vscode.NotebookRegistrationData): vscode.Disposable;
     $dataToNotebook(handle: number, bytes: VSBuffer, token: CancellationToken): Promise<SerializableObjectWithBuffers<NotebookDataDto>>;
     $notebookToData(handle: number, data: SerializableObjectWithBuffers<NotebookDataDto>, token: CancellationToken): Promise<VSBuffer>;
-    $saveNotebook(handle: number, uriComponents: UriComponents, versionId: number, options: files.IWriteFileOptions, token: CancellationToken): Promise<INotebookPartialFileStatsWithMetadata>;
+    $saveNotebook(handle: number, uriComponents: UriComponents, versionId: number, options: files.IWriteFileOptions, token: CancellationToken): Promise<INotebookPartialFileStatsWithMetadata | files.FileOperationError>;
     /**
      * Search for query in all notebooks that can be deserialized by the serializer fetched by `handle`.
      *
@@ -90,3 +90,6 @@ export declare class ExtHostNotebookController implements ExtHostNotebookShape {
     private static _registerApiCommands;
     private trace;
 }
+export declare class NotebookSaveError extends Error {
+    constructor(message: string);
+}