@codingame/monaco-vscode-api 16.1.1 → 17.1.0

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

@@ -18,7 +18,7 @@ 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, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.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';
 
 class ChatAgentResponseStream {
     constructor(_extension, _request, _proxy, _commandsConverter, _sessionDisposables) {
@@ -214,6 +214,7 @@ class ChatAgentResponseStream {
                         part instanceof ChatResponseConfirmationPart ||
                         part instanceof ChatResponseCodeCitationPart ||
                         part instanceof ChatResponseMovePart ||
+                        part instanceof ChatResponseExtensionsPart ||
                         part instanceof ChatResponseProgressPart2) {
                         checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
                     }
@@ -331,8 +332,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 includeInteractionId = isProposedApiEnabled(detector.extension, 'chatParticipantPrivate');
-        const extRequest = ChatAgentRequest.to(includeInteractionId ? request : { ...request, requestId: '' }, location, model, this.getDiagnosticsWhenEnabled(detector.extension), this.getToolsForRequest(detector.extension, request));
+        const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(detector.extension), this.getToolsForRequest(detector.extension, request), this.getTools2ForRequest(detector.extension, request), detector.extension);
         return detector.provider.provideParticipantDetection(extRequest, { history }, { participants: options.participants, location: ChatLocation.to(options.location) }, token);
     }
     async _createRequest(requestDto, context, extension) {
@@ -398,8 +398,7 @@ class ExtHostChatAgents2 extends Disposable {
                 sessionDisposables
             ));
             const model = await this.getModelForRequest(request, agent.extension);
-            const includeInteractionId = isProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
-            const extRequest = ChatAgentRequest.to(includeInteractionId ? request : { ...request, requestId: '' }, location, model, this.getDiagnosticsWhenEnabled(agent.extension), this.getToolsForRequest(agent.extension, request));
+            const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(agent.extension), this.getToolsForRequest(agent.extension, request), this.getTools2ForRequest(agent.extension, request), agent.extension);
             inFlightRequest = { requestId: requestDto.requestId, extRequest };
             this._inFlightRequests.add(inFlightRequest);
             const task = agent.invoke(extRequest, { history }, stream.apiObject, token);
@@ -448,12 +447,28 @@ class ExtHostChatAgents2 extends Disposable {
         }
         return this._diagnostics.getDiagnostics();
     }
+    getTools2ForRequest(extension, request) {
+        if (!request.userSelectedTools2) {
+            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]);
+            }
+        }
+        return result;
+    }
     getToolsForRequest(extension, request) {
         if (!isNonEmptyArray(request.userSelectedTools)) {
             return undefined;
         }
         const selector = ( new Set(request.userSelectedTools));
-        return this._tools.getTools(extension).filter(candidate => ( selector.has(candidate.name)));
+        const tools = this._tools.getTools(extension).filter(candidate => ( selector.has(candidate.name)));
+        return {
+            tools,
+            isExclusive: request.toolSelectionIsExclusive,
+        };
     }
     async prepareHistoryTurns(extension, agentId, context) {
         const res = [];
@@ -463,14 +478,15 @@ class ExtHostChatAgents2 extends Disposable {
                 ehResult :
                 { ...ehResult, metadata: undefined };
             const varsWithoutTools = ( h.request.variables.variables
-                .filter(v => !v.isTool)
+                .filter(v => v.kind !== 'tool')
                 .map(
                 v => ChatPromptReference.to(v, this.getDiagnosticsWhenEnabled(extension))
             ));
             const toolReferences = ( h.request.variables.variables
-                .filter(v => v.isTool)
+                .filter(v => v.kind === 'tool')
                 .map(ChatLanguageModelToolReference.to));
-            const turn = new ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId, toolReferences);
+            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);
             const parts = coalesce(( h.response.map(r => ChatResponsePart.toContent(r, this._commands.converter))));
             res.push(new ChatResponseTurn(parts, result, h.request.agentId, h.request.command));
@@ -662,10 +678,7 @@ class ExtHostChatAgent {
                     helpTextPostfix: (!this._helpTextPostfix || typeof this._helpTextPostfix === 'string') ? this._helpTextPostfix : MarkdownString$1.from(this._helpTextPostfix),
                     supportIssueReporting: this._supportIssueReporting,
                     requester: this._requester,
-                    welcomeMessageContent: this._welcomeMessageContent && {
-                        ...this._welcomeMessageContent,
-                        message: MarkdownString$1.from(this._welcomeMessageContent.message),
-                    }
+                    additionalWelcomeMessage: (!this._additionalWelcomeMessage || typeof this._additionalWelcomeMessage === 'string') ? this._additionalWelcomeMessage : MarkdownString$1.from(this._additionalWelcomeMessage),
                 });
                 updateScheduled = false;
             });
@@ -761,14 +774,14 @@ class ExtHostChatAgent {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
                 return that._welcomeMessageProvider;
             },
-            set welcomeMessageContent(v) {
+            set additionalWelcomeMessage(v) {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                that._welcomeMessageContent = v;
+                that._additionalWelcomeMessage = v;
                 updateMetadataSoon();
             },
-            get welcomeMessageContent() {
+            get additionalWelcomeMessage() {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                return that._welcomeMessageContent;
+                return that._additionalWelcomeMessage;
             },
             set titleProvider(v) {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');

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

@@ -34,6 +34,8 @@ class ExtHostCodeMapper {
         const request = {
             location: internalRequest.location,
             chatRequestId: internalRequest.chatRequestId,
+            chatRequestModel: internalRequest.chatRequestModel,
+            chatSessionId: internalRequest.chatSessionId,
             codeBlocks: ( internalRequest.codeBlocks.map(block => {
                 return {
                     code: block.code,

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

@@ -66,7 +66,6 @@ export declare class ApiCommandArgument<V, O = V> {
     static readonly Selection: ApiCommandArgument<extHostTypes.Selection, ISelection>;
     static readonly Number: ApiCommandArgument<number, number>;
     static readonly String: ApiCommandArgument<string, string>;
-    static readonly StringArray: ApiCommandArgument<string[], string[]>;
     static Arr<T, K = T>(element: ApiCommandArgument<T, K>): ApiCommandArgument<T[], K[]>;
     static readonly CallHierarchyItem: ApiCommandArgument<vscode.CallHierarchyItem, {
         _sessionId: string;

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

@@ -22,6 +22,7 @@ import { StopWatch } from '../../../base/common/stopwatch.js';
 import { TelemetryTrustedValue } from '../../../platform/telemetry/common/telemetryUtils.js';
 import { IExtHostTelemetry } from './extHostTelemetry.js';
 import { generateUuid } from '../../../base/common/uuid.js';
+import { isCancellationError } from '../../../base/common/errors.js';
 
 let ExtHostCommands = class ExtHostCommands {
     #proxy;
@@ -197,7 +198,9 @@ let ExtHostCommands = class ExtHostCommands {
                     id = actual.command;
                 }
             }
-            this._logService.error(err, id, command.extension?.identifier);
+            if (!isCancellationError(err)) {
+                this._logService.error(err, id, command.extension?.identifier);
+            }
             if (!annotateError) {
                 throw err;
             }
@@ -354,7 +357,6 @@ class ApiCommandArgument {
     )); }
     static { this.Number = ( new ApiCommandArgument('number', '', v => typeof v === 'number', v => v)); }
     static { this.String = ( new ApiCommandArgument('string', '', v => typeof v === 'string', v => v)); }
-    static { this.StringArray = ApiCommandArgument.Arr(ApiCommandArgument.String); }
     static Arr(element) {
         return ( new ApiCommandArgument(
             `${element.name}_array`,

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

@@ -6,7 +6,7 @@ import { ExtHostDocuments } from "./extHostDocuments.js";
 import { IExtensionStoragePaths } from "./extHostStoragePaths.js";
 import { ExtHostWebviews } from "./extHostWebview.js";
 import { ExtHostWebviewPanels } from "./extHostWebviewPanels.js";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-38f25ab8-ea30-5ba9-8a08-ae3308c297c0-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import type * as vscode from "vscode";
 import * as extHostProtocol from "./extHost.protocol.js";
 export declare class ExtHostCustomEditors implements extHostProtocol.ExtHostCustomEditorsShape {

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

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

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

@@ -116,9 +116,11 @@ export declare abstract class AbstractExtHostExtensionService extends Disposable
     $test_up(b: VSBuffer): Promise<number>;
     $test_down(size: number): Promise<VSBuffer>;
     $updateRemoteConnectionData(connectionData: IRemoteConnectionData): Promise<void>;
+    protected _isESM(extensionDescription: IExtensionDescription | undefined, modulePath?: string): boolean;
     protected abstract _beforeAlmostReadyToRunExtensions(): Promise<void>;
     protected abstract _getEntryPoint(extensionDescription: IExtensionDescription): string | undefined;
     protected abstract _loadCommonJSModule<T extends object | undefined>(extensionId: IExtensionDescription | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
+    protected abstract _loadESMModule<T>(extension: IExtensionDescription | null, module: URI, activationTimesBuilder: ExtensionActivationTimesBuilder): Promise<T>;
     abstract $setRemoteEnvironment(env: {
         [key: string]: string | null;
     }): Promise<void>;

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

@@ -304,10 +304,13 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         }
         this._logService.info(`ExtensionService#_doActivateExtension ${extensionDescription.identifier.value}, startup: ${reason.startup}, activationEvent: '${reason.activationEvent}'${extensionDescription.identifier.value !== reason.extensionId.value ? `, root cause: ${reason.extensionId.value}` : ``}`);
         this._logService.flush();
+        const isESM = this._isESM(extensionDescription);
         const extensionInternalStore = ( new DisposableStore());
         const activationTimesBuilder = ( new ExtensionActivationTimesBuilder(reason.startup));
         return Promise.all([
-            this._loadCommonJSModule(extensionDescription, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder),
+            isESM
+                ? this._loadESMModule(extensionDescription, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder)
+                : this._loadCommonJSModule(extensionDescription, joinPath(extensionDescription.extensionLocation, entryPoint), activationTimesBuilder),
             this._loadExtensionContext(extensionDescription, extensionInternalStore)
         ]).then(values => {
             mark(`code/extHost/willActivateExtension/${extensionDescription.identifier.value}`);
@@ -538,12 +541,16 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     async _doHandleExtensionTests() {
         const { extensionDevelopmentLocationURI, extensionTestsLocationURI } = this._initData.environment;
         if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
-            throw ( new Error(( localize(2538, "Cannot load test runner."))));
+            throw ( new Error(( localize(2556, "Cannot load test runner."))));
         }
-        const testRunner = await this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false)));
+        const extensionDescription = (await this.getExtensionPathIndex()).findSubstr(extensionTestsLocationURI);
+        const isESM = this._isESM(extensionDescription, extensionTestsLocationURI.path);
+        const testRunner = await (isESM
+            ? this._loadESMModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false)))
+            : this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false))));
         if (!testRunner || typeof testRunner.run !== 'function') {
             throw ( new Error(( localize(
-                2539,
+                2557,
                 "Path {0} does not point to a valid extension test runner.",
                 (extensionTestsLocationURI.toString())
             ))));
@@ -825,6 +832,10 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
         this._remoteConnectionData = connectionData;
         this._onDidChangeRemoteConnectionData.fire();
     }
+    _isESM(extensionDescription, modulePath) {
+        modulePath ??= extensionDescription?.main;
+        return modulePath?.endsWith('.mjs') || (extensionDescription?.type === 'module' && !modulePath?.endsWith('.cjs'));
+    }
 };
 AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = ( __decorate([
     ( __param(0, IInstantiationService)),

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

@@ -1,4 +1,4 @@
-import { ResourceLabelFormatter } from "@codingame/monaco-vscode-7559b0be-bfa5-5fe6-b731-1973fe9fffa1-common/vscode/vs/platform/label/common/label";
+import { ResourceLabelFormatter } from "@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/label/common/label";
 import { IDisposable } from "../../../base/common/lifecycle.js";
 import { ExtHostLabelServiceShape, IMainContext } from "./extHost.protocol.js";
 export declare class ExtHostLabelService implements ExtHostLabelServiceShape {

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

@@ -107,6 +107,10 @@ export declare class ExtHostLanguageFeatures implements extHostProtocol.ExtHostL
     $provideInlineEditsForRange(handle: number, resource: UriComponents, range: IRange, context: languages.InlineCompletionContext, token: CancellationToken): Promise<extHostProtocol.IdentifiableInlineCompletions | undefined>;
     $handleInlineCompletionDidShow(handle: number, pid: number, idx: number, updatedInsertText: string): void;
     $handleInlineCompletionPartialAccept(handle: number, pid: number, idx: number, acceptedCharacters: number, info: languages.PartialAcceptInfo): void;
+    $handleInlineCompletionEndOfLifetime(handle: number, pid: number, idx: number, reason: languages.InlineCompletionEndOfLifeReason<{
+        pid: number;
+        idx: number;
+    }>): void;
     $handleInlineCompletionRejection(handle: number, pid: number, idx: number): void;
     $freeInlineCompletionsList(handle: number, pid: number): void;
     registerInlineEditProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.InlineEditProvider): vscode.Disposable;

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

@@ -20,7 +20,7 @@ import { ExtensionIdentifier } from '../../../platform/extensions/common/extensi
 import { isProposedApiEnabled, checkProposedApiEnabled } 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, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DocumentSelector } from './extHostTypeConverters.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';
 
 class DocumentSymbolAdapter {
@@ -541,7 +541,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2540,
+                2558,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1090,7 +1090,8 @@ class InlineCompletionAdapter {
         return isProposedApiEnabled(this._extension, 'inlineCompletionsAdditions')
             && (typeof this._provider.handleDidShowCompletionItem === 'function'
                 || typeof this._provider.handleDidPartiallyAcceptCompletionItem === 'function'
-                || typeof this._provider.handleDidRejectCompletionItem === 'function');
+                || typeof this._provider.handleDidRejectCompletionItem === 'function'
+                || typeof this._provider.handleEndOfLifetime === 'function');
     }
     async provideInlineCompletions(resource, position, context, token) {
         const doc = this._documents.getDocument(resource);
@@ -1150,6 +1151,10 @@ class InlineCompletionAdapter {
                     completeBracketPairs: this._isAdditionsProposedApiEnabled ? item.completeBracketPairs : false,
                     isInlineEdit: this._isAdditionsProposedApiEnabled ? item.isInlineEdit : false,
                     showInlineEditMenu: this._isAdditionsProposedApiEnabled ? item.showInlineEditMenu : false,
+                    displayLocation: (item.displayLocation && this._isAdditionsProposedApiEnabled) ? {
+                        range: Range.from(item.displayLocation.range),
+                        label: item.displayLocation.label,
+                    } : undefined,
                     warning: (item.warning && this._isAdditionsProposedApiEnabled) ? {
                         message: MarkdownString.from(item.warning.message),
                         icon: item.warning.icon ? IconPath.fromThemeIcon(item.warning.icon) : undefined,
@@ -1259,6 +1264,15 @@ class InlineCompletionAdapter {
             }
         }
     }
+    handleEndOfLifetime(pid, idx, reason) {
+        const completionItem = this._references.get(pid)?.items[idx];
+        if (completionItem) {
+            if (this._provider.handleEndOfLifetime && this._isAdditionsProposedApiEnabled) {
+                const r = InlineCompletionEndOfLifeReason.to(reason, ref => this._references.get(ref.pid)?.items[ref.idx]);
+                this._provider.handleEndOfLifetime(completionItem, r);
+            }
+        }
+    }
     handleRejection(pid, idx) {
         const completionItem = this._references.get(pid)?.items[idx];
         if (completionItem) {
@@ -1804,7 +1818,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2541,
+                2559,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -2179,10 +2193,16 @@ class ExtHostLanguageFeatures {
         this._withAdapter(handle, CompletionsAdapter, adapter => adapter.releaseCompletionItems(id), undefined, undefined);
     }
     registerInlineCompletionsProvider(extension, selector, provider, metadata) {
+        const eventHandle = typeof provider.onDidChange === 'function' && isProposedApiEnabled(extension, 'inlineCompletionsAdditions') ? this._nextHandle() : undefined;
         const adapter = ( new InlineCompletionAdapter(extension, this._documents, provider, this._commands.converter));
         const handle = this._addNewAdapter(adapter, extension);
-        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);
-        return this._createDisposable(handle);
+        let result = this._createDisposable(handle);
+        if (eventHandle !== undefined) {
+            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);
+        return result;
     }
     $provideInlineCompletions(handle, resource, position, context, token) {
         return this._withAdapter(handle, InlineCompletionAdapter, adapter => adapter.provideInlineCompletions(URI.revive(resource), position, context, token), undefined, token);
@@ -2200,6 +2220,11 @@ class ExtHostLanguageFeatures {
             adapter.handlePartialAccept(pid, idx, acceptedCharacters, info);
         }, undefined, undefined);
     }
+    $handleInlineCompletionEndOfLifetime(handle, pid, idx, reason) {
+        this._withAdapter(handle, InlineCompletionAdapter, async (adapter) => {
+            adapter.handleEndOfLifetime(pid, idx, reason);
+        }, undefined, undefined);
+    }
     $handleInlineCompletionRejection(handle, pid, idx) {
         this._withAdapter(handle, InlineCompletionAdapter, async (adapter) => {
             adapter.handleRejection(pid, idx);

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

@@ -3,8 +3,8 @@ 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 { Dto, SerializableObjectWithBuffers } from "../../services/extensions/common/proxyIdentifier.js";
 import { ExtHostLanguageModelToolsShape, IMainContext, IToolDataDto } from "./extHost.protocol.js";
-import { Dto } from "../../services/extensions/common/proxyIdentifier.js";
 import { ExtHostLanguageModels } from "./extHostLanguageModels.js";
 export declare class ExtHostLanguageModelTools implements ExtHostLanguageModelToolsShape {
     private readonly _languageModels;
@@ -12,13 +12,12 @@ export declare class ExtHostLanguageModelTools implements ExtHostLanguageModelTo
     private readonly _proxy;
     private readonly _tokenCountFuncs;
     private readonly _allTools;
-    private readonly _toolInputProcessors;
     constructor(mainContext: IMainContext, _languageModels: ExtHostLanguageModels);
     $countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
     invokeTool(extension: IExtensionDescription, toolId: string, options: vscode.LanguageModelToolInvocationOptions<any>, token?: CancellationToken): Promise<vscode.LanguageModelToolResult>;
     $onDidChangeTools(tools: IToolDataDto[]): void;
     getTools(extension: IExtensionDescription): vscode.LanguageModelToolInformation[];
-    $invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<Dto<IToolResult>>;
+    $invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<Dto<IToolResult> | SerializableObjectWithBuffers<Dto<IToolResult>>>;
     private getModel;
     $prepareToolInvocation(toolId: string, input: any, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     registerTool(extension: IExtensionDescription, id: string, tool: vscode.LanguageModelTool<any>): IDisposable;

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

@@ -6,26 +6,49 @@ import { toDisposable } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { isToolInvocationContext } from '../../contrib/chat/common/languageModelToolsService.js';
+import { InternalEditToolId, ExtensionEditToolId } from '../../contrib/chat/common/tools/editFileTool.js';
+import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/tools.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 { LanguageModelToolResult, LanguageModelToolDescription, MarkdownString } from './extHostTypeConverters.js';
-import { InternalFetchWebPageToolId } from '../../contrib/chat/common/tools/tools.js';
-import { EditToolData, EditToolInputProcessor, InternalEditToolId, ExtensionEditToolId } from '../../contrib/chat/common/tools/editFileTool.js';
+import { LanguageModelToolResult2, MarkdownString } from './extHostTypeConverters.js';
+import { SearchExtensionsToolId } from '../../contrib/extensions/common/searchExtensionsTool.js';
 
+class Tool {
+    constructor(data) {
+        this._data = data;
+    }
+    update(newData) {
+        this._data = newData;
+    }
+    get data() {
+        return this._data;
+    }
+    get apiObject() {
+        if (!this._apiObject) {
+            const that = this;
+            this._apiObject = ( Object.freeze({
+                get name() { return that._data.id; },
+                get description() { return that._data.modelDescription; },
+                get inputSchema() { return that._data.inputSchema; },
+                get tags() { return that._data.tags ?? []; },
+            }));
+        }
+        return this._apiObject;
+    }
+}
 class ExtHostLanguageModelTools {
     constructor(mainContext, _languageModels) {
         this._languageModels = _languageModels;
         this._registeredTools = ( new Map());
         this._tokenCountFuncs = ( new Map());
         this._allTools = ( new Map());
-        this._toolInputProcessors = ( new Map());
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadLanguageModelTools));
         this._proxy.$getTools().then(tools => {
             for (const tool of tools) {
-                this._allTools.set(tool.id, revive(tool));
+                this._allTools.set(tool.id, ( new Tool(revive(tool))));
             }
         });
-        this._toolInputProcessors.set(EditToolData.id, ( new EditToolInputProcessor()));
     }
     async $countTokensForInvocation(callId, input, token) {
         const fn = this._tokenCountFuncs.get(callId);
@@ -46,36 +69,47 @@ class ExtHostLanguageModelTools {
             if ((toolId === InternalEditToolId || toolId === ExtensionEditToolId) && !isProposedApiEnabled(extension, 'chatParticipantPrivate')) {
                 throw ( new Error(`Invalid tool: ${toolId}`));
             }
-            const processedInput = this._toolInputProcessors.get(toolId)?.processInput(options.input) ?? options.input;
             const result = await this._proxy.$invokeTool({
                 toolId,
                 callId,
-                parameters: processedInput,
+                parameters: options.input,
                 tokenBudget: options.tokenizationOptions?.tokenBudget,
                 context: options.toolInvocationToken,
                 chatRequestId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatRequestId : undefined,
                 chatInteractionId: isProposedApiEnabled(extension, 'chatParticipantPrivate') ? options.chatInteractionId : undefined,
             }, token);
-            return LanguageModelToolResult.to(revive(result));
+            const dto = result instanceof SerializableObjectWithBuffers ? result.value : result;
+            return LanguageModelToolResult2.to(revive(dto));
         }
         finally {
             this._tokenCountFuncs.delete(callId);
         }
     }
     $onDidChangeTools(tools) {
-        this._allTools.clear();
+        const oldTools = ( new Set(( this._registeredTools.keys())));
         for (const tool of tools) {
-            this._allTools.set(tool.id, tool);
+            oldTools.delete(tool.id);
+            const existing = this._allTools.get(tool.id);
+            if (existing) {
+                existing.update(tool);
+            }
+            else {
+                this._allTools.set(tool.id, ( new Tool(revive(tool))));
+            }
+        }
+        for (const id of oldTools) {
+            this._allTools.delete(id);
         }
     }
     getTools(extension) {
         return ( Array.from(( this._allTools.values()))
-            .map(tool => LanguageModelToolDescription.to(tool)))
+            .map(tool => tool.apiObject))
             .filter(tool => {
             switch (tool.name) {
                 case InternalEditToolId:
                 case ExtensionEditToolId:
                 case InternalFetchWebPageToolId:
+                case SearchExtensionsToolId:
                     return isProposedApiEnabled(extension, 'chatParticipantPrivate');
                 default:
                     return true;
@@ -108,11 +142,23 @@ class ExtHostLanguageModelTools {
                 countTokens: this._tokenCountFuncs.get(dto.callId) || ((value, token = CancellationToken.None) => this._proxy.$countTokensForInvocation(dto.callId, value, token))
             };
         }
-        const extensionResult = await raceCancellation(Promise.resolve(item.tool.invoke(options, token)), token);
+        let progress;
+        if (isProposedApiEnabled(item.extension, 'toolProgress')) {
+            progress = {
+                report: value => {
+                    this._proxy.$acceptToolProgress(dto.callId, {
+                        message: MarkdownString.fromStrict(value.message),
+                        increment: value.increment,
+                        total: 100,
+                    });
+                }
+            };
+        }
+        const extensionResult = await raceCancellation(Promise.resolve(item.tool.invoke(options, token, progress)), token);
         if (!extensionResult) {
             throw ( new CancellationError());
         }
-        return LanguageModelToolResult.from(extensionResult, item.extension);
+        return LanguageModelToolResult2.from(extensionResult, item.extension);
     }
     async getModel(modelId, extension) {
         let model;

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

@@ -58,7 +58,7 @@ export declare class ExtHostLanguageModels implements ExtHostLanguageModelsShape
     }[]): void;
     private readonly _languageAccessInformationExtensions;
     createLanguageModelAccessInformation(from: Readonly<IExtensionDescription>): vscode.LanguageModelAccessInformation;
-    fileIsIgnored(extension: IExtensionDescription, uri: vscode.Uri, token: vscode.CancellationToken): Promise<boolean>;
+    fileIsIgnored(extension: IExtensionDescription, uri: vscode.Uri, token?: vscode.CancellationToken): Promise<boolean>;
     $isFileIgnored(handle: number, uri: UriComponents, token: CancellationToken): Promise<boolean>;
     registerIgnoredFileProvider(extension: IExtensionDescription, provider: vscode.LanguageModelIgnoredFileProvider): vscode.Disposable;
 }

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

@@ -18,8 +18,10 @@ import { MainContext } from './extHost.protocol.js';
 import { IExtHostAuthentication } from './extHostAuthentication.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { LanguageModelChatMessage2 } from './extHostTypeConverters.js';
-import { LanguageModelTextPart, LanguageModelToolCallPart, LanguageModelError, LanguageModelChatMessageRole } from './extHostTypes.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'));
@@ -80,6 +82,9 @@ class LanguageModelResponse {
         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);
         }
@@ -135,6 +140,8 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             vendor: metadata.vendor ?? ExtensionIdentifier.toKey(extension.identifier),
             name: metadata.name ?? '',
             family: metadata.family ?? '',
+            cost: metadata.cost,
+            description: metadata.description,
             version: metadata.version,
             maxInputTokens: metadata.maxInputTokens,
             maxOutputTokens: metadata.maxOutputTokens,
@@ -142,6 +149,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             targetExtensions: metadata.extensions,
             isDefault: metadata.isDefault,
             isUserSelectable: metadata.isUserSelectable,
+            modelPickerCategory: metadata.category ?? DEFAULT_MODEL_PICKER_CATEGORY,
             capabilities: metadata.capabilities,
         });
         const responseReceivedListener = provider.onDidReceiveLanguageModelResponse2?.(({ extensionId, participant, tokenCount }) => {
@@ -170,6 +178,9 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             else if (fragment.part instanceof LanguageModelTextPart) {
                 part = { type: 'text', value: fragment.part.value };
             }
+            else if (fragment.part instanceof LanguageModelDataPart) {
+                part = { type: 'data', value: { mimeType: fragment.part.mimeType, data: VSBuffer.wrap(fragment.part.data) } };
+            }
             if (!part) {
                 this._logService.warn(`[CHAT](${data.extension.value}) UNKNOWN part ${JSON.stringify(fragment)}`);
                 return;
@@ -178,12 +189,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }));
         let value;
         try {
-            if (data.provider.provideLanguageModelResponse2) {
-                value = data.provider.provideLanguageModelResponse2(( messages.value.map(LanguageModelChatMessage2.to)), options, ExtensionIdentifier.toKey(from), progress, token);
-            }
-            else {
-                value = data.provider.provideLanguageModelResponse(( messages.value.map(LanguageModelChatMessage2.to)), options, ExtensionIdentifier.toKey(from), progress, token);
-            }
+            value = data.provider.provideLanguageModelResponse(( messages.value.map(LanguageModelChatMessage2.to)), options, ExtensionIdentifier.toKey(from), progress, token);
         }
         catch (err) {
             throw err;
@@ -344,7 +350,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
         }
         try {
             const detail = justification
-                ? ( localize(2542, "Justification: {1}", to.displayName, justification))
+                ? ( localize(2560, "Justification: {1}", to.displayName, justification))
                 : undefined;
             await this._extHostAuthentication.getSession(from, providerId, [], { forceNewSession: { detail } });
             this.$updateModelAccesslist([{ from: from.identifier, to: to.identifier, enabled: true }]);
@@ -435,7 +441,7 @@ let ExtHostLanguageModels = class ExtHostLanguageModels {
             }
         };
     }
-    fileIsIgnored(extension, uri, token) {
+    fileIsIgnored(extension, uri, token = CancellationToken.None) {
         checkProposedApiEnabled(extension, 'chatParticipantAdditions');
         return this._proxy.$fileIsIgnored(uri, token);
     }

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(2543, "Extension Host (Remote)")) : isWorker ? ( localize(2544, "Extension Host (Worker)")) : ( localize(2545, "Extension Host"));
+        const name = initData.remote.isRemote ? ( localize(2561, "Extension Host (Remote)")) : isWorker ? ( localize(2562, "Extension Host (Worker)")) : ( localize(2563, "Extension Host"));
         super(loggerService.createLogger(id, { name }));
     }
 };