@codingame/monaco-vscode-api 10.1.3 → 11.0.0

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

@@ -1,21 +1,25 @@
 import { coalesce } from '../../../base/common/arrays.js';
 import { raceCancellation } from '../../../base/common/async.js';
+import { CancellationTokenSource } from '../../../base/common/cancellation.js';
 import { toErrorMessage } from '../../../base/common/errorMessage.js';
 import { Emitter } from '../../../base/common/event.js';
 import { Iterable } from '../../../base/common/iterator.js';
-import { Disposable, DisposableMap, toDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { toDisposable, Disposable, DisposableMap, DisposableStore } from '../../../base/common/lifecycle.js';
 import { revive } from '../../../base/common/marshalling.js';
 import { StopWatch } from '../../../base/common/stopwatch.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { assertType } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
+import { generateUuid } from '../../../base/common/uuid.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/chatAgents.js';
 import { ChatAgentVoteDirection } from '../../contrib/chat/common/chatService.js';
-import { isProposedApiEnabled, checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseCodeblockUriPart, ChatResponseFilesPart, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatTask, ChatResponseProgressPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseReferencePart, ChatResponseCodeCitationPart, ChatResponseTextEditPart, ChatResponseDetectedParticipantPart, ChatResponseConfirmationPart, ChatResponsePart, ChatLanguageModelToolReference, MarkdownString, ChatTaskResult, ChatPromptReference } from './extHostTypeConverters.js';
-import { ChatRequestEditorData, LanguageModelError, ChatResponseTurn, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseMovePart, ChatResponseProgressPart2, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatRequestNotebookData, ChatRequestTurn, ChatResultFeedbackKind, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ThemeIcon as ThemeIcon$1, MarkdownString as MarkdownString$1 } from './extHostTypes.js';
+import { ChatResponseWarningPart, ChatResponseReferencePart, ChatTaskResult, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseCodeblockUriPart as ChatResponseCodeblockUriPart$1, ChatResponseFilesPart, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatTask, ChatResponseProgressPart, ChatResponseCodeCitationPart as ChatResponseCodeCitationPart$1, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponsePart, ChatAgentRequest, ChatLocation, Selection, Range, ChatAgentResult, ChatPromptReference, ChatLanguageModelToolReference, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, MarkdownString as MarkdownString$1 } from './extHostTypeConverters.js';
+import { MarkdownString, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseCodeblockUriPart, ChatResponseFileTreePart, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseProgressPart2, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseCodeCitationPart, ChatResponseTextEditPart, ChatResponseDetectedParticipantPart, ChatResponseConfirmationPart, ChatResponseMovePart, ChatRequestEditorData, ChatRequestNotebookData, LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ThemeIcon as ThemeIcon$1 } from './extHostTypes.js';
+import { isChatViewTitleActionContext } from '../../contrib/chat/common/chatActions.js';
+
 class ChatAgentResponseStream {
     constructor(_extension, _request, _proxy, _commandsConverter, _sessionDisposables) {
         this._extension = _extension;
@@ -56,8 +60,8 @@ class ChatAgentResponseStream {
                         report: (p) => {
                             progressReporterPromise?.then((handle) => {
                                 if (handle) {
-                                    if (MarkdownString$1.isMarkdownString(p.value)) {
-                                        this._proxy.$handleProgressChunk(this._request.requestId, ChatResponseWarningPart$1.from(p), handle);
+                                    if (MarkdownString.isMarkdownString(p.value)) {
+                                        this._proxy.$handleProgressChunk(this._request.requestId, ChatResponseWarningPart.from(p), handle);
                                     }
                                     else {
                                         this._proxy.$handleProgressChunk(this._request.requestId, ChatResponseReferencePart.from(p), handle);
@@ -76,7 +80,7 @@ class ChatAgentResponseStream {
                     this._proxy.$handleProgressChunk(this._request.requestId, progress);
                 }
             };
-            this._apiObject = {
+            this._apiObject = ( Object.freeze({
                 markdown(value) {
                     throwIfDone(this.markdown);
                     const part = new ChatResponseMarkdownPart(value);
@@ -97,8 +101,8 @@ class ChatAgentResponseStream {
                 codeblockUri(value) {
                     throwIfDone(this.codeblockUri);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
-                    const part = new ChatResponseCodeblockUriPart$1(value);
-                    const dto = ChatResponseCodeblockUriPart.from(part);
+                    const part = new ChatResponseCodeblockUriPart(value);
+                    const dto = ChatResponseCodeblockUriPart$1.from(part);
                     _report(dto);
                     return this;
                 },
@@ -110,16 +114,13 @@ class ChatAgentResponseStream {
                     return this;
                 },
                 anchor(value, title) {
-                    throwIfDone(this.anchor);
-                    const part = new ChatResponseAnchorPart$1(value, title);
-                    const dto = ChatResponseAnchorPart.from(part);
-                    _report(dto);
-                    return this;
+                    const part = new ChatResponseAnchorPart(value, title);
+                    return this.push(part);
                 },
                 button(value) {
                     throwIfDone(this.anchor);
-                    const part = new ChatResponseCommandButtonPart$1(value);
-                    const dto = ChatResponseCommandButtonPart.from(part, that._commandsConverter, that._sessionDisposables);
+                    const part = new ChatResponseCommandButtonPart(value);
+                    const dto = ChatResponseCommandButtonPart$1.from(part, that._commandsConverter, that._sessionDisposables);
                     _report(dto);
                     return this;
                 },
@@ -133,8 +134,8 @@ class ChatAgentResponseStream {
                 warning(value) {
                     throwIfDone(this.progress);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
-                    const part = new ChatResponseWarningPart(value);
-                    const dto = ChatResponseWarningPart$1.from(part);
+                    const part = new ChatResponseWarningPart$1(value);
+                    const dto = ChatResponseWarningPart.from(part);
                     _report(dto);
                     return this;
                 },
@@ -175,42 +176,42 @@ class ChatAgentResponseStream {
                 codeCitation(value, license, snippet) {
                     throwIfDone(this.codeCitation);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
-                    const part = new ChatResponseCodeCitationPart$1(value, license, snippet);
-                    const dto = ChatResponseCodeCitationPart.from(part);
+                    const part = new ChatResponseCodeCitationPart(value, license, snippet);
+                    const dto = ChatResponseCodeCitationPart$1.from(part);
                     _report(dto);
                 },
                 textEdit(target, edits) {
                     throwIfDone(this.textEdit);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
-                    const part = new ChatResponseTextEditPart$1(target, edits);
-                    const dto = ChatResponseTextEditPart.from(part);
+                    const part = new ChatResponseTextEditPart(target, edits);
+                    const dto = ChatResponseTextEditPart$1.from(part);
                     _report(dto);
                     return this;
                 },
                 detectedParticipant(participant, command) {
                     throwIfDone(this.detectedParticipant);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
-                    const part = new ChatResponseDetectedParticipantPart$1(participant, command);
-                    const dto = ChatResponseDetectedParticipantPart.from(part);
+                    const part = new ChatResponseDetectedParticipantPart(participant, command);
+                    const dto = ChatResponseDetectedParticipantPart$1.from(part);
                     _report(dto);
                     return this;
                 },
                 confirmation(title, message, data, buttons) {
                     throwIfDone(this.confirmation);
                     checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
-                    const part = new ChatResponseConfirmationPart$1(title, message, data, buttons);
-                    const dto = ChatResponseConfirmationPart.from(part);
+                    const part = new ChatResponseConfirmationPart(title, message, data, buttons);
+                    const dto = ChatResponseConfirmationPart$1.from(part);
                     _report(dto);
                     return this;
                 },
                 push(part) {
                     throwIfDone(this.push);
-                    if (part instanceof ChatResponseTextEditPart$1 ||
+                    if (part instanceof ChatResponseTextEditPart ||
                         part instanceof ChatResponseMarkdownWithVulnerabilitiesPart ||
-                        part instanceof ChatResponseDetectedParticipantPart$1 ||
-                        part instanceof ChatResponseWarningPart ||
-                        part instanceof ChatResponseConfirmationPart$1 ||
-                        part instanceof ChatResponseCodeCitationPart$1 ||
+                        part instanceof ChatResponseDetectedParticipantPart ||
+                        part instanceof ChatResponseWarningPart$1 ||
+                        part instanceof ChatResponseConfirmationPart ||
+                        part instanceof ChatResponseCodeCitationPart ||
                         part instanceof ChatResponseMovePart ||
                         part instanceof ChatResponseProgressPart2) {
                         checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
@@ -222,13 +223,29 @@ class ChatAgentResponseStream {
                         const dto = part.task ? ChatTask.from(part) : ChatResponseProgressPart.from(part);
                         _report(dto, part.task);
                     }
+                    else if (part instanceof ChatResponseAnchorPart) {
+                        const dto = ChatResponseAnchorPart$1.from(part);
+                        if (part.resolve) {
+                            checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+                            dto.resolveId = generateUuid();
+                            const cts = ( new CancellationTokenSource());
+                            part.resolve(cts.token)
+                                .then(() => {
+                                const resolvedDto = ChatResponseAnchorPart$1.from(part);
+                                that._proxy.$handleAnchorResolve(that._request.requestId, dto.resolveId, resolvedDto);
+                            })
+                                .then(() => cts.dispose(), () => cts.dispose());
+                            that._sessionDisposables.add(toDisposable(() => cts.dispose(true)));
+                        }
+                        _report(dto);
+                    }
                     else {
                         const dto = ChatResponsePart.from(part, that._commandsConverter, that._sessionDisposables);
                         _report(dto);
                     }
                     return this;
                 },
-            };
+            }));
         }
         return this._apiObject;
     }
@@ -247,6 +264,14 @@ class ExtHostChatAgents2 extends Disposable {
         this._sessionDisposables = this._register(( new DisposableMap()));
         this._completionDisposables = this._register(( new DisposableMap()));
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatAgents2));
+        _commands.registerArgumentProcessor({
+            processArgument: (arg) => {
+                if (isChatViewTitleActionContext(arg)) {
+                    return null;
+                }
+                return arg;
+            }
+        });
     }
     transferActiveChat(newWorkspace) {
         this._proxy.$transferActiveChatSession(newWorkspace);
@@ -280,10 +305,8 @@ class ExtHostChatAgents2 extends Disposable {
         if (!detector) {
             return undefined;
         }
-        const extRequest = ChatAgentRequest.to(request, location);
-        if (request.userSelectedModelId && isProposedApiEnabled(detector.extension, 'chatParticipantAdditions')) {
-            extRequest.userSelectedModel = await this._languageModels.getLanguageModelByIdentifier(detector.extension, request.userSelectedModelId);
-        }
+        const model = await this.getModelForRequest(request, detector.extension);
+        const extRequest = ChatAgentRequest.to(request, location, model);
         return detector.provider.provideParticipantDetection(extRequest, { history }, { participants: options.participants, location: ChatLocation.to(options.location) }, token);
     }
     async _createRequest(requestDto, context) {
@@ -301,6 +324,19 @@ class ExtHostChatAgents2 extends Disposable {
         else ;
         return { request, location, history: convertedHistory };
     }
+    async getModelForRequest(request, extension) {
+        let model;
+        if (request.userSelectedModelId) {
+            model = await this._languageModels.getLanguageModelByIdentifier(extension, request.userSelectedModelId);
+        }
+        if (!model) {
+            model = await this._languageModels.getDefaultLanguageModel(extension);
+            if (!model) {
+                throw ( new Error('Language model unavailable'));
+            }
+        }
+        return model;
+    }
     async $invokeAgent(handle, requestDto, context, token) {
         const agent = this._agents.get(handle);
         if (!agent) {
@@ -323,10 +359,8 @@ class ExtHostChatAgents2 extends Disposable {
                 this._commands.converter,
                 sessionDisposables
             ));
-            const extRequest = ChatAgentRequest.to(request, location);
-            if (request.userSelectedModelId && isProposedApiEnabled(agent.extension, 'chatParticipantAdditions')) {
-                extRequest.userSelectedModel = await this._languageModels.getLanguageModelByIdentifier(agent.extension, request.userSelectedModelId);
-            }
+            const model = await this.getModelForRequest(request, agent.extension);
+            const extRequest = ChatAgentRequest.to(request, location, model);
             const task = agent.invoke(extRequest, { history }, stream.apiObject, token);
             return await raceCancellation(Promise.resolve(task).then((result) => {
                 if (result?.metadata) {
@@ -376,8 +410,7 @@ class ExtHostChatAgents2 extends Disposable {
             const toolReferences = ( h.request.variables.variables
                 .filter(v => v.isTool)
                 .map(ChatLanguageModelToolReference.to));
-            const turn = new ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId);
-            turn.toolReferences = toolReferences;
+            const turn = new ChatRequestTurn(h.request.message, h.request.command, varsWithoutTools, h.request.agentId, toolReferences);
             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));
@@ -534,7 +567,7 @@ class ExtHostChatAgent {
         return {
             ...content,
             icon,
-            message: MarkdownString.from(content.message),
+            message: MarkdownString$1.from(content.message),
         };
     }
     async provideTitle(context, token) {
@@ -576,9 +609,9 @@ class ExtHostChatAgent {
                     themeIcon: this._iconPath instanceof ThemeIcon$1 ? this._iconPath : undefined,
                     hasFollowups: this._followupProvider !== undefined,
                     isSecondary: this._isSecondary,
-                    helpTextPrefix: (!this._helpTextPrefix || typeof this._helpTextPrefix === 'string') ? this._helpTextPrefix : MarkdownString.from(this._helpTextPrefix),
-                    helpTextVariablesPrefix: (!this._helpTextVariablesPrefix || typeof this._helpTextVariablesPrefix === 'string') ? this._helpTextVariablesPrefix : MarkdownString.from(this._helpTextVariablesPrefix),
-                    helpTextPostfix: (!this._helpTextPostfix || typeof this._helpTextPostfix === 'string') ? this._helpTextPostfix : MarkdownString.from(this._helpTextPostfix),
+                    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,
                     supportsSlowVariables: this._supportsSlowReferences,
@@ -726,4 +759,5 @@ class ExtHostChatAgent {
         return this._requestHandler(request, context, response, token);
     }
 }
+
 export { ExtHostChatAgents2 };

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

@@ -2,9 +2,10 @@ import { onUnexpectedExternalError } from '../../../base/common/errors.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatResponseProgressPart, ChatResponseReferencePart } from './extHostTypeConverters.js';
-import { ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseProgressPart as ChatResponseProgressPart$1 } from './extHostTypes.js';
+import { ChatResponseProgressPart as ChatResponseProgressPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1 } from './extHostTypeConverters.js';
+import { ChatResponseProgressPart, ChatResponseReferencePart } from './extHostTypes.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+
 class ExtHostChatVariables {
     static { this._idPool = 0; }
     constructor(mainContext) {
@@ -73,25 +74,25 @@ class ChatVariableResolverResponseStream {
             this._apiObject = {
                 progress(value) {
                     throwIfDone(this.progress);
-                    const part = new ChatResponseProgressPart$1(value);
-                    const dto = ChatResponseProgressPart.from(part);
+                    const part = new ChatResponseProgressPart(value);
+                    const dto = ChatResponseProgressPart$1.from(part);
                     _report(dto);
                     return this;
                 },
                 reference(value) {
                     throwIfDone(this.reference);
-                    const part = new ChatResponseReferencePart$1(value);
-                    const dto = ChatResponseReferencePart.from(part);
+                    const part = new ChatResponseReferencePart(value);
+                    const dto = ChatResponseReferencePart$1.from(part);
                     _report(dto);
                     return this;
                 },
                 push(part) {
                     throwIfDone(this.push);
-                    if (part instanceof ChatResponseReferencePart$1) {
-                        _report(ChatResponseReferencePart.from(part));
+                    if (part instanceof ChatResponseReferencePart) {
+                        _report(ChatResponseReferencePart$1.from(part));
                     }
-                    else if (part instanceof ChatResponseProgressPart$1) {
-                        _report(ChatResponseProgressPart.from(part));
+                    else if (part instanceof ChatResponseProgressPart) {
+                        _report(ChatResponseProgressPart$1.from(part));
                     }
                     return this;
                 }
@@ -100,4 +101,5 @@ class ChatVariableResolverResponseStream {
         return this._apiObject;
     }
 }
+
 export { ExtHostChatVariables };

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

@@ -1,4 +1,5 @@
 import { MainContext } from './extHost.protocol.js';
+
 class ExtHostClipboard {
     constructor(mainContext) {
         const proxy = ( mainContext.getProxy(MainContext.MainThreadClipboard));
@@ -12,4 +13,5 @@ class ExtHostClipboard {
         }));
     }
 }
+
 export { ExtHostClipboard };

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

@@ -1,6 +1,7 @@
 import { Emitter } from '../../../base/common/event.js';
 import { DisposableStore } from '../../../base/common/lifecycle.js';
 import { asWebviewUri, webviewGenericCspSource } from '../../contrib/webview/common/webview.js';
+
 class ExtHostEditorInsets {
     constructor(_proxy, _editors, _remoteInfo) {
         this._proxy = _proxy;
@@ -102,4 +103,5 @@ class ExtHostEditorInsets {
         value?.onDidReceiveMessage.fire(message);
     }
 }
+
 export { ExtHostEditorInsets };

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

@@ -1,6 +1,7 @@
 import { MainContext } from './extHost.protocol.js';
-import { TextEdit } from './extHostTypeConverters.js';
+import { TextEdit, ChatAgentResult, DocumentContextItem } from './extHostTypeConverters.js';
 import { URI } from '../../../base/common/uri.js';
+
 class ExtHostCodeMapper {
     static { this._providerHandlePool = 0; }
     constructor(mainContext) {
@@ -25,10 +26,26 @@ class ExtHostCodeMapper {
             codeBlocks: ( internalRequest.codeBlocks.map(block => {
                 return {
                     code: block.code,
-                    resource: URI.revive(block.resource)
+                    resource: URI.revive(block.resource),
+                    markdownBeforeBlock: block.markdownBeforeBlock
                 };
             })),
-            conversation: internalRequest.conversation
+            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);
         return result ?? null;
@@ -44,4 +61,5 @@ class ExtHostCodeMapper {
         };
     }
 }
+
 export { ExtHostCodeMapper };

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

@@ -1,14 +1,14 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
 import { validateConstraint } from '../../../base/common/types.js';
-import { Position, Range, Selection, CallHierarchyItem, TypeHierarchyItem, Disposable, Location, NotebookRange } from './extHostTypes.js';
-import { Position as Position$1, Range as Range$1, Selection as Selection$1, CallHierarchyItem as CallHierarchyItem$1, TypeHierarchyItem as TypeHierarchyItem$1, TestItem, location, NotebookRange as NotebookRange$1 } from './extHostTypeConverters.js';
+import { Disposable, Position as Position$2, Range as Range$2, Location, NotebookRange, Selection, CallHierarchyItem, TypeHierarchyItem } 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 } from './extHostTypeConverters.js';
 import { cloneAndChange } from '../../../base/common/objects.js';
 import { MainContext } from './extHost.protocol.js';
 import { isNonEmptyArray } from '../../../base/common/arrays.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { revive } from '../../../base/common/marshalling.js';
-import { Range as Range$2 } from '../../../editor/common/core/range.js';
-import { Position as Position$2 } from '../../../editor/common/core/position.js';
+import { Range } from '../../../editor/common/core/range.js';
+import { Position } from '../../../editor/common/core/position.js';
 import { URI } from '../../../base/common/uri.js';
 import { toDisposable } from '../../../base/common/lifecycle.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
@@ -21,6 +21,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';
+
 let ExtHostCommands = class ExtHostCommands {
     #proxy;
     #telemetry;
@@ -46,13 +47,13 @@ let ExtHostCommands = class ExtHostCommands {
             {
                 processArgument(arg) {
                     return cloneAndChange(arg, function (obj) {
-                        if (Range$2.isIRange(obj)) {
+                        if (Range.isIRange(obj)) {
                             return Range$1.to(obj);
                         }
-                        if (Position$2.isIPosition(obj)) {
+                        if (Position.isIPosition(obj)) {
                             return Position$1.to(obj);
                         }
-                        if (Range$2.isIRange(obj.range) && URI.isUri(obj.uri)) {
+                        if (Range.isIRange(obj.range) && URI.isUri(obj.uri)) {
                             return location.to(obj);
                         }
                         if (obj instanceof VSBuffer) {
@@ -124,10 +125,10 @@ let ExtHostCommands = class ExtHostCommands {
         else {
             let hasBuffers = false;
             const toArgs = cloneAndChange(args, function (value) {
-                if (value instanceof Position) {
+                if (value instanceof Position$2) {
                     return Position$1.from(value);
                 }
-                else if (value instanceof Range) {
+                else if (value instanceof Range$2) {
                     return Range$1.from(value);
                 }
                 else if (value instanceof Location) {
@@ -335,13 +336,13 @@ class ApiCommandArgument {
     static { this.Position = ( new ApiCommandArgument(
         'position',
         'A position in a text document',
-        v => Position.isPosition(v),
+        v => Position$2.isPosition(v),
         Position$1.from
     )); }
     static { this.Range = ( new ApiCommandArgument(
         'range',
         'A range in a text document',
-        v => Range.isRange(v),
+        v => Range$2.isRange(v),
         Range$1.from
     )); }
     static { this.Selection = ( new ApiCommandArgument(
@@ -418,4 +419,5 @@ class ApiCommand {
         this.result = result;
     }
 }
+
 export { ApiCommand, ApiCommandArgument, ApiCommandResult, CommandsConverter, ExtHostCommands, IExtHostCommands };

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

@@ -2,12 +2,13 @@ import { asPromise } from '../../../base/common/async.js';
 import { Emitter } from '../../../base/common/event.js';
 import { MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.js';
 import { URI } from '../../../base/common/uri.js';
-import { CommentThreadCollapsibleState as CommentThreadCollapsibleState$1, CommentThreadState as CommentThreadState$1, CommentThreadApplicability as CommentThreadApplicability$1 } from '../../../editor/common/languages.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, pathOrURIToURI } from './extHostTypeConverters.js';
-import { MarkdownString as MarkdownString$1, CommentThreadFocus, CommentThreadCollapsibleState, CommentThreadState, CommentThreadApplicability } from './extHostTypes.js';
+import { Range, MarkdownString as MarkdownString$1, pathOrURIToURI } from './extHostTypeConverters.js';
+import { MarkdownString, CommentThreadFocus, CommentThreadCollapsibleState as CommentThreadCollapsibleState$1, CommentThreadState, CommentThreadApplicability } from './extHostTypes.js';
 import { MainContext } from './extHost.protocol.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+
 function createExtHostComments(mainContext, commands, documents) {
     const proxy = ( mainContext.getProxy(MainContext.MainThreadComments));
     class ExtHostCommentsImpl {
@@ -88,7 +89,7 @@ function createExtHostComments(mainContext, commands, documents) {
                             comment.body = body;
                         }
                         else {
-                            comment.body = new MarkdownString$1(body);
+                            comment.body = new MarkdownString(body);
                         }
                         return comment;
                     }
@@ -130,6 +131,10 @@ function createExtHostComments(mainContext, commands, documents) {
             const commentController = this._commentControllers.get(commentControllerHandle);
             commentController?.$deleteCommentThread(commentThreadHandle);
         }
+        async $updateCommentThread(commentControllerHandle, commentThreadHandle, changes) {
+            const commentController = this._commentControllers.get(commentControllerHandle);
+            commentController?.$updateCommentThread(commentThreadHandle, changes);
+        }
         async $provideCommentingRanges(commentControllerHandle, uriComponents, token) {
             const commentController = this._commentControllers.get(commentControllerHandle);
             if (!commentController || !commentController.commentingRangeProvider) {
@@ -532,7 +537,7 @@ function createExtHostComments(mainContext, commands, documents) {
                 true,
                 editorId
             ));
-            commentThread.collapsibleState = CommentThreadCollapsibleState$1.Expanded;
+            commentThread.collapsibleState = CommentThreadCollapsibleState.Expanded;
             this._threads.set(commentThread.handle, commentThread);
             return commentThread;
         }
@@ -542,6 +547,16 @@ function createExtHostComments(mainContext, commands, documents) {
                 thread.range = Range.to(range);
             }
         }
+        $updateCommentThread(threadHandle, changes) {
+            const thread = this._threads.get(threadHandle);
+            if (!thread) {
+                return;
+            }
+            const modified = (value) => Object.prototype.hasOwnProperty.call(changes, value);
+            if (modified('collapseState')) {
+                thread.collapsibleState = convertToCollapsibleState(changes.collapseState);
+            }
+        }
         $deleteCommentThread(threadHandle) {
             const thread = this._threads.get(threadHandle);
             thread?.dispose();
@@ -573,7 +588,7 @@ function createExtHostComments(mainContext, commands, documents) {
             mode: vscodeComment.mode,
             contextValue: vscodeComment.contextValue,
             uniqueIdInThread: commentUniqueId,
-            body: (typeof vscodeComment.body === 'string') ? vscodeComment.body : MarkdownString.from(vscodeComment.body),
+            body: (typeof vscodeComment.body === 'string') ? vscodeComment.body : MarkdownString$1.from(vscodeComment.body),
             userName: vscodeComment.author.name,
             userIconPath: vscodeComment.author.iconPath,
             label: vscodeComment.label,
@@ -603,13 +618,13 @@ function createExtHostComments(mainContext, commands, documents) {
     function convertToCollapsibleState(kind) {
         if (kind !== undefined) {
             switch (kind) {
-                case CommentThreadCollapsibleState.Expanded:
-                    return CommentThreadCollapsibleState$1.Expanded;
-                case CommentThreadCollapsibleState.Collapsed:
-                    return CommentThreadCollapsibleState$1.Collapsed;
+                case CommentThreadCollapsibleState$1.Expanded:
+                    return CommentThreadCollapsibleState.Expanded;
+                case CommentThreadCollapsibleState$1.Collapsed:
+                    return CommentThreadCollapsibleState.Collapsed;
             }
         }
-        return CommentThreadCollapsibleState$1.Collapsed;
+        return CommentThreadCollapsibleState.Collapsed;
     }
     function convertToState(kind) {
         let resolvedKind;
@@ -646,4 +661,5 @@ function createExtHostComments(mainContext, commands, documents) {
     }
     return ( new ExtHostCommentsImpl());
 }
+
 export { createExtHostComments };

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { mixin, deepClone } from '../../../base/common/objects.js';
+import { deepClone, mixin } from '../../../base/common/objects.js';
 import { Emitter } from '../../../base/common/event.js';
 import { IExtHostWorkspace } from './extHostWorkspace.js';
 import { MainContext } from './extHost.protocol.js';
@@ -12,6 +12,7 @@ import { createDecorator } from '../../../platform/instantiation/common/instanti
 import { IExtHostRpcService } from './extHostRpcService.js';
 import { ILogService } from '../../../platform/log/common/log.service.js';
 import { URI } from '../../../base/common/uri.js';
+
 function lookUp(tree, key) {
     if (key) {
         const parts = key.split('.');
@@ -278,4 +279,5 @@ class ExtHostConfigProvider {
     }
 }
 const IExtHostConfiguration = ( createDecorator('IExtHostConfiguration'));
+
 export { ExtHostConfigProvider, ExtHostConfiguration, IExtHostConfiguration };

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

@@ -3,6 +3,7 @@ import { safeStringify } from '../../../base/common/objects.js';
 import { MainContext } from './extHost.protocol.js';
 import { IExtHostInitDataService } from './extHostInitDataService.js';
 import { IExtHostRpcService } from './extHostRpcService.js';
+
 let AbstractExtHostConsoleForwarder = class AbstractExtHostConsoleForwarder {
     constructor(extHostRpc, initData) {
         this._mainThreadConsole = ( extHostRpc.getProxy(MainContext.MainThreadConsole));
@@ -77,4 +78,5 @@ function safeStringifyArgumentsToArray(args, includeStack) {
         return `Output omitted for an object that cannot be inspected ('${( error.toString())}')`;
     }
 }
+
 export { AbstractExtHostConsoleForwarder };

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

@@ -9,6 +9,7 @@ import { toExtensionData, shouldSerializeBuffersForPostMessage } from './extHost
 import { Cache } from './cache.js';
 import { MainContext } from './extHost.protocol.js';
 import { Disposable } from './extHostTypes.js';
+
 class CustomDocumentStoreEntry {
     constructor(document, _storagePath) {
         this.document = document;
@@ -281,4 +282,5 @@ function hashPath(resource) {
     const str = resource.scheme === Schemas.file || resource.scheme === Schemas.untitled ? resource.fsPath : ( resource.toString());
     return hash(str) + '';
 }
+
 export { ExtHostCustomEditors };