@codingame/monaco-vscode-api 17.2.1 → 18.0.0

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

@@ -1,6 +1,6 @@
 
-import { isNonEmptyArray, coalesce } from '../../../base/common/arrays.js';
-import { raceCancellation } from '../../../base/common/async.js';
+import { coalesce } from '../../../base/common/arrays.js';
+import { timeout } from '../../../base/common/async.js';
 import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { toErrorMessage } from '../../../base/common/errorMessage.js';
 import { Emitter } from '../../../base/common/event.js';
@@ -8,7 +8,7 @@ import { Iterable } from '../../../base/common/iterator.js';
 import { toDisposable, Disposable, DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
-import { isDefined, assertType } from '../../../base/common/types.js';
+import { assertType } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
@@ -17,8 +17,8 @@ import { ChatAgentVoteDirection } from '../../contrib/chat/common/chatService.js
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponsePart, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseFilesPart, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatRequestDraft, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatPromptReference, ChatLanguageModelToolReference, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
-import { MarkdownString, ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseExtensionsPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
+import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatPrepareToolInvocationPart as ChatPrepareToolInvocationPart$1, ChatResponsePart, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseNotebookEditPart as ChatResponseNotebookEditPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseFilesPart, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatRequestDraft, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatLanguageModelToolReference, ChatPromptReference, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
+import { MarkdownString, ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseExtensionsPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatPrepareToolInvocationPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
 
 class ChatAgentResponseStream {
     constructor(_extension, _request, _proxy, _commandsConverter, _sessionDisposables) {
@@ -43,6 +43,7 @@ class ChatAgentResponseStream {
         if (!this._apiObject) {
             const that = this;
             this._stopWatch.reset();
+            let taskHandlePool = 0;
             function throwIfDone(source) {
                 if (that._isClosed) {
                     const err = ( new Error('Response stream has been closed'));
@@ -50,34 +51,49 @@ class ChatAgentResponseStream {
                     throw err;
                 }
             }
+            const sendQueue = [];
+            const notify = [];
+            function send(chunk, handle) {
+                const newLen = sendQueue.push(handle !== undefined ? [chunk, handle] : chunk);
+                if (newLen === 1) {
+                    queueMicrotask(() => {
+                        that._proxy.$handleProgressChunk(that._request.requestId, sendQueue).finally(() => {
+                            notify.forEach(f => f());
+                            notify.length = 0;
+                        });
+                        sendQueue.length = 0;
+                    });
+                }
+                if (handle !== undefined) {
+                    return ( new Promise(resolve => { notify.push(resolve); }));
+                }
+                return;
+            }
             const _report = (progress, task) => {
-                if (typeof this._firstProgress === 'undefined' && (progress.kind === 'markdownContent' || progress.kind === 'markdownVuln')) {
+                if (typeof this._firstProgress === 'undefined' && (progress.kind === 'markdownContent' || progress.kind === 'markdownVuln' || progress.kind === 'prepareToolInvocation')) {
                     this._firstProgress = this._stopWatch.elapsed();
                 }
                 if (task) {
-                    const progressReporterPromise = this._proxy.$handleProgressChunk(this._request.requestId, progress);
+                    const myHandle = taskHandlePool++;
+                    const progressReporterPromise = send(progress, myHandle);
                     const progressReporter = {
                         report: (p) => {
-                            progressReporterPromise?.then((handle) => {
-                                if (handle) {
-                                    if (MarkdownString.isMarkdownString(p.value)) {
-                                        this._proxy.$handleProgressChunk(this._request.requestId, ChatResponseWarningPart.from(p), handle);
-                                    }
-                                    else {
-                                        this._proxy.$handleProgressChunk(this._request.requestId, ChatResponseReferencePart.from(p), handle);
-                                    }
+                            progressReporterPromise.then(() => {
+                                if (MarkdownString.isMarkdownString(p.value)) {
+                                    send(ChatResponseWarningPart.from(p), myHandle);
+                                }
+                                else {
+                                    send(ChatResponseReferencePart.from(p), myHandle);
                                 }
                             });
                         }
                     };
-                    Promise.all([progressReporterPromise, task?.(progressReporter)]).then(([handle, res]) => {
-                        if (handle !== undefined) {
-                            this._proxy.$handleProgressChunk(this._request.requestId, ChatTaskResult.from(res), handle);
-                        }
+                    Promise.all([progressReporterPromise, task(progressReporter)]).then(([_void, res]) => {
+                        send(ChatTaskResult.from(res), myHandle);
                     });
                 }
                 else {
-                    this._proxy.$handleProgressChunk(this._request.requestId, progress);
+                    send(progress);
                 }
             };
             this._apiObject = ( Object.freeze({
@@ -205,6 +221,14 @@ class ChatAgentResponseStream {
                     _report(dto);
                     return this;
                 },
+                prepareToolInvocation(toolName) {
+                    throwIfDone(this.prepareToolInvocation);
+                    checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+                    const part = new ChatPrepareToolInvocationPart(toolName);
+                    const dto = ChatPrepareToolInvocationPart$1.from(part);
+                    _report(dto);
+                    return this;
+                },
                 push(part) {
                     throwIfDone(this.push);
                     if (part instanceof ChatResponseTextEditPart ||
@@ -241,6 +265,12 @@ class ChatAgentResponseStream {
                         }
                         _report(dto);
                     }
+                    else if (part instanceof ChatPrepareToolInvocationPart) {
+                        checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+                        const dto = ChatPrepareToolInvocationPart$1.from(part);
+                        _report(dto);
+                        return this;
+                    }
                     else {
                         const dto = ChatResponsePart.from(part, that._commandsConverter, that._sessionDisposables);
                         _report(dto);
@@ -332,7 +362,7 @@ class ExtHostChatAgents2 extends Disposable {
         }
         const { request, location, history } = await this._createRequest(requestDto, context, detector.extension);
         const model = await this.getModelForRequest(request, detector.extension);
-        const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(detector.extension), this.getToolsForRequest(detector.extension, request), this.getTools2ForRequest(detector.extension, request), detector.extension, this._logService);
+        const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(detector.extension), this.getToolsForRequest(detector.extension, request), detector.extension, this._logService);
         return detector.provider.provideParticipantDetection(extRequest, { history }, { participants: options.participants, location: ChatLocation.to(options.location) }, token);
     }
     async _createRequest(requestDto, context, extension) {
@@ -398,11 +428,11 @@ class ExtHostChatAgents2 extends Disposable {
                 sessionDisposables
             ));
             const model = await this.getModelForRequest(request, agent.extension);
-            const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(agent.extension), this.getToolsForRequest(agent.extension, request), this.getTools2ForRequest(agent.extension, request), agent.extension, this._logService);
+            const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(agent.extension), this.getToolsForRequest(agent.extension, request), agent.extension, this._logService);
             inFlightRequest = { requestId: requestDto.requestId, extRequest };
             this._inFlightRequests.add(inFlightRequest);
             const task = agent.invoke(extRequest, { history }, stream.apiObject, token);
-            return await raceCancellation(Promise.resolve(task).then((result) => {
+            return await raceCancellationWithTimeout(1000, Promise.resolve(task).then((result) => {
                 if (result?.metadata) {
                     try {
                         JSON.stringify(result.metadata);
@@ -420,7 +450,7 @@ class ExtHostChatAgents2 extends Disposable {
                         responseIsIncomplete: true
                     };
                 }
-                if (errorDetails?.responseIsRedacted || errorDetails?.isQuotaExceeded) {
+                if (errorDetails?.responseIsRedacted || errorDetails?.isQuotaExceeded || errorDetails?.confirmationButtons) {
                     checkProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
                 }
                 return { errorDetails, timings: stream?.timings, metadata: result?.metadata, nextQuestion: result?.nextQuestion };
@@ -447,29 +477,18 @@ class ExtHostChatAgents2 extends Disposable {
         }
         return this._diagnostics.getDiagnostics();
     }
-    getTools2ForRequest(extension, request) {
-        if (!request.userSelectedTools2) {
+    getToolsForRequest(extension, request) {
+        if (!request.userSelectedTools) {
             return ( new Map());
         }
         const result = ( new Map());
         for (const tool of this._tools.getTools(extension)) {
-            if (typeof request.userSelectedTools2[tool.name] === 'boolean') {
-                result.set(tool.name, request.userSelectedTools2[tool.name]);
+            if (typeof request.userSelectedTools[tool.name] === 'boolean') {
+                result.set(tool.name, request.userSelectedTools[tool.name]);
             }
         }
         return result;
     }
-    getToolsForRequest(extension, request) {
-        if (!isNonEmptyArray(request.userSelectedTools)) {
-            return undefined;
-        }
-        const selector = ( new Set(request.userSelectedTools));
-        const tools = this._tools.getTools(extension).filter(candidate => ( selector.has(candidate.name)));
-        return {
-            tools,
-            isExclusive: request.toolSelectionIsExclusive,
-        };
-    }
     async prepareHistoryTurns(extension, agentId, context) {
         const res = [];
         for (const h of context.history) {
@@ -477,15 +496,22 @@ class ExtHostChatAgents2 extends Disposable {
             const result = agentId === h.request.agentId ?
                 ehResult :
                 { ...ehResult, metadata: undefined };
-            const varsWithoutTools = ( h.request.variables.variables
-                .filter(v => v.kind !== 'tool')
-                .map(
-                v => ChatPromptReference.to(v, this.getDiagnosticsWhenEnabled(extension), this._logService)
-            ))
-                .filter(isDefined);
-            const toolReferences = ( h.request.variables.variables
-                .filter(v => v.kind === 'tool')
-                .map(ChatLanguageModelToolReference.to));
+            const varsWithoutTools = [];
+            const toolReferences = [];
+            for (const v of h.request.variables.variables) {
+                if (v.kind === 'tool') {
+                    toolReferences.push(ChatLanguageModelToolReference.to(v));
+                }
+                else if (v.kind === 'toolset') {
+                    toolReferences.push(...( v.value.map(ChatLanguageModelToolReference.to)));
+                }
+                else {
+                    const ref = ChatPromptReference.to(v, this.getDiagnosticsWhenEnabled(extension), this._logService);
+                    if (ref) {
+                        varsWithoutTools.push(ref);
+                    }
+                }
+            }
             const editedFileEvents = isProposedApiEnabled(extension, 'chatParticipantPrivate') ? h.request.editedFileEvents : undefined;
             const turn = new ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId, toolReferences, editedFileEvents);
             res.push(turn);
@@ -577,14 +603,6 @@ class ExtHostChatAgents2 extends Disposable {
         const history = await this.prepareHistoryTurns(agent.extension, agent.id, { history: context });
         return await agent.provideTitle({ history }, token);
     }
-    async $provideSampleQuestions(handle, location, token) {
-        const agent = this._agents.get(handle);
-        if (!agent) {
-            return;
-        }
-        return ( (await agent.provideSampleQuestions(ChatLocation.to(location), token))
-            .map(f => ChatFollowup.from(f, undefined)));
-    }
 }
 class ExtHostParticipantDetector {
     constructor(extension, provider) {
@@ -642,16 +660,6 @@ class ExtHostChatAgent {
         }
         return (await this._titleProvider.provideChatTitle(context, token)) ?? undefined;
     }
-    async provideSampleQuestions(location, token) {
-        if (!this._welcomeMessageProvider || !this._welcomeMessageProvider.provideSampleQuestions) {
-            return [];
-        }
-        const content = await this._welcomeMessageProvider.provideSampleQuestions(location, token);
-        if (!content) {
-            return [];
-        }
-        return content;
-    }
     get apiAgent() {
         let disposed = false;
         let updateScheduled = false;
@@ -766,15 +774,6 @@ class ExtHostChatAgent {
                 checkProposedApiEnabled(that.extension, 'chatParticipantAdditions');
                 return that._agentVariableProvider;
             },
-            set welcomeMessageProvider(v) {
-                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                that._welcomeMessageProvider = v;
-                updateMetadataSoon();
-            },
-            get welcomeMessageProvider() {
-                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                return that._welcomeMessageProvider;
-            },
             set additionalWelcomeMessage(v) {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
                 that._additionalWelcomeMessage = v;
@@ -819,5 +818,15 @@ class ExtHostChatAgent {
         return this._requestHandler(request, context, response, token);
     }
 }
+function raceCancellationWithTimeout(cancelWait, promise, token) {
+    return ( new Promise((resolve, reject) => {
+        const ref = token.onCancellationRequested(async () => {
+            ref.dispose();
+            await timeout(cancelWait);
+            resolve(undefined);
+        });
+        promise.then(resolve, reject).finally(() => ref.dispose());
+    }));
+}
 
 export { ExtHostChatAgents2 };

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

@@ -1,5 +1,6 @@
 
 import { asPromise } from '../../../base/common/async.js';
+import '../../../base/common/errors.js';
 import { MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import '../../../base/common/cancellation.js';
 import { Emitter } from '../../../base/common/event.js';

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

@@ -107,7 +107,7 @@ class DiagnosticCollection {
                     marker.push({
                         severity: MarkerSeverity.Info,
                         message: ( localize(
-                            2555,
+                            2579,
                             "Not showing {0} further errors and warnings.",
                             diagnostics.length - this._maxDiagnosticsPerFile
                         )),

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

@@ -541,7 +541,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     async _doHandleExtensionTests() {
         const { extensionDevelopmentLocationURI, extensionTestsLocationURI } = this._initData.environment;
         if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
-            throw ( new Error(( localize(2556, "Cannot load test runner."))));
+            throw ( new Error(( localize(2580, "Cannot load test runner."))));
         }
         const extensionDescription = (await this.getExtensionPathIndex()).findSubstr(extensionTestsLocationURI);
         const isESM = this._isESM(extensionDescription, extensionTestsLocationURI.path);
@@ -550,7 +550,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
             : this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false))));
         if (!testRunner || typeof testRunner.run !== 'function') {
             throw ( new Error(( localize(
-                2557,
+                2581,
                 "Path {0} does not point to a valid extension test runner.",
                 (extensionTestsLocationURI.toString())
             ))));
@@ -833,7 +833,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         this._onDidChangeRemoteConnectionData.fire();
     }
     _isESM(extensionDescription, modulePath) {
-        modulePath ??= extensionDescription?.main;
+        modulePath ??= extensionDescription ? this._getEntryPoint(extensionDescription) : modulePath;
         return modulePath?.endsWith('.mjs') || (extensionDescription?.type === 'module' && !modulePath?.endsWith('.cjs'));
     }
 };

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

@@ -541,7 +541,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2558,
+                2582,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1080,11 +1080,11 @@ class InlineCompletionAdapter {
         this._provider = _provider;
         this._commands = _commands;
         this._references = ( new ReferenceMap());
-        this._isAdditionsProposedApiEnabled = isProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
         this.languageTriggerKindToVSCodeTriggerKind = {
             [InlineCompletionTriggerKind$1.Automatic]: InlineCompletionTriggerKind.Automatic,
             [InlineCompletionTriggerKind$1.Explicit]: InlineCompletionTriggerKind.Invoke,
         };
+        this._isAdditionsProposedApiEnabled = isProposedApiEnabled(this._extension, 'inlineCompletionsAdditions');
     }
     get supportsHandleEvents() {
         return isProposedApiEnabled(this._extension, 'inlineCompletionsAdditions')
@@ -1818,7 +1818,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2559,
+                2583,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),

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

@@ -186,14 +186,15 @@ class ExtHostLanguageModelTools {
             }
             return {
                 confirmationMessages: result.confirmationMessages ? {
-                    title: result.confirmationMessages.title,
+                    title: typeof result.confirmationMessages.title === 'string' ? result.confirmationMessages.title : MarkdownString.from(result.confirmationMessages.title),
                     message: typeof result.confirmationMessages.message === 'string' ? result.confirmationMessages.message : MarkdownString.from(result.confirmationMessages.message),
                 } : undefined,
                 toolSpecificData: {
                     kind: 'terminal',
                     language: result.language,
                     command: result.command,
-                }
+                },
+                presentation: result.presentation
             };
         }
         else if (item.tool.prepareInvocation) {
@@ -206,7 +207,7 @@ class ExtHostLanguageModelTools {
             }
             return {
                 confirmationMessages: result.confirmationMessages ? {
-                    title: result.confirmationMessages.title,
+                    title: typeof result.confirmationMessages.title === 'string' ? result.confirmationMessages.title : MarkdownString.from(result.confirmationMessages.title),
                     message: typeof result.confirmationMessages.message === 'string' ? result.confirmationMessages.message : MarkdownString.from(result.confirmationMessages.message),
                 } : undefined,
                 invocationMessage: MarkdownString.fromStrict(result.invocationMessage),

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

@@ -45,7 +45,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): Promise<void>;
+    $acceptResponsePart(requestId: number, chunk: IChatResponseFragment | IChatResponseFragment[]): 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,6 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { AsyncIterableSource, AsyncIterableObject } from '../../../base/common/async.js';
+import { AsyncIterableSource, AsyncIterableObject, RunOnceScheduler } from '../../../base/common/async.js';
 import { CancellationToken } from '../../../base/common/cancellation.js';
 import { transformErrorForSerialization, CancellationError, transformErrorFromSerialization } from '../../../base/common/errors.js';
 import { Emitter, Event } from '../../../base/common/event.js';
@@ -64,31 +64,43 @@ class LanguageModelResponse {
             yield this._defaultStream;
         }
     }
-    handleFragment(fragment) {
+    handleFragment(fragments) {
         if (this._isDone) {
             return;
         }
-        let res = this._responseStreams.get(fragment.index);
-        if (!res) {
-            if (this._responseStreams.size === 0) {
-                res = ( new LanguageModelResponseStream(fragment.index, this._defaultStream));
+        const partsByIndex = ( new Map());
+        for (const fragment of Iterable.wrap(fragments)) {
+            let out;
+            if (fragment.part.type === 'text') {
+                out = new LanguageModelTextPart(fragment.part.value);
+            }
+            else if (fragment.part.type === 'data') {
+                out = new LanguageModelTextPart('');
             }
             else {
-                res = ( new LanguageModelResponseStream(fragment.index));
+                out = new LanguageModelToolCallPart(fragment.part.toolCallId, fragment.part.name, fragment.part.parameters);
+            }
+            const array = partsByIndex.get(fragment.index);
+            if (!array) {
+                partsByIndex.set(fragment.index, [out]);
+            }
+            else {
+                array.push(out);
             }
-            this._responseStreams.set(fragment.index, res);
-        }
-        let out;
-        if (fragment.part.type === 'text') {
-            out = new LanguageModelTextPart(fragment.part.value);
-        }
-        else if (fragment.part.type === 'data') {
-            out = new LanguageModelTextPart('');
         }
-        else {
-            out = new LanguageModelToolCallPart(fragment.part.toolCallId, fragment.part.name, fragment.part.parameters);
+        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);
         }
-        res.stream.emitOne(out);
     }
     reject(err) {
         this._isDone = true;
@@ -166,6 +178,24 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         if (!data) {
             throw ( new Error('Provider not found'));
         }
+        const queue = [];
+        const sendNow = () => {
+            if (queue.length > 0) {
+                this._proxy.$reportResponsePart(requestId, queue);
+                queue.length = 0;
+            }
+        };
+        const queueScheduler = ( new RunOnceScheduler(sendNow, 30));
+        const sendSoon = (part) => {
+            const newLen = queue.push(part);
+            if (newLen > 30) {
+                sendNow();
+                queueScheduler.cancel();
+            }
+            else {
+                queueScheduler.schedule();
+            }
+        };
         const progress = ( new Progress(async (fragment) => {
             if (token.isCancellationRequested) {
                 this._logService.warn(`[CHAT](${data.extension.value}) CANNOT send progress because the REQUEST IS CANCELLED`);
@@ -185,7 +215,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
                 this._logService.warn(`[CHAT](${data.extension.value}) UNKNOWN part ${JSON.stringify(fragment)}`);
                 return;
             }
-            this._proxy.$reportResponsePart(requestId, { index: fragment.index, part });
+            sendSoon({ index: fragment.index, part });
         }));
         let value;
         try {
@@ -195,8 +225,10 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             throw err;
         }
         Promise.resolve(value).then(() => {
+            sendNow();
             this._proxy.$reportResponseDone(requestId, undefined);
         }, err => {
+            sendNow();
             this._proxy.$reportResponseDone(requestId, transformErrorForSerialization(err));
         });
     }
@@ -350,7 +382,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         try {
             const detail = justification
-                ? ( localize(2560, "Justification: {1}", to.displayName, justification))
+                ? ( localize(2584, "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(2561, "Extension Host (Remote)")) : isWorker ? ( localize(2562, "Extension Host (Worker)")) : ( localize(2563, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2585, "Extension Host (Remote)")) : isWorker ? ( localize(2586, "Extension Host (Worker)")) : ( localize(2587, "Extension Host"));
         super(loggerService.createLogger(id, { name }));
     }
 };

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

@@ -4,16 +4,18 @@ import { IExtensionDescription } from "../../../platform/extensions/common/exten
 import { McpServerLaunch } from "../../contrib/mcp/common/mcpTypes.js";
 import { ExtHostMcpShape, MainThreadMcpShape } from "./extHost.protocol.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
+import { IExtHostInitDataService } from "./extHostInitDataService.js";
 export declare const IExtHostMpcService: import("../../../platform/instantiation/common/instantiation.js").ServiceIdentifier<IExtHostMpcService>;
 export interface IExtHostMpcService extends ExtHostMcpShape {
     registerMcpConfigurationProvider(extension: IExtensionDescription, id: string, provider: vscode.McpServerDefinitionProvider): IDisposable;
 }
 export declare class ExtHostMcpService extends Disposable implements IExtHostMpcService {
+    private readonly _extHostInitData;
     protected _proxy: MainThreadMcpShape;
     private readonly _initialProviderPromises;
     private readonly _sseEventSources;
     private readonly _unresolvedMcpServers;
-    constructor(extHostRpc: IExtHostRpcService);
+    constructor(extHostRpc: IExtHostRpcService, _extHostInitData: IExtHostInitDataService);
     $startMcp(id: number, launch: McpServerLaunch.Serialized): void;
     protected _startMcp(id: number, launch: McpServerLaunch): void;
     $stopMcp(id: number): void;