@codingame/monaco-vscode-api 13.1.7 → 14.0.0

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

@@ -6,7 +6,7 @@ import { isLocationLink } from '../../../editor/common/languages.js';
 import { decodeSemanticTokensDto } from '../../../editor/common/services/semanticTokensDto.js';
 import { validateWhenClauses } from '../../../platform/contextkey/common/contextkey.js';
 import { ApiCommand, ApiCommandArgument, ApiCommandResult } from './extHostCommands.js';
-import { DocumentHighlight, SymbolKind, Range, TextEdit, location, Hover, Position as Position$1, WorkspaceSymbol, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall, WorkspaceEdit, DocumentLink, CompletionItem, SignatureHelp, Selection, Color, ColorPresentation, InlayHint, FoldingRange, NotebookExclusiveDocumentPattern, InlineValueContext, InlineValue, ViewColumn, TextEditorOpenOptions, TypeHierarchyItem, MappedEditsContext, DefinitionLink } from './extHostTypeConverters.js';
+import { DocumentHighlight, SymbolKind, Range, TextEdit, location, Hover, Position as Position$1, WorkspaceSymbol, CallHierarchyItem, CallHierarchyIncomingCall, CallHierarchyOutgoingCall, WorkspaceEdit, DocumentLink, CompletionItem, SignatureHelp, Selection, Color, ColorPresentation, InlayHint, FoldingRange, NotebookExclusiveDocumentPattern, InlineValueContext, InlineValue, ViewColumn, TextEditorOpenOptions, TypeHierarchyItem, DefinitionLink } from './extHostTypeConverters.js';
 import { SymbolInformation, Location, Position, SelectionRange, SemanticTokensLegend, SemanticTokens, CompletionList, CodeLens, Range as Range$1, Selection as Selection$1, CodeAction, CodeActionKind, ColorInformation, Color as Color$1 } from './extHostTypes.js';
 
 const newCommands = [
@@ -728,25 +728,6 @@ const newCommands = [
         ApiCommandResult.Void
     )),
     (
-    new ApiCommand(
-        'vscode.executeMappedEditsProvider',
-        '_executeMappedEditsProvider',
-        'Execute Mapped Edits Provider',
-        [
-            ApiCommandArgument.Uri,
-            ApiCommandArgument.StringArray,
-            ( new ApiCommandArgument(
-                'MappedEditsContext',
-                'Mapped Edits Context',
-                (v) => MappedEditsContext.is(v),
-                (v) => MappedEditsContext.from(v)
-            ))
-        ],
-        ( new ApiCommandResult('A promise that resolves to a workspace edit or null', (value) => {
-            return value ? WorkspaceEdit.to(value) : null;
-        }))
-    )),
-    (
     new ApiCommand(
         'vscode.editorChat.start',
         'inlineChat.start',

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

@@ -25,6 +25,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     private readonly _relatedFilesProviders;
     private readonly _sessionDisposables;
     private readonly _completionDisposables;
+    private readonly _inFlightRequests;
     constructor(mainContext: IMainContext, _logService: ILogService, _commands: ExtHostCommands, _documents: ExtHostDocuments, _languageModels: ExtHostLanguageModels);
     transferActiveChat(newWorkspace: vscode.Uri): void;
     createChatAgent(extension: IExtensionDescription, id: string, handler: vscode.ChatExtendedRequestHandler): vscode.ChatParticipant;
@@ -40,6 +41,7 @@ export declare class ExtHostChatAgents2 extends Disposable implements ExtHostCha
     }, token: CancellationToken): Promise<vscode.ChatParticipantDetectionResult | null | undefined>;
     private _createRequest;
     private getModelForRequest;
+    $setRequestPaused(handle: number, requestId: string, isPaused: boolean): Promise<void>;
     $invokeAgent(handle: number, requestDto: Dto<IChatAgentRequest>, context: {
         history: IChatAgentHistoryEntryDto[];
     }, token: CancellationToken): Promise<IChatAgentResult | undefined>;

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

@@ -267,6 +267,7 @@ class ExtHostChatAgents2 extends Disposable {
         this._relatedFilesProviders = ( new Map());
         this._sessionDisposables = this._register(( new DisposableMap()));
         this._completionDisposables = this._register(( new DisposableMap()));
+        this._inFlightRequests = ( new Set());
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatAgents2));
         _commands.registerArgumentProcessor({
             processArgument: (arg) => {
@@ -321,18 +322,18 @@ class ExtHostChatAgents2 extends Disposable {
         return (await provider.provider.provideRelatedFiles(extRequestDraft, token)) ?? undefined;
     }
     async $detectChatParticipant(handle, requestDto, context, options, token) {
-        const { request, location, history } = await this._createRequest(requestDto, context);
         const detector = this._participantDetectionProviders.get(handle);
         if (!detector) {
             return undefined;
         }
+        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);
+        const extRequest = ChatAgentRequest.to(request, location, model, isProposedApiEnabled(detector.extension, 'chatReadonlyPromptReference'));
         return detector.provider.provideParticipantDetection(extRequest, { history }, { participants: options.participants, location: ChatLocation.to(options.location) }, token);
     }
-    async _createRequest(requestDto, context) {
+    async _createRequest(requestDto, context, extension) {
         const request = revive(requestDto);
-        const convertedHistory = await this.prepareHistoryTurns(request.agentId, context);
+        const convertedHistory = await this.prepareHistoryTurns(extension, request.agentId, context);
         let location;
         if (request.locationData?.type === ChatAgentLocation.Editor) {
             const document = this._documents.getDocument(request.locationData.document);
@@ -358,6 +359,17 @@ class ExtHostChatAgents2 extends Disposable {
         }
         return model;
     }
+    async $setRequestPaused(handle, requestId, isPaused) {
+        const agent = this._agents.get(handle);
+        if (!agent) {
+            return;
+        }
+        const inFlight = Iterable.find(this._inFlightRequests, r => r.requestId === requestId);
+        if (!inFlight) {
+            return;
+        }
+        agent.setChatRequestPauseState({ request: inFlight.extRequest, isPaused });
+    }
     async $invokeAgent(handle, requestDto, context, token) {
         const agent = this._agents.get(handle);
         if (!agent) {
@@ -366,8 +378,9 @@ class ExtHostChatAgents2 extends Disposable {
             ));
         }
         let stream;
+        let inFlightRequest;
         try {
-            const { request, location, history } = await this._createRequest(requestDto, context);
+            const { request, location, history } = await this._createRequest(requestDto, context, agent.extension);
             let sessionDisposables = this._sessionDisposables.get(request.sessionId);
             if (!sessionDisposables) {
                 sessionDisposables = ( new DisposableStore());
@@ -381,7 +394,9 @@ class ExtHostChatAgents2 extends Disposable {
                 sessionDisposables
             ));
             const model = await this.getModelForRequest(request, agent.extension);
-            const extRequest = ChatAgentRequest.to(request, location, model);
+            const extRequest = ChatAgentRequest.to(request, location, model, isProposedApiEnabled(agent.extension, 'chatReadonlyPromptReference'));
+            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) => {
                 if (result?.metadata) {
@@ -416,19 +431,23 @@ class ExtHostChatAgents2 extends Disposable {
             return { errorDetails: { message: toErrorMessage(e), responseIsIncomplete: true, isQuotaExceeded } };
         }
         finally {
+            if (inFlightRequest) {
+                this._inFlightRequests.delete(inFlightRequest);
+            }
             stream?.close();
         }
     }
-    async prepareHistoryTurns(agentId, context) {
+    async prepareHistoryTurns(extension, agentId, context) {
         const res = [];
         for (const h of context.history) {
             const ehResult = ChatAgentResult.to(h.result);
             const result = agentId === h.request.agentId ?
                 ehResult :
                 { ...ehResult, metadata: undefined };
+            const hasReadonlyProposal = isProposedApiEnabled(extension, 'chatReadonlyPromptReference');
             const varsWithoutTools = ( h.request.variables.variables
                 .filter(v => !v.isTool)
-                .map(ChatPromptReference.to));
+                .map(v => ChatPromptReference.to(v, hasReadonlyProposal)));
             const toolReferences = ( h.request.variables.variables
                 .filter(v => v.isTool)
                 .map(ChatLanguageModelToolReference.to));
@@ -448,7 +467,7 @@ class ExtHostChatAgents2 extends Disposable {
             return Promise.resolve([]);
         }
         const request = revive(requestDto);
-        const convertedHistory = await this.prepareHistoryTurns(agent.id, context);
+        const convertedHistory = await this.prepareHistoryTurns(agent.extension, agent.id, context);
         const ehResult = ChatAgentResult.to(result);
         return ( (await agent.provideFollowups(ehResult, { history: convertedHistory }, token))
             .filter(f => {
@@ -525,7 +544,7 @@ class ExtHostChatAgents2 extends Disposable {
         if (!agent) {
             return;
         }
-        const history = await this.prepareHistoryTurns(agent.id, { history: context });
+        const history = await this.prepareHistoryTurns(agent.extension, agent.id, { history: context });
         return await agent.provideTitle({ history }, token);
     }
     async $provideSampleQuestions(handle, location, token) {
@@ -558,6 +577,7 @@ class ExtHostChatAgent {
         this._requestHandler = _requestHandler;
         this._onDidReceiveFeedback = ( new Emitter());
         this._onDidPerformAction = ( new Emitter());
+        this._pauseStateEmitter = ( new Emitter());
     }
     acceptFeedback(feedback) {
         this._onDidReceiveFeedback.fire(feedback);
@@ -565,6 +585,9 @@ class ExtHostChatAgent {
     acceptAction(event) {
         this._onDidPerformAction.fire(event);
     }
+    setChatRequestPauseState(pauseState) {
+        this._pauseStateEmitter.fire(pauseState);
+    }
     async invokeCompletionProvider(query, token) {
         if (!this._agentVariableProvider) {
             return [];
@@ -756,6 +779,10 @@ class ExtHostChatAgent {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
                 return that._titleProvider;
             },
+            get onDidChangePauseState() {
+                checkProposedApiEnabled(that.extension, 'chatParticipantAdditions');
+                return that._pauseStateEmitter.event;
+            },
             onDidPerformAction: !isProposedApiEnabled(this.extension, 'chatParticipantAdditions')
                 ? undefined
                 : this._onDidPerformAction.event,

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

@@ -1,6 +1,6 @@
 
 import { MainContext } from './extHost.protocol.js';
-import { TextEdit, ChatAgentResult, DocumentContextItem } from './extHostTypeConverters.js';
+import { TextEdit } from './extHostTypeConverters.js';
 import { URI } from '../../../base/common/uri.js';
 
 class ExtHostCodeMapper {
@@ -24,28 +24,14 @@ class ExtHostCodeMapper {
             }
         };
         const request = {
+            location: internalRequest.location,
+            chatRequestId: internalRequest.chatRequestId,
             codeBlocks: ( internalRequest.codeBlocks.map(block => {
                 return {
                     code: block.code,
                     resource: URI.revive(block.resource),
                     markdownBeforeBlock: block.markdownBeforeBlock
                 };
-            })),
-            conversation: ( internalRequest.conversation.map(item => {
-                if (item.type === 'request') {
-                    return {
-                        type: 'request',
-                        message: item.message
-                    };
-                }
-                else {
-                    return {
-                        type: 'response',
-                        message: item.message,
-                        result: item.result ? ChatAgentResult.to(item.result) : undefined,
-                        references: item.references?.map(DocumentContextItem.to)
-                    };
-                }
             }))
         };
         const result = await provider.provideMappedEdits(request, stream, token);
@@ -53,7 +39,7 @@ class ExtHostCodeMapper {
     }
     registerMappedEditsProvider(extension, provider) {
         const handle = ExtHostCodeMapper._providerHandlePool++;
-        this._proxy.$registerCodeMapperProvider(handle);
+        this._proxy.$registerCodeMapperProvider(handle, extension.displayName ?? extension.name);
         this.providers.set(handle, provider);
         return {
             dispose: () => {

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

@@ -11,10 +11,10 @@ import { URI } from "../../../base/common/uri.js";
 import { DisposableStore } from "../../../base/common/lifecycle.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
 import { ISelection } from "../../../editor/common/core/selection.js";
-import { ExtensionIdentifier, IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
+import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { IExtHostTelemetry } from "./extHostTelemetry.js";
 export interface ArgumentProcessor {
-    processArgument(arg: any, extensionId: ExtensionIdentifier | undefined): any;
+    processArgument(arg: any, extension: IExtensionDescription | undefined): any;
 }
 export declare class ExtHostCommands implements ExtHostCommandsShape {
     #private;

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

@@ -235,7 +235,7 @@ let ExtHostCommands = class ExtHostCommands {
         }
         else {
             args = ( args.map(
-                arg => this._argumentProcessors.reduce((r, p) => p.processArgument(r, cmdHandler.extension?.identifier), arg)
+                arg => this._argumentProcessors.reduce((r, p) => p.processArgument(r, cmdHandler.extension), arg)
             ));
             return this._executeContributedCommand(id, args, true);
         }

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

@@ -1,7 +1,8 @@
 
 import { asPromise } from '../../../base/common/async.js';
-import { Emitter } from '../../../base/common/event.js';
 import { MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import '../../../base/common/cancellation.js';
+import { Emitter } from '../../../base/common/event.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { URI } from '../../../base/common/uri.js';
 import { CommentThreadCollapsibleState, CommentThreadState as CommentThreadState$1, CommentThreadApplicability as CommentThreadApplicability$1 } from '../../../editor/common/languages.js';
@@ -144,7 +145,7 @@ function createExtHostComments(mainContext, commands, documents) {
             }
             const document = await documents.ensureDocumentData(URI.revive(uriComponents));
             return asPromise(async () => {
-                const rangesResult = await commentController.commentingRangeProvider.provideCommentingRanges(document.document, token);
+                const rangesResult = await commentController.commentingRangeProvider?.provideCommentingRanges(document.document, token);
                 let ranges;
                 if (Array.isArray(rangesResult)) {
                     ranges = {
@@ -502,9 +503,6 @@ function createExtHostComments(mainContext, commands, documents) {
             });
         }
         createCommentThread(resource, range, comments) {
-            if (range === undefined) {
-                checkProposedApiEnabled(this._extension, 'fileComments');
-            }
             const commentThread = ( new ExtHostCommentThread(
                 this.id,
                 this.handle,

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

@@ -6,6 +6,22 @@ import { IConfigurationChange } from "../../../platform/configuration/common/con
 import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 import { IExtHostRpcService } from "./extHostRpcService.js";
 import { ILogService } from "../../../platform/log/common/log.service.js";
+export type ConfigurationInspect<T> = {
+    key: string;
+    defaultValue?: T;
+    globalLocalValue?: T;
+    globalRemoteValue?: T;
+    globalValue?: T;
+    workspaceValue?: T;
+    workspaceFolderValue?: T;
+    defaultLanguageValue?: T;
+    globalLocalLanguageValue?: T;
+    globalRemoteLanguageValue?: T;
+    globalLanguageValue?: T;
+    workspaceLanguageValue?: T;
+    workspaceFolderLanguageValue?: T;
+    languageIds?: string[];
+};
 export declare class ExtHostConfiguration implements ExtHostConfigurationShape {
     readonly _serviceBrand: undefined;
     private readonly _proxy;

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

@@ -209,10 +209,14 @@ class ExtHostConfigProvider {
                     return {
                         key,
                         defaultValue: deepClone(config.policy?.value ?? config.default?.value),
+                        globalLocalValue: deepClone(config.userLocal?.value),
+                        globalRemoteValue: deepClone(config.userRemote?.value),
                         globalValue: deepClone(config.user?.value ?? config.application?.value),
                         workspaceValue: deepClone(config.workspace?.value),
                         workspaceFolderValue: deepClone(config.workspaceFolder?.value),
                         defaultLanguageValue: deepClone(config.default?.override),
+                        globalLocalLanguageValue: deepClone(config.userLocal?.override),
+                        globalRemoteLanguageValue: deepClone(config.userRemote?.override),
                         globalLanguageValue: deepClone(config.user?.override ?? config.application?.override),
                         workspaceLanguageValue: deepClone(config.workspace?.override),
                         workspaceFolderLanguageValue: deepClone(config.workspaceFolder?.override),

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

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

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

@@ -1,10 +1,9 @@
 import type * as vscode from "vscode";
 import { URI } from "../../../base/common/uri.js";
 import { IMainContext } from "./extHost.protocol.js";
-import { IExtensionDescription } from "../../../platform/extensions/common/extensions.js";
 export declare class ExtHostDialogs {
     private readonly _proxy;
     constructor(mainContext: IMainContext);
-    showOpenDialog(extension: IExtensionDescription, options?: vscode.OpenDialogOptions): Promise<URI[] | undefined>;
+    showOpenDialog(options?: vscode.OpenDialogOptions): Promise<URI[] | undefined>;
     showSaveDialog(options?: vscode.SaveDialogOptions): Promise<URI | undefined>;
 }

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

@@ -1,16 +1,12 @@
 
 import { URI } from '../../../base/common/uri.js';
 import { MainContext } from './extHost.protocol.js';
-import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 
 class ExtHostDialogs {
     constructor(mainContext) {
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadDialogs));
     }
-    showOpenDialog(extension, options) {
-        if (options?.allowUIResources) {
-            checkProposedApiEnabled(extension, 'showLocal');
-        }
+    showOpenDialog(options) {
         return this._proxy.$showOpenDialog(options).then(filepaths => {
             return filepaths ? ( filepaths.map(p => URI.revive(p))) : undefined;
         });

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

@@ -538,12 +538,12 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     async _doHandleExtensionTests() {
         const { extensionDevelopmentLocationURI, extensionTestsLocationURI } = this._initData.environment;
         if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
-            throw ( new Error(( localize(2435, "Cannot load test runner."))));
+            throw ( new Error(( localize(2476, "Cannot load test runner."))));
         }
         const testRunner = await this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false)));
         if (!testRunner || typeof testRunner.run !== 'function') {
             throw ( new Error(( localize(
-                2436,
+                2477,
                 "Path {0} does not point to a valid extension test runner.",
                 (extensionTestsLocationURI.toString())
             ))));

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

@@ -1,4 +1,4 @@
-import { ResourceLabelFormatter } from "@codingame/monaco-vscode-82e231ca-6ed7-5920-b2b8-1874ccc0be07-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

@@ -145,8 +145,6 @@ export declare class ExtHostLanguageFeatures implements extHostProtocol.ExtHostL
         additionalEdit?: extHostProtocol.IWorkspaceEditDto;
     }>;
     $releaseDocumentOnDropEdits(handle: number, cacheId: number): void;
-    registerMappedEditsProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.MappedEditsProvider): vscode.Disposable;
-    $provideMappedEdits(handle: number, document: UriComponents, codeBlocks: string[], context: extHostProtocol.IMappedEditsContextDto, token: CancellationToken): Promise<extHostProtocol.IWorkspaceEditDto | null>;
     registerDocumentPasteEditProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.DocumentPasteEditProvider, metadata: vscode.DocumentPasteProviderMetadata): vscode.Disposable;
     $prepareDocumentPaste(handle: number, resource: UriComponents, ranges: IRange[], dataTransfer: extHostProtocol.DataTransferDTO, token: CancellationToken): Promise<extHostProtocol.DataTransferDTO | undefined>;
     $providePasteEdits(handle: number, requestId: number, resource: UriComponents, ranges: IRange[], dataTransferDto: extHostProtocol.DataTransferDTO, context: extHostProtocol.IDocumentPasteContextDto, token: CancellationToken): Promise<extHostProtocol.IPasteEditDto[] | undefined>;

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

@@ -17,7 +17,7 @@ import { encodeSemanticTokensDto } from '../../../editor/common/services/semanti
 import { localize } from '../../../nls.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.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, TextEdit, WorkspaceSymbol, CompletionContext, MarkdownString, CompletionItemTag, CompletionItemKind, PartialAcceptInfo, SignatureHelp, InlayHintKind, DocumentLink, Color, ColorPresentation, FoldingRange, SelectionRange, CallHierarchyItem, TypeHierarchyItem, DocumentSelector } from './extHostTypeConverters.js';
-import { DocumentSymbol, Range as Range$2, CodeActionKind, InternalDataTransferItem, DocumentDropOrPasteEditKind, NewSymbolNameTriggerKind, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, CompletionList, SnippetString, InlineCompletionTriggerKind, InlineEditTriggerKind, Location, Disposable, SyntaxTokenType } from './extHostTypes.js';
+import { DocumentSymbol, Range as Range$2, CodeActionKind, CodeAction, InternalDataTransferItem, DocumentDropOrPasteEditKind, NewSymbolNameTriggerKind, SemanticTokens, SemanticTokensEdits, SemanticTokensEdit, CompletionList, SnippetString, InlineCompletionTriggerKind, InlineEditTriggerKind, Location, Disposable, SyntaxTokenType } from './extHostTypes.js';
 import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { Cache } from './cache.js';
 import { ISuggestResultDtoField, ISuggestDataDtoField, MainContext } from './extHost.protocol.js';
@@ -104,6 +104,10 @@ class CodeLensAdapter {
             lenses: [],
         };
         for (let i = 0; i < lenses.length; i++) {
+            if (!Range$2.isRange(lenses[i].range)) {
+                console.warn('INVALID code lens, range is not defined', this._extension.identifier.value);
+                continue;
+            }
             result.lenses.push({
                 cacheId: [cacheId, i],
                 range: Range.from(lenses[i].range),
@@ -406,7 +410,7 @@ class CodeActionAdapter {
             if (!candidate) {
                 continue;
             }
-            if (CodeActionAdapter._isCommand(candidate)) {
+            if (CodeActionAdapter._isCommand(candidate) && !(candidate instanceof CodeAction)) {
                 this._apiDeprecation.report('CodeActionProvider.provideCodeActions - return commands', this._extension, `Return 'CodeAction' instances instead.`);
                 actions.push({
                     _isSynthetic: true,
@@ -415,26 +419,27 @@ class CodeActionAdapter {
                 });
             }
             else {
+                const toConvert = candidate;
                 if (codeActionContext.only) {
-                    if (!candidate.kind) {
+                    if (!toConvert.kind) {
                         this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action does not have a 'kind'. Code action will be dropped. Please set 'CodeAction.kind'.`);
                     }
-                    else if (!codeActionContext.only.contains(candidate.kind)) {
-                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action is of kind '${candidate.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
+                    else if (!codeActionContext.only.contains(toConvert.kind)) {
+                        this._logService.warn(`${this._extension.identifier.value} - Code actions of kind '${codeActionContext.only.value}' requested but returned code action is of kind '${toConvert.kind.value}'. Code action will be dropped. Please check 'CodeActionContext.only' to only return requested code actions.`);
                     }
                 }
-                const range = candidate.ranges ?? [];
+                const range = toConvert.ranges ?? [];
                 actions.push({
                     cacheId: [cacheId, i],
-                    title: candidate.title,
-                    command: candidate.command && this._commands.toInternal(candidate.command, disposables),
-                    diagnostics: candidate.diagnostics && ( candidate.diagnostics.map(Diagnostic.from)),
-                    edit: candidate.edit && WorkspaceEdit.from(candidate.edit, undefined),
-                    kind: candidate.kind && candidate.kind.value,
-                    isPreferred: candidate.isPreferred,
-                    isAI: isProposedApiEnabled(this._extension, 'codeActionAI') ? candidate.isAI : false,
+                    title: toConvert.title,
+                    command: toConvert.command && this._commands.toInternal(toConvert.command, disposables),
+                    diagnostics: toConvert.diagnostics && ( toConvert.diagnostics.map(Diagnostic.from)),
+                    edit: toConvert.edit && WorkspaceEdit.from(toConvert.edit, undefined),
+                    kind: toConvert.kind && toConvert.kind.value,
+                    isPreferred: toConvert.isPreferred,
+                    isAI: isProposedApiEnabled(this._extension, 'codeActionAI') ? toConvert.isAI : false,
                     ranges: isProposedApiEnabled(this._extension, 'codeActionRanges') ? coalesce(( range.map(Range.from))) : undefined,
-                    disabled: candidate.disabled?.reason
+                    disabled: toConvert.disabled?.reason
                 });
             }
         }
@@ -517,7 +522,7 @@ class DocumentPasteEditProvider {
         return (edits.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2437,
+                2478,
                 "Paste using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1087,7 +1092,8 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
                     text: context.selectedSuggestionInfo.text
                 }
                 : undefined,
-            triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind]
+            triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
+            requestUuid: context.requestUuid,
         }, token);
         if (!result) {
             return undefined;
@@ -1151,6 +1157,7 @@ class InlineCompletionAdapter extends InlineCompletionAdapterBase {
                 : undefined,
             triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
             userPrompt: context.userPrompt,
+            requestUuid: context.requestUuid,
         }, token);
         if (!result) {
             return undefined;
@@ -1224,7 +1231,8 @@ class InlineEditAdapter {
     async provideInlineEdits(uri, context, token) {
         const doc = this._documents.getDocument(uri);
         const result = await this._provider.provideInlineEdit(doc, {
-            triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind]
+            triggerKind: this.languageTriggerKindToVSCodeTriggerKind[context.triggerKind],
+            requestUuid: context.requestUuid,
         }, token);
         if (!result) {
             return undefined;
@@ -1267,6 +1275,7 @@ class InlineEditAdapter {
             pid,
             text: result.text,
             range: Range.from(result.range),
+            showRange: Range.from(result.showRange),
             accepted: acceptCommand,
             rejected: rejectCommand,
             shown: shownCommand,
@@ -1746,7 +1755,7 @@ class DocumentDropEditAdapter {
         return (editsArray.map((edit, i) => ({
             _cacheId: [cacheId, i],
             title: edit.title ?? ( localize(
-                2438,
+                2479,
                 "Drop using '{0}' extension",
                 this._extension.displayName || this._extension.name
             )),
@@ -1770,43 +1779,6 @@ class DocumentDropEditAdapter {
         this._cache.delete(id);
     }
 }
-class MappedEditsAdapter {
-    constructor(_documents, _provider) {
-        this._documents = _documents;
-        this._provider = _provider;
-    }
-    async provideMappedEdits(resource, codeBlocks, context, token) {
-        const uri = URI.revive(resource);
-        const doc = this._documents.getDocument(uri);
-        const reviveContextItem = (item) => ({
-            uri: URI.revive(item.uri),
-            version: item.version,
-            ranges: ( item.ranges.map(r => Range.to(r))),
-        });
-        const usedContext = ( context.documents.map(docSubArray => ( docSubArray.map(reviveContextItem))));
-        const ctx = {
-            documents: usedContext,
-            selections: usedContext[0]?.[0]?.ranges ?? [],
-            conversation: context.conversation?.map(c => {
-                if (c.type === 'response') {
-                    return {
-                        type: 'response',
-                        message: c.message,
-                        references: c.references?.map(reviveContextItem)
-                    };
-                }
-                else {
-                    return {
-                        type: 'request',
-                        message: c.message,
-                    };
-                }
-            })
-        };
-        const mappedEdits = await this._provider.provideMappedEdits(doc, codeBlocks, ctx, token);
-        return mappedEdits ? WorkspaceEdit.from(mappedEdits) : null;
-    }
-}
 class AdapterData {
     constructor(adapter, extension) {
         this.adapter = adapter;
@@ -2185,7 +2157,7 @@ class ExtHostLanguageFeatures {
     registerInlineEditProvider(extension, selector, provider) {
         const adapter = ( new InlineEditAdapter(extension, this._documents, provider, this._commands.converter));
         const handle = this._addNewAdapter(adapter, extension);
-        this._proxy.$registerInlineEditProvider(handle, this._transformDocumentSelector(selector, extension), extension.identifier);
+        this._proxy.$registerInlineEditProvider(handle, this._transformDocumentSelector(selector, extension), extension.identifier, provider.displayName || extension.name);
         return this._createDisposable(handle);
     }
     $provideInlineEdit(handle, resource, context, token) {
@@ -2319,7 +2291,7 @@ class ExtHostLanguageFeatures {
     registerDocumentOnDropEditProvider(extension, selector, provider, metadata) {
         const handle = this._nextHandle();
         this._adapter.set(handle, ( new AdapterData(( new DocumentDropEditAdapter(this._proxy, this._documents, provider, handle, extension)), extension)));
-        this._proxy.$registerDocumentOnDropEditProvider(handle, this._transformDocumentSelector(selector, extension), isProposedApiEnabled(extension, 'documentPaste') && metadata ? {
+        this._proxy.$registerDocumentOnDropEditProvider(handle, this._transformDocumentSelector(selector, extension), metadata ? {
             supportsResolve: !!provider.resolveDocumentDropEdit,
             dropMimeTypes: metadata.dropMimeTypes,
             providedDropKinds: metadata.providedDropEditKinds?.map(x => x.value),
@@ -2335,14 +2307,6 @@ class ExtHostLanguageFeatures {
     $releaseDocumentOnDropEdits(handle, cacheId) {
         this._withAdapter(handle, DocumentDropEditAdapter, adapter => Promise.resolve(adapter.releaseDropEdits(cacheId)), undefined, undefined);
     }
-    registerMappedEditsProvider(extension, selector, provider) {
-        const handle = this._addNewAdapter(( new MappedEditsAdapter(this._documents, provider)), extension);
-        this._proxy.$registerMappedEditsProvider(handle, this._transformDocumentSelector(selector, extension), extension.displayName ?? extension.name);
-        return this._createDisposable(handle);
-    }
-    $provideMappedEdits(handle, document, codeBlocks, context, token) {
-        return this._withAdapter(handle, MappedEditsAdapter, adapter => Promise.resolve(adapter.provideMappedEdits(document, codeBlocks, context, token)), null, token);
-    }
     registerDocumentPasteEditProvider(extension, selector, provider, metadata) {
         const handle = this._nextHandle();
         this._adapter.set(handle, ( new AdapterData(( new DocumentPasteEditProvider(this._proxy, this._documents, provider, handle, extension)), extension)));

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

@@ -9,11 +9,12 @@ export declare class ExtHostLanguageModelTools implements ExtHostLanguageModelTo
     private readonly _proxy;
     private readonly _tokenCountFuncs;
     private readonly _allTools;
+    private readonly _toolInputProcessors;
     constructor(mainContext: IMainContext);
     $countTokensForInvocation(callId: string, input: string, token: CancellationToken): Promise<number>;
-    invokeTool(toolId: string, options: vscode.LanguageModelToolInvocationOptions<any>, token?: CancellationToken): Promise<vscode.LanguageModelToolResult>;
+    invokeTool(extension: IExtensionDescription, toolId: string, options: vscode.LanguageModelToolInvocationOptions<any>, token?: CancellationToken): Promise<vscode.LanguageModelToolResult>;
     $onDidChangeTools(tools: IToolDataDto[]): void;
-    get tools(): vscode.LanguageModelToolInformation[];
+    getTools(extension: IExtensionDescription): vscode.LanguageModelToolInformation[];
     $invokeTool(dto: IToolInvocation, token: CancellationToken): Promise<IToolResult>;
     $prepareToolInvocation(toolId: string, input: any, token: CancellationToken): Promise<IPreparedToolInvocation | undefined>;
     registerTool(extension: IExtensionDescription, id: string, tool: vscode.LanguageModelTool<any>): IDisposable;