@codingame/monaco-vscode-api 20.5.0 → 21.0.1

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

@@ -17,8 +17,9 @@ 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, 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, ChatResponsePullRequestPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatPrepareToolInvocationPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
+import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatTask, ChatResponseProgressPart, ChatResponseThinkingProgressPart as ChatResponseThinkingProgressPart$1, 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 { ChatResponseTextEditPart, ChatResponseNotebookEditPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseConfirmationPart, ChatResponseCodeCitationPart, ChatResponseMovePart, ChatResponseExtensionsPart, ChatResponseThinkingProgressPart, ChatResponsePullRequestPart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseAnchorPart, ChatPrepareToolInvocationPart, ChatResponseCommandButtonPart, ChatResponseFileTreePart, ChatResponseCodeblockUriPart, ChatResponseMarkdownPart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon } from './extHostTypes.js';
+import { MarkdownString } from './extHostTypes/markdownString.js';
 
 class ChatAgentResponseStream {
     constructor(_extension, _request, _proxy, _commandsConverter, _sessionDisposables) {
@@ -152,6 +153,14 @@ class ChatAgentResponseStream {
                     _report(dto, task);
                     return this;
                 },
+                thinkingProgress(thinkingDelta) {
+                    throwIfDone(this.thinkingProgress);
+                    checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+                    const part = new ChatResponseThinkingProgressPart(thinkingDelta.text ?? '', thinkingDelta.id, thinkingDelta.metadata);
+                    const dto = ChatResponseThinkingProgressPart$1.from(part);
+                    _report(dto);
+                    return this;
+                },
                 warning(value) {
                     throwIfDone(this.progress);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
@@ -244,6 +253,7 @@ class ChatAgentResponseStream {
                         part instanceof ChatResponseCodeCitationPart ||
                         part instanceof ChatResponseMovePart ||
                         part instanceof ChatResponseExtensionsPart ||
+                        part instanceof ChatResponseThinkingProgressPart ||
                         part instanceof ChatResponsePullRequestPart ||
                         part instanceof ChatResponseProgressPart2) {
                         checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
@@ -255,6 +265,10 @@ class ChatAgentResponseStream {
                         const dto = part.task ? ChatTask.from(part) : ChatResponseProgressPart.from(part);
                         _report(dto, part.task);
                     }
+                    else if (part instanceof ChatResponseThinkingProgressPart) {
+                        const dto = ChatResponseThinkingProgressPart$1.from(part);
+                        _report(dto);
+                    }
                     else if (part instanceof ChatResponseAnchorPart) {
                         const dto = ChatResponseAnchorPart$1.from(part);
                         if (part.resolve) {
@@ -370,7 +384,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), detector.extension, this._logService);
+        const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(detector.extension), this.getToolsForRequest(detector.extension, request.userSelectedTools), detector.extension, this._logService);
         return detector.provider.provideParticipantDetection(extRequest, { history }, { participants: options.participants, location: ChatLocation.to(options.location) }, token);
     }
     async _createRequest(requestDto, context, extension) {
@@ -401,17 +415,6 @@ 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 $setRequestTools(requestId, tools) {
         const request = [...this._inFlightRequests].find(r => r.requestId === requestId);
         if (!request) {
@@ -447,7 +450,7 @@ 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), agent.extension, this._logService);
+            const extRequest = ChatAgentRequest.to(request, location, model, this.getDiagnosticsWhenEnabled(agent.extension), this.getToolsForRequest(agent.extension, request.userSelectedTools), agent.extension, this._logService);
             inFlightRequest = { requestId: requestDto.requestId, extRequest, extension: agent.extension };
             this._inFlightRequests.add(inFlightRequest);
             const task = agent.invoke(extRequest, { history }, stream.apiObject, token);
@@ -469,7 +472,7 @@ class ExtHostChatAgents2 extends Disposable {
                         responseIsIncomplete: true
                     };
                 }
-                if (errorDetails?.responseIsRedacted || errorDetails?.isQuotaExceeded || errorDetails?.confirmationButtons) {
+                if (errorDetails?.responseIsRedacted || errorDetails?.isQuotaExceeded || errorDetails?.confirmationButtons || errorDetails?.code) {
                     checkProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
                 }
                 return { errorDetails, timings: stream?.timings, metadata: result?.metadata, nextQuestion: result?.nextQuestion, details: result?.details };
@@ -496,14 +499,14 @@ class ExtHostChatAgents2 extends Disposable {
         }
         return this._diagnostics.getDiagnostics();
     }
-    getToolsForRequest(extension, request) {
-        if (!request.userSelectedTools) {
+    getToolsForRequest(extension, tools) {
+        if (!tools) {
             return ( new Map());
         }
         const result = ( new Map());
         for (const tool of this._tools.getTools(extension)) {
-            if (typeof request.userSelectedTools[tool.name] === 'boolean') {
-                result.set(tool.name, request.userSelectedTools[tool.name]);
+            if (typeof tools[tool.name] === 'boolean') {
+                result.set(tool.name, tools[tool.name]);
             }
         }
         return result;
@@ -716,7 +719,6 @@ class ExtHostChatAgent {
                     themeIcon: this._iconPath instanceof ThemeIcon ? this._iconPath : undefined,
                     hasFollowups: this._followupProvider !== undefined,
                     helpTextPrefix: (!this._helpTextPrefix || typeof this._helpTextPrefix === 'string') ? this._helpTextPrefix : MarkdownString$1.from(this._helpTextPrefix),
-                    helpTextVariablesPrefix: (!this._helpTextVariablesPrefix || typeof this._helpTextVariablesPrefix === 'string') ? this._helpTextVariablesPrefix : MarkdownString$1.from(this._helpTextVariablesPrefix),
                     helpTextPostfix: (!this._helpTextPostfix || typeof this._helpTextPostfix === 'string') ? this._helpTextPostfix : MarkdownString$1.from(this._helpTextPostfix),
                     supportIssueReporting: this._supportIssueReporting,
                     requester: this._requester,
@@ -760,15 +762,6 @@ class ExtHostChatAgent {
                 that._helpTextPrefix = v;
                 updateMetadataSoon();
             },
-            get helpTextVariablesPrefix() {
-                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                return that._helpTextVariablesPrefix;
-            },
-            set helpTextVariablesPrefix(v) {
-                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                that._helpTextVariablesPrefix = v;
-                updateMetadataSoon();
-            },
             get helpTextPostfix() {
                 checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
                 return that._helpTextPostfix;

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

@@ -7,24 +7,32 @@ import { IChatAgentRequest, IChatAgentResult } from "@codingame/monaco-vscode-b9
 import { IChatSessionItem } from "../../contrib/chat/common/chatSessionsService.js";
 import { ChatSessionDto, ExtHostChatSessionsShape } from "./extHost.protocol.js";
 import { ExtHostCommands } from "./extHostCommands.js";
-import { IExtHostRpcService } from "./extHostRpcService.js";
 import { ExtHostLanguageModels } from "./extHostLanguageModels.js";
+import { IExtHostRpcService } from "./extHostRpcService.js";
 export declare class ExtHostChatSessions extends Disposable implements ExtHostChatSessionsShape {
     private readonly commands;
     private readonly _languageModels;
     private readonly _extHostRpc;
     private readonly _logService;
+    private static _sessionHandlePool;
     private readonly _proxy;
     private readonly _chatSessionItemProviders;
     private readonly _chatSessionContentProviders;
     private _nextChatSessionItemProviderHandle;
     private _nextChatSessionContentProviderHandle;
-    private _sessionMap;
-    private static _sessionHandlePool;
+    private readonly _sessionMap;
     constructor(commands: ExtHostCommands, _languageModels: ExtHostLanguageModels, _extHostRpc: IExtHostRpcService, _logService: ILogService);
     registerChatSessionItemProvider(extension: IExtensionDescription, chatSessionType: string, provider: vscode.ChatSessionItemProvider): vscode.Disposable;
-    registerChatSessionContentProvider(extension: IExtensionDescription, chatSessionType: string, provider: vscode.ChatSessionContentProvider): vscode.Disposable;
+    registerChatSessionContentProvider(extension: IExtensionDescription, chatSessionType: string, provider: vscode.ChatSessionContentProvider, capabilities?: vscode.ChatSessionCapabilities): vscode.Disposable;
     showChatSession(_extension: IExtensionDescription, chatSessionType: string, sessionId: string, options: vscode.ChatSessionShowOptions | undefined): Promise<void>;
+    private convertChatSessionStatus;
+    private convertChatSessionItem;
+    $provideNewChatSessionItem(handle: number, options: {
+        request: IChatAgentRequest;
+        prompt?: string;
+        history: any[];
+        metadata?: any;
+    }, token: CancellationToken): Promise<IChatSessionItem>;
     $provideChatSessionItems(handle: number, token: vscode.CancellationToken): Promise<IChatSessionItem[]>;
     private readonly _extHostChatSessions;
     $provideChatSessionContent(handle: number, id: string, token: CancellationToken): Promise<ChatSessionDto>;

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

@@ -5,12 +5,14 @@ import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { MarshalledId } from '../../../base/common/marshallingIds.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
+import { ChatSessionStatus } from '../../contrib/chat/common/chatSessionsService.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/constants.js';
 import { MainContext } from './extHost.protocol.js';
 import { ChatAgentResponseStream } from './extHostChatAgents2.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
-import { ViewColumn, ChatResponsePart, ChatAgentRequest } from './extHostTypeConverters.js';
+import { ViewColumn, MarkdownString, ChatAgentRequest, ChatResponsePart } from './extHostTypeConverters.js';
 import { Disposable as Disposable$1, ChatRequestTurn } from './extHostTypes.js';
+import { revive } from '../../../base/common/marshalling.js';
 
 var ExtHostChatSessions_1;
 class ExtHostChatSession {
@@ -54,7 +56,7 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
         commands.registerArgumentProcessor({
             processArgument: (arg) => {
                 if (arg && arg.$mid === MarshalledId.ChatSessionContext) {
-                    const id = arg.id;
+                    const id = arg.session.id;
                     const sessionContent = this._sessionMap.get(id);
                     if (sessionContent) {
                         return sessionContent;
@@ -75,7 +77,7 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
         this._proxy.$registerChatSessionItemProvider(handle, chatSessionType);
         if (provider.onDidChangeChatSessionItems) {
             disposables.add(provider.onDidChangeChatSessionItems(() => {
-                this._proxy.$onDidChangeChatSessionItems(chatSessionType);
+                this._proxy.$onDidChangeChatSessionItems(handle);
             }));
         }
         return {
@@ -86,10 +88,10 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
             }
         };
     }
-    registerChatSessionContentProvider(extension, chatSessionType, provider) {
+    registerChatSessionContentProvider(extension, chatSessionType, provider, capabilities) {
         const handle = this._nextChatSessionContentProviderHandle++;
         const disposables = ( new DisposableStore());
-        this._chatSessionContentProviders.set(handle, { provider, extension, disposable: disposables });
+        this._chatSessionContentProviders.set(handle, { provider, extension, capabilities, disposable: disposables });
         this._proxy.$registerChatSessionContentProvider(handle, chatSessionType);
         return new Disposable$1(() => {
             this._chatSessionContentProviders.delete(handle);
@@ -100,6 +102,66 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
     async showChatSession(_extension, chatSessionType, sessionId, options) {
         await this._proxy.$showChatSession(chatSessionType, sessionId, ViewColumn.from(options?.viewColumn));
     }
+    convertChatSessionStatus(status) {
+        if (status === undefined) {
+            return undefined;
+        }
+        switch (status) {
+            case 0:
+                return ChatSessionStatus.Failed;
+            case 1:
+                return ChatSessionStatus.Completed;
+            case 2:
+                return ChatSessionStatus.InProgress;
+            default:
+                return undefined;
+        }
+    }
+    convertChatSessionItem(sessionContent) {
+        return {
+            id: sessionContent.id,
+            label: sessionContent.label,
+            description: sessionContent.description ? MarkdownString.from(sessionContent.description) : undefined,
+            status: this.convertChatSessionStatus(sessionContent.status),
+            tooltip: MarkdownString.fromStrict(sessionContent.tooltip),
+            timing: {
+                startTime: sessionContent.timing?.startTime ?? 0,
+                endTime: sessionContent.timing?.endTime
+            },
+            statistics: sessionContent.statistics ? {
+                insertions: sessionContent.statistics?.insertions ?? 0,
+                deletions: sessionContent.statistics?.deletions ?? 0
+            } : undefined
+        };
+    }
+    async $provideNewChatSessionItem(handle, options, token) {
+        const entry = this._chatSessionItemProviders.get(handle);
+        if (!entry || !entry.provider.provideNewChatSessionItem) {
+            throw ( new Error(
+                `No provider registered for handle ${handle} or provider does not support creating sessions`
+            ));
+        }
+        try {
+            const model = await this.getModelForRequest(options.request, entry.extension);
+            const vscodeRequest = ChatAgentRequest.to(revive(options.request), undefined, model, [], ( new Map()), entry.extension, this._logService);
+            const vscodeOptions = {
+                request: vscodeRequest,
+                prompt: options.prompt,
+                history: options.history,
+                metadata: options.metadata
+            };
+            const chatSessionItem = await entry.provider.provideNewChatSessionItem(vscodeOptions, token);
+            if (!chatSessionItem || !chatSessionItem.id) {
+                throw ( new Error('Provider did not create session'));
+            }
+            this._sessionMap.set(chatSessionItem.id, chatSessionItem);
+            return this.convertChatSessionItem(chatSessionItem);
+        }
+        catch (error) {
+            this._logService.error(`Error creating chat session: ${error}`);
+            throw error;
+        }
+    }
     async $provideChatSessionItems(handle, token) {
         const entry = this._chatSessionItemProviders.get(handle);
         if (!entry) {
@@ -114,11 +176,7 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
         for (const sessionContent of sessions) {
             if (sessionContent.id) {
                 this._sessionMap.set(sessionContent.id, sessionContent);
-                response.push({
-                    id: sessionContent.id,
-                    label: sessionContent.label,
-                    iconPath: sessionContent.iconPath
-                });
+                response.push(this.convertChatSessionItem(sessionContent));
             }
         }
         return response;
@@ -153,13 +211,15 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
                 this._proxy.$handleProgressComplete(handle, id, 'ongoing');
             });
         }
+        const { capabilities } = provider;
         return {
             id: sessionId + '',
             hasActiveResponseCallback: !!session.activeResponseCallback,
             hasRequestHandler: !!session.requestHandler,
+            supportsInterruption: !!capabilities?.supportsInterruptions,
             history: ( session.history.map(turn => {
                 if (turn instanceof ChatRequestTurn) {
-                    return { type: 'request', prompt: turn.prompt };
+                    return { type: 'request', prompt: turn.prompt, participant: turn.participant };
                 }
                 else {
                     const responseTurn = turn;
@@ -168,7 +228,8 @@ let ExtHostChatSessions = class ExtHostChatSessions extends Disposable {
                     )));
                     return {
                         type: 'response',
-                        parts
+                        parts,
+                        participant: responseTurn.participant
                     };
                 }
             }))

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

@@ -1,7 +1,7 @@
 
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { validateConstraint } from '../../../base/common/types.js';
-import { Disposable, Position as Position$2, Range as Range$2, Location, NotebookRange, Selection, CallHierarchyItem, TypeHierarchyItem, TestRunProfileBase } from './extHostTypes.js';
+import { Disposable, CallHierarchyItem, TypeHierarchyItem, TestRunProfileBase } from './extHostTypes.js';
 import { Range as Range$1, Position as Position$1, location, NotebookRange as NotebookRange$1, Selection as Selection$1, CallHierarchyItem as CallHierarchyItem$1, TypeHierarchyItem as TypeHierarchyItem$1, TestItem, TestRunProfile } from './extHostTypeConverters.js';
 import { cloneAndChange } from '../../../base/common/objects.js';
 import { MainContext } from './extHost.protocol.js';
@@ -23,6 +23,11 @@ import { TelemetryTrustedValue } from '../../../platform/telemetry/common/teleme
 import { IExtHostTelemetry } from './extHostTelemetry.js';
 import { generateUuid } from '../../../base/common/uuid.js';
 import { isCancellationError } from '../../../base/common/errors.js';
+import { Position as Position$2 } from './extHostTypes/position.js';
+import { Range as Range$2 } from './extHostTypes/range.js';
+import { Selection } from './extHostTypes/selection.js';
+import { Location } from './extHostTypes/location.js';
+import { NotebookRange } from './extHostTypes/notebooks.js';
 
 let ExtHostCommands = class ExtHostCommands {
     #proxy;

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

@@ -9,9 +9,10 @@ import { URI } from '../../../base/common/uri.js';
 import { CommentThreadCollapsibleState, CommentThreadState as CommentThreadState$1, CommentThreadApplicability as CommentThreadApplicability$1 } from '../../../editor/common/languages.js';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
 import { Range, MarkdownString as MarkdownString$1, pathOrURIToURI } from './extHostTypeConverters.js';
-import { MarkdownString, CommentThreadFocus, CommentThreadCollapsibleState as CommentThreadCollapsibleState$1, CommentThreadState, CommentThreadApplicability } from './extHostTypes.js';
+import { CommentThreadFocus, CommentThreadCollapsibleState as CommentThreadCollapsibleState$1, CommentThreadState, CommentThreadApplicability } from './extHostTypes.js';
 import { MainContext } from './extHost.protocol.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { MarkdownString } from './extHostTypes/markdownString.js';
 
 function createExtHostComments(mainContext, commands, documents) {
     const proxy = ( mainContext.getProxy(MainContext.MainThreadComments));

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-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-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/extHostDebugService.js

@@ -19,9 +19,11 @@ import { IExtHostExtensionService } from './extHostExtensionService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { IExtHostTesting } from './extHostTesting.js';
 import { DebugTreeItem } from './extHostTypeConverters.js';
-import { SourceBreakpoint, FunctionBreakpoint, DataBreakpoint, DebugConsoleMode, Disposable as Disposable$1, DebugAdapterInlineImplementation, Location, Position, setBreakpointId, DebugThread, DebugStackFrame, DebugAdapterExecutable, DebugAdapterServer, DebugAdapterNamedPipeServer, ThemeIcon as ThemeIcon$1 } from './extHostTypes.js';
+import { SourceBreakpoint, FunctionBreakpoint, DataBreakpoint, DebugConsoleMode, Disposable as Disposable$1, DebugAdapterInlineImplementation, setBreakpointId, DebugThread, DebugStackFrame, DebugAdapterExecutable, DebugAdapterServer, DebugAdapterNamedPipeServer, ThemeIcon as ThemeIcon$1 } from './extHostTypes.js';
 import { IExtHostVariableResolverProvider } from './extHostVariableResolverService.js';
 import { IExtHostWorkspace } from './extHostWorkspace.js';
+import { Location } from './extHostTypes/location.js';
+import { Position } from './extHostTypes/position.js';
 
 const IExtHostDebugService = ( createDecorator('IExtHostDebugService'));
 let ExtHostDebugServiceBase = class ExtHostDebugServiceBase extends Disposable {

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

@@ -4,12 +4,13 @@ import { localize } from '../../../nls.js';
 import { MarkerSeverity } from '../../../platform/markers/common/markers.js';
 import { URI } from '../../../base/common/uri.js';
 import { MainContext } from './extHost.protocol.js';
-import { DiagnosticSeverity } from './extHostTypes.js';
+import './extHostTypes.js';
 import { Diagnostic } from './extHostTypeConverters.js';
 import { DebounceEmitter, Event } from '../../../base/common/event.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { ResourceMap } from '../../../base/common/map.js';
 import { IExtHostFileSystemInfo } from './extHostFileSystemInfo.js';
+import { DiagnosticSeverity } from './extHostTypes/diagnostic.js';
 
 var ExtHostDiagnostics_1;
 class DiagnosticCollection {
@@ -107,7 +108,7 @@ class DiagnosticCollection {
                     marker.push({
                         severity: MarkerSeverity.Info,
                         message: ( localize(
-                            2622,
+                            2627,
                             "Not showing {0} further errors and warnings.",
                             diagnostics.length - this._maxDiagnosticsPerFile
                         )),

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

@@ -1,17 +1,20 @@
-import { URI } from "../../../base/common/uri.js";
+import { URI, UriComponents } from "../../../base/common/uri.js";
 import { MirrorTextModel } from "../../../editor/common/model/mirrorTextModel.js";
-import { MainThreadDocumentsShape } from "./extHost.protocol.js";
-import { Range } from "./extHostTypes.js";
 import type * as vscode from "vscode";
+import { Range } from "./extHostTypes/range.js";
 export declare function setWordDefinitionFor(languageId: string, wordDefinition: RegExp | undefined): void;
+export interface IExtHostDocumentSaveDelegate {
+    $trySaveDocument(uri: UriComponents): Promise<boolean>;
+}
 export declare class ExtHostDocumentData extends MirrorTextModel {
     private readonly _proxy;
     private _languageId;
     private _isDirty;
     private _encoding;
+    private readonly _strictInstanceofChecks;
     private _document?;
     private _isDisposed;
-    constructor(_proxy: MainThreadDocumentsShape, uri: URI, lines: string[], eol: string, versionId: number, _languageId: string, _isDirty: boolean, _encoding: string);
+    constructor(_proxy: IExtHostDocumentSaveDelegate, uri: URI, lines: string[], eol: string, versionId: number, _languageId: string, _isDirty: boolean, _encoding: string, _strictInstanceofChecks?: boolean);
     dispose(): void;
     equalLines(lines: readonly string[]): boolean;
     get document(): vscode.TextDocument;

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

@@ -4,8 +4,10 @@ import { Schemas } from '../../../base/common/network.js';
 import { regExpLeadsToEndlessLoop } from '../../../base/common/strings.js';
 import { MirrorTextModel } from '../../../editor/common/model/mirrorTextModel.js';
 import { getWordAtText, ensureValidWordDefinition } from '../../../editor/common/core/wordHelper.js';
-import { EndOfLine, Position, Range } from './extHostTypes.js';
 import { equals } from '../../../base/common/arrays.js';
+import { EndOfLine } from './extHostTypes/textEdit.js';
+import { Position } from './extHostTypes/position.js';
+import { Range } from './extHostTypes/range.js';
 
 const _languageId2WordDefinition = ( new Map());
 function setWordDefinitionFor(languageId, wordDefinition) {
@@ -20,12 +22,14 @@ function getWordDefinitionFor(languageId) {
     return _languageId2WordDefinition.get(languageId);
 }
 class ExtHostDocumentData extends MirrorTextModel {
-    constructor(_proxy, uri, lines, eol, versionId, _languageId, _isDirty, _encoding) {
+    constructor(_proxy, uri, lines, eol, versionId, _languageId, _isDirty, _encoding, _strictInstanceofChecks = true
+    ) {
         super(uri, lines, eol, versionId);
         this._proxy = _proxy;
         this._languageId = _languageId;
         this._isDirty = _isDirty;
         this._encoding = _encoding;
+        this._strictInstanceofChecks = _strictInstanceofChecks;
         this._isDisposed = false;
     }
     dispose() {
@@ -107,6 +111,9 @@ class ExtHostDocumentData extends MirrorTextModel {
         else if (typeof lineOrPosition === 'number') {
             line = lineOrPosition;
         }
+        else if (!this._strictInstanceofChecks && Position.isPosition(lineOrPosition)) {
+            line = lineOrPosition.line;
+        }
         if (typeof line !== 'number' || line < 0 || line >= this._lines.length || Math.floor(line) !== line) {
             throw ( new Error('Illegal value for `line`'));
         }
@@ -126,8 +133,15 @@ class ExtHostDocumentData extends MirrorTextModel {
         return ( new Position(out.index, Math.min(out.remainder, lineLength)));
     }
     _validateRange(range) {
-        if (!(range instanceof Range)) {
-            throw ( new Error('Invalid argument'));
+        if (this._strictInstanceofChecks) {
+            if (!(range instanceof Range)) {
+                throw ( new Error('Invalid argument'));
+            }
+        }
+        else {
+            if (!Range.isRange(range)) {
+                throw ( new Error('Invalid argument'));
+            }
         }
         const start = this._validatePosition(range.start);
         const end = this._validatePosition(range.end);
@@ -137,8 +151,15 @@ class ExtHostDocumentData extends MirrorTextModel {
         return ( new Range(start.line, start.character, end.line, end.character));
     }
     _validatePosition(position) {
-        if (!(position instanceof Position)) {
-            throw ( new Error('Invalid argument'));
+        if (this._strictInstanceofChecks) {
+            if (!(position instanceof Position)) {
+                throw ( new Error('Invalid argument'));
+            }
+        }
+        else {
+            if (!Position.isPosition(position)) {
+                throw ( new Error('Invalid argument'));
+            }
         }
         if (this._lines.length === 0) {
             return position.with(0, 0);

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

@@ -1,10 +1,11 @@
 
 import { URI } from '../../../base/common/uri.js';
 import { illegalState } from '../../../base/common/errors.js';
-import { TextEdit } from './extHostTypes.js';
+import './extHostTypes.js';
 import { TextDocumentSaveReason, EndOfLine, Range } from './extHostTypeConverters.js';
 import { LinkedList } from '../../../base/common/linkedList.js';
 import { SerializableObjectWithBuffers } from '../../services/extensions/common/proxyIdentifier.js';
+import { TextEdit } from './extHostTypes/textEdit.js';
 
 class ExtHostDocumentSaveParticipant {
     constructor(_logService, _documents, _mainThreadBulkEdits, _thresholds = { timeout: 1500, errors: 3 }) {

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

@@ -540,7 +540,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
     async _doHandleExtensionTests() {
         const { extensionDevelopmentLocationURI, extensionTestsLocationURI } = this._initData.environment;
         if (!extensionDevelopmentLocationURI || !extensionTestsLocationURI) {
-            throw ( new Error(( localize(2623, "Cannot load test runner."))));
+            throw ( new Error(( localize(2628, "Cannot load test runner."))));
         }
         const extensionDescription = (await this.getExtensionPathIndex()).findSubstr(extensionTestsLocationURI);
         const isESM = this._isESM(extensionDescription, extensionTestsLocationURI.path);
@@ -549,7 +549,7 @@ let AbstractExtHostExtensionService = AbstractExtHostExtensionService_1 = class
             : this._loadCommonJSModule(null, extensionTestsLocationURI, ( new ExtensionActivationTimesBuilder(false))));
         if (!testRunner || typeof testRunner.run !== 'function') {
             throw ( new Error(( localize(
-                2624,
+                2629,
                 "Path {0} does not point to a valid extension test runner.",
                 (extensionTestsLocationURI.toString())
             ))));

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

@@ -4,11 +4,12 @@ import { parse, GLOBSTAR, GLOB_SPLIT } from '../../../base/common/glob.js';
 import { URI } from '../../../base/common/uri.js';
 import { MainContext } from './extHost.protocol.js';
 import { GlobPattern, WorkspaceEdit as WorkspaceEdit$1 } from './extHostTypeConverters.js';
-import { Disposable, WorkspaceEdit } from './extHostTypes.js';
+import { Disposable } from './extHostTypes.js';
 import { FileChangeFilter, FileOperation } from '../../../platform/files/common/files.js';
 import { Lazy } from '../../../base/common/lazy.js';
 import { rtrim } from '../../../base/common/strings.js';
 import { normalizeWatcherPattern } from '../../../platform/files/common/watcher.js';
+import { WorkspaceEdit } from './extHostTypes/workspaceEdit.js';
 
 class FileSystemWatcher {
     get ignoreCreateEvents() {

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

@@ -1,6 +1,7 @@
 import type * as vscode from "vscode";
 import { VSBuffer } from "../../../base/common/buffer.js";
 import { CancellationToken } from "../../../base/common/cancellation.js";
+import { Disposable as CoreDisposable } from "../../../base/common/lifecycle.js";
 import { URI, UriComponents } from "../../../base/common/uri.js";
 import { IURITransformer } from "../../../base/common/uriIpc.js";
 import { IPosition } from "../../../editor/common/core/position.js";
@@ -16,10 +17,11 @@ import { ExtHostDiagnostics } from "./extHostDiagnostics.js";
 import { ExtHostDocuments } from "./extHostDocuments.js";
 import { IExtHostTelemetry } from "./extHostTelemetry.js";
 import { Disposable } from "./extHostTypes.js";
+import { IInlineCompletionsUnificationState } from "@codingame/monaco-vscode-base-service-override/vscode/vs/workbench/services/inlineCompletions/common/inlineCompletionsUnification";
 export interface CustomCodeAction extends extHostProtocol.ICodeActionDto {
     _isSynthetic?: boolean;
 }
-export declare class ExtHostLanguageFeatures implements extHostProtocol.ExtHostLanguageFeaturesShape {
+export declare class ExtHostLanguageFeatures extends CoreDisposable implements extHostProtocol.ExtHostLanguageFeaturesShape {
     private readonly _uriTransformer;
     private readonly _documents;
     private readonly _commands;
@@ -30,6 +32,10 @@ export declare class ExtHostLanguageFeatures implements extHostProtocol.ExtHostL
     private static _handlePool;
     private readonly _proxy;
     private readonly _adapter;
+    private _inlineCompletionsUnificationState;
+    get inlineCompletionsUnificationState(): vscode.InlineCompletionsUnificationState;
+    private readonly _onDidChangeInlineCompletionsUnificationState;
+    readonly onDidChangeInlineCompletionsUnificationState: import("../../../base/common/event.js").Event<void>;
     constructor(mainContext: extHostProtocol.IMainContext, _uriTransformer: IURITransformer, _documents: ExtHostDocuments, _commands: ExtHostCommands, _diagnostics: ExtHostDiagnostics, _logService: ILogService, _apiDeprecation: IExtHostApiDeprecationService, _extensionTelemetry: IExtHostTelemetry);
     private _transformDocumentSelector;
     private _createDisposable;
@@ -112,6 +118,7 @@ export declare class ExtHostLanguageFeatures implements extHostProtocol.ExtHostL
     }>): void;
     $handleInlineCompletionRejection(handle: number, pid: number, idx: number): void;
     $freeInlineCompletionsList(handle: number, pid: number, reason: languages.InlineCompletionsDisposeReason): void;
+    $acceptInlineCompletionsUnificationState(state: IInlineCompletionsUnificationState): void;
     registerSignatureHelpProvider(extension: IExtensionDescription, selector: vscode.DocumentSelector, provider: vscode.SignatureHelpProvider, metadataOrTriggerChars: string[] | vscode.SignatureHelpProviderMetadata): vscode.Disposable;
     $provideSignatureHelp(handle: number, resource: UriComponents, position: IPosition, context: extHostProtocol.ISignatureHelpContextDto, token: CancellationToken): Promise<extHostProtocol.ISignatureHelpDto | undefined>;
     $releaseSignatureHelp(handle: number, id: number): void;