@codingame/monaco-vscode-api 5.2.0 → 6.0.0

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

@@ -9,9 +9,9 @@ import { assertType } from '../../../base/common/types.js';
 import { URI } from '../../../base/common/uri.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
 import { MainContext } from './extHost.protocol.js';
-import { ChatAgentRequest, ChatAgentResult, ChatAgentResolvedVariable, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, ChatLocation, ChatResponsePart, MarkdownString, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFilesPart, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatResponseProgressPart, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseDetectedParticipantPart } from './extHostTypeConverters.js';
-import { ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ThemeIcon, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseProgressPart as ChatResponseProgressPart$1 } from './extHostTypes.js';
-import { InteractiveSessionVoteDirection } from '../../contrib/chat/common/chatService.js';
+import { ChatAgentRequest, ChatAgentResult, ChatAgentValueReference, ChatFollowup, ChatAgentUserActionEvent, ChatAgentCompletionItem, ChatLocation, ChatResponsePart, MarkdownString, ChatResponseMarkdownPart as ChatResponseMarkdownPart$1, ChatResponseMarkdownWithVulnerabilitiesPart as ChatResponseMarkdownWithVulnerabilitiesPart$1, ChatResponseFilesPart, ChatResponseAnchorPart, ChatResponseCommandButtonPart, ChatTask, ChatResponseProgressPart, ChatResponseWarningPart as ChatResponseWarningPart$1, ChatResponseReferencePart, ChatResponseTextEditPart, ChatResponseDetectedParticipantPart, ChatResponseConfirmationPart, ChatTaskResult } from './extHostTypeConverters.js';
+import { LanguageModelError, ChatRequestTurn, ChatResponseTurn, ChatResultFeedbackKind, ChatResponseMarkdownPart, ChatResponseMarkdownWithVulnerabilitiesPart, ChatResponseWarningPart, ChatResponseTextEditPart as ChatResponseTextEditPart$1, ChatResponseDetectedParticipantPart as ChatResponseDetectedParticipantPart$1, ChatResponseConfirmationPart as ChatResponseConfirmationPart$1, ChatResponseReferencePart as ChatResponseReferencePart$1, ThemeIcon, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseProgressPart2, MarkdownString as MarkdownString$1 } from './extHostTypes.js';
+import { ChatAgentVoteDirection } from '../../contrib/chat/common/chatService.js';
 import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 class ChatAgentResponseStream {
     constructor(_extension, _request, _proxy, _commandsConverter, _sessionDisposables) {
@@ -43,11 +43,35 @@ class ChatAgentResponseStream {
                     throw err;
                 }
             }
-            const _report = (progress) => {
+            const _report = (progress, task) => {
                 if (typeof this._firstProgress === 'undefined' && 'content' in progress) {
                     this._firstProgress = this._stopWatch.elapsed();
                 }
-                this._proxy.$handleProgressChunk(this._request.requestId, progress);
+                if (task) {
+                    const progressReporterPromise = this._proxy.$handleProgressChunk(this._request.requestId, progress);
+                    const progressReporter = {
+                        report: (p) => {
+                            progressReporterPromise?.then((handle) => {
+                                if (handle) {
+                                    if (MarkdownString$1.isMarkdownString(p.value)) {
+                                        this._proxy.$handleProgressChunk(this._request.requestId, ChatResponseWarningPart$1.from(p), handle);
+                                    }
+                                    else {
+                                        this._proxy.$handleProgressChunk(this._request.requestId, ChatResponseReferencePart.from(p), handle);
+                                    }
+                                }
+                            });
+                        }
+                    };
+                    Promise.all([progressReporterPromise, task?.(progressReporter)]).then(([handle, res]) => {
+                        if (handle !== undefined && res !== undefined) {
+                            this._proxy.$handleProgressChunk(this._request.requestId, ChatTaskResult.from(res), handle);
+                        }
+                    });
+                }
+                else {
+                    this._proxy.$handleProgressChunk(this._request.requestId, progress);
+                }
             };
             this._apiObject = {
                 markdown(value) {
@@ -88,15 +112,26 @@ class ChatAgentResponseStream {
                     _report(dto);
                     return this;
                 },
-                progress(value) {
+                progress(value, task) {
                     throwIfDone(this.progress);
-                    const part = new ChatResponseProgressPart$1(value);
-                    const dto = ChatResponseProgressPart.from(part);
+                    const part = new ChatResponseProgressPart2(value, task);
+                    const dto = task ? ChatTask.from(part) : ChatResponseProgressPart.from(part);
+                    _report(dto, task);
+                    return this;
+                },
+                warning(value) {
+                    throwIfDone(this.progress);
+                    checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+                    const part = new ChatResponseWarningPart(value);
+                    const dto = ChatResponseWarningPart$1.from(part);
                     _report(dto);
                     return this;
                 },
                 reference(value, iconPath) {
                     throwIfDone(this.reference);
+                    if ('variableName' in value) {
+                        checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+                    }
                     if ('variableName' in value && !value.value) {
                         const matchingVarData = that._request.variables.variables.find(v => v.name === value.variableName);
                         if (matchingVarData) {
@@ -139,9 +174,21 @@ class ChatAgentResponseStream {
                     _report(dto);
                     return this;
                 },
+                confirmation(title, message, data) {
+                    throwIfDone(this.confirmation);
+                    checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+                    const part = new ChatResponseConfirmationPart$1(title, message, data);
+                    const dto = ChatResponseConfirmationPart.from(part);
+                    _report(dto);
+                    return this;
+                },
                 push(part) {
                     throwIfDone(this.push);
-                    if (part instanceof ChatResponseTextEditPart$1 || part instanceof ChatResponseMarkdownWithVulnerabilitiesPart || part instanceof ChatResponseDetectedParticipantPart$1) {
+                    if (part instanceof ChatResponseTextEditPart$1 ||
+                        part instanceof ChatResponseMarkdownWithVulnerabilitiesPart ||
+                        part instanceof ChatResponseDetectedParticipantPart$1 ||
+                        part instanceof ChatResponseWarningPart ||
+                        part instanceof ChatResponseConfirmationPart$1) {
                         checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
                     }
                     if (part instanceof ChatResponseReferencePart$1) {
@@ -160,13 +207,14 @@ class ChatAgentResponseStream {
 }
 class ExtHostChatAgents2 extends Disposable {
     static { this._idPool = 0; }
-    constructor(mainContext, _logService, commands) {
+    constructor(mainContext, _logService, commands, quality) {
         super();
         this._logService = _logService;
         this.commands = commands;
+        this.quality = quality;
         this._agents = ( new Map());
         this._sessionDisposables = this._register(( new DisposableMap()));
-        this._completionDisposables = this._register(( new DisposableStore()));
+        this._completionDisposables = this._register(( new DisposableMap()));
         this._proxy = ( mainContext.getProxy(MainContext.MainThreadChatAgents2));
     }
     transferActiveChat(newWorkspace) {
@@ -174,16 +222,18 @@ class ExtHostChatAgents2 extends Disposable {
     }
     createChatAgent(extension, id, handler) {
         const handle = ExtHostChatAgents2._idPool++;
-        const agent = ( new ExtHostChatAgent(extension, id, this._proxy, handle, handler));
+        const agent = ( new ExtHostChatAgent(extension, this.quality, id, this._proxy, handle, handler));
         this._agents.set(handle, agent);
-        this._proxy.$registerAgent(handle, extension.identifier, id, {}, undefined);
+        if (agent.isAgentEnabled()) {
+            this._proxy.$registerAgent(handle, extension.identifier, id, {}, undefined);
+        }
         return agent.apiAgent;
     }
-    createDynamicChatAgent(extension, id, name, description, handler) {
+    createDynamicChatAgent(extension, id, dynamicProps, handler) {
         const handle = ExtHostChatAgents2._idPool++;
-        const agent = ( new ExtHostChatAgent(extension, id, this._proxy, handle, handler));
+        const agent = ( new ExtHostChatAgent(extension, this.quality, id, this._proxy, handle, handler));
         this._agents.set(handle, agent);
-        this._proxy.$registerAgent(handle, extension.identifier, id, { isSticky: true }, { name, description });
+        this._proxy.$registerAgent(handle, extension.identifier, id, { isSticky: true }, dynamicProps);
         return agent.apiAgent;
     }
     async $invokeAgent(handle, request, context, token) {
@@ -219,11 +269,24 @@ class ExtHostChatAgents2 extends Disposable {
                         return { errorDetails: { message: msg }, timings: stream.timings };
                     }
                 }
-                return { errorDetails: result?.errorDetails, timings: stream.timings, metadata: result?.metadata };
+                let errorDetails;
+                if (result?.errorDetails) {
+                    errorDetails = {
+                        ...result.errorDetails,
+                        responseIsIncomplete: true
+                    };
+                }
+                if (errorDetails?.responseIsRedacted) {
+                    checkProposedApiEnabled(agent.extension, 'chatParticipantPrivate');
+                }
+                return { errorDetails, timings: stream.timings, metadata: result?.metadata };
             }), token);
         }
         catch (e) {
             this._logService.error(e, agent.extension);
+            if (e instanceof LanguageModelError && e.cause) {
+                e = e.cause;
+            }
             return { errorDetails: { message: toErrorMessage(e), responseIsIncomplete: true } };
         }
         finally {
@@ -237,7 +300,7 @@ class ExtHostChatAgents2 extends Disposable {
             const result = agentId === h.request.agentId ?
                 ehResult :
                 { ...ehResult, metadata: undefined };
-            res.push(new ChatRequestTurn(h.request.message, h.request.command, ( h.request.variables.variables.map(ChatAgentResolvedVariable.to)), h.request.agentId));
+            res.push(new ChatRequestTurn(h.request.message, h.request.command, ( h.request.variables.variables.map(ChatAgentValueReference.to)), h.request.agentId));
             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));
         }
@@ -271,10 +334,10 @@ class ExtHostChatAgents2 extends Disposable {
         const ehResult = ChatAgentResult.to(result);
         let kind;
         switch (vote) {
-            case InteractiveSessionVoteDirection.Down:
+            case ChatAgentVoteDirection.Down:
                 kind = ChatResultFeedbackKind.Unhelpful;
                 break;
-            case InteractiveSessionVoteDirection.Up:
+            case ChatAgentVoteDirection.Up:
                 kind = ChatResultFeedbackKind.Helpful;
                 break;
         }
@@ -300,9 +363,17 @@ class ExtHostChatAgents2 extends Disposable {
         if (!agent) {
             return [];
         }
+        let disposables = this._completionDisposables.get(handle);
+        if (disposables) {
+            disposables.clear();
+        }
+        else {
+            disposables = ( new DisposableStore());
+            this._completionDisposables.set(handle, disposables);
+        }
         const items = await agent.invokeCompletionProvider(query, token);
         return ( items.map(
-            (i) => ChatAgentCompletionItem.from(i, this.commands.converter, this._completionDisposables)
+            (i) => ChatAgentCompletionItem.from(i, this.commands.converter, disposables)
         ));
     }
     async $provideWelcomeMessage(handle, location, token) {
@@ -322,8 +393,9 @@ class ExtHostChatAgents2 extends Disposable {
     }
 }
 class ExtHostChatAgent {
-    constructor(extension, id, _proxy, _handle, _requestHandler) {
+    constructor(extension, quality, id, _proxy, _handle, _requestHandler) {
         this.extension = extension;
+        this.quality = quality;
         this.id = id;
         this._proxy = _proxy;
         this._handle = _handle;
@@ -343,6 +415,9 @@ class ExtHostChatAgent {
         }
         return (await this._agentVariableProvider.provider.provideCompletionItems(query, token)) ?? [];
     }
+    isAgentEnabled() {
+        return !(this.quality === 'stable' && !isProposedApiEnabled(this.extension, 'chatParticipantPrivate'));
+    }
     async provideFollowups(result, context, token) {
         if (!this._followupProvider) {
             return [];
@@ -394,8 +469,10 @@ class ExtHostChatAgent {
             }
             updateScheduled = true;
             queueMicrotask(() => {
+                if (!that.isAgentEnabled()) {
+                    return;
+                }
                 this._proxy.$updateAgent(this._handle, {
-                    fullName: this._fullName,
                     icon: !this._iconPath ? undefined :
                         this._iconPath instanceof URI ? this._iconPath :
                             'light' in this._iconPath ? this._iconPath.light :
@@ -409,9 +486,9 @@ class ExtHostChatAgent {
                     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),
-                    sampleRequest: this._sampleRequest,
                     supportIssueReporting: this._supportIssueReporting,
-                    requester: this._requester
+                    requester: this._requester,
+                    supportsSlowVariables: this._supportsSlowReferences,
                 });
                 updateScheduled = false;
             });
@@ -421,15 +498,6 @@ class ExtHostChatAgent {
             get id() {
                 return that.id;
             },
-            get fullName() {
-                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                return that._fullName ?? that.extension.displayName ?? that.extension.name;
-            },
-            set fullName(v) {
-                checkProposedApiEnabled(that.extension, 'defaultChatParticipant');
-                that._fullName = v;
-                updateMetadataSoon();
-            },
             get iconPath() {
                 return that._iconPath;
             },
@@ -496,19 +564,12 @@ class ExtHostChatAgent {
                 that._isSecondary = v;
                 updateMetadataSoon();
             },
-            get sampleRequest() {
-                return that._sampleRequest;
-            },
-            set sampleRequest(v) {
-                that._sampleRequest = v;
-                updateMetadataSoon();
-            },
             get supportIssueReporting() {
-                checkProposedApiEnabled(that.extension, 'chatParticipantAdditions');
+                checkProposedApiEnabled(that.extension, 'chatParticipantPrivate');
                 return that._supportIssueReporting;
             },
             set supportIssueReporting(v) {
-                checkProposedApiEnabled(that.extension, 'chatParticipantAdditions');
+                checkProposedApiEnabled(that.extension, 'chatParticipantPrivate');
                 that._supportIssueReporting = v;
                 updateMetadataSoon();
             },
@@ -522,10 +583,10 @@ class ExtHostChatAgent {
                     if (!v.triggerCharacters.length) {
                         throw ( new Error('triggerCharacters are required'));
                     }
-                    that._proxy.$registerAgentCompletionsProvider(that._handle, v.triggerCharacters);
+                    that._proxy.$registerAgentCompletionsProvider(that._handle, that.id, v.triggerCharacters);
                 }
                 else {
-                    that._proxy.$unregisterAgentCompletionsProvider(that._handle);
+                    that._proxy.$unregisterAgentCompletionsProvider(that._handle, that.id);
                 }
             },
             get participantVariableProvider() {
@@ -551,6 +612,15 @@ class ExtHostChatAgent {
             get requester() {
                 return that._requester;
             },
+            set supportsSlowReferences(v) {
+                checkProposedApiEnabled(that.extension, 'chatParticipantPrivate');
+                that._supportsSlowReferences = v;
+                updateMetadataSoon();
+            },
+            get supportsSlowReferences() {
+                checkProposedApiEnabled(that.extension, 'chatParticipantPrivate');
+                return that._supportsSlowReferences;
+            },
             dispose() {
                 disposed = true;
                 that._followupProvider = undefined;

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

@@ -1,8 +1,9 @@
 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 { ChatVariable, ChatResponseProgressPart, ChatResponseReferencePart } from './extHostTypeConverters.js';
-import { ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseProgressPart as ChatResponseProgressPart$1 } from './extHostTypes.js';
+import { Location as Location$1, ChatLocation, ChatResponseProgressPart, ChatResponseReferencePart } from './extHostTypeConverters.js';
+import { Location, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatResponseProgressPart as ChatResponseProgressPart$1 } from './extHostTypes.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 class ExtHostChatVariables {
     static { this._idPool = 0; }
@@ -20,14 +21,14 @@ class ExtHostChatVariables {
                 checkProposedApiEnabled(item.extension, 'chatParticipantAdditions');
                 const stream = ( new ChatVariableResolverResponseStream(requestId, this._proxy));
                 const value = await item.resolver.resolve2(item.data.name, { prompt: messageText }, stream.apiObject, token);
-                if (value) {
-                    return ( value.map(ChatVariable.from));
+                if (value && value[0]) {
+                    return value[0].value;
                 }
             }
             else {
                 const value = await item.resolver.resolve(item.data.name, { prompt: messageText }, token);
-                if (value) {
-                    return ( value.map(ChatVariable.from));
+                if (value && value[0]) {
+                    return value[0].value;
                 }
             }
         }
@@ -36,15 +37,19 @@ class ExtHostChatVariables {
         }
         return undefined;
     }
-    registerVariableResolver(extension, name, description, resolver) {
+    registerVariableResolver(extension, id, name, userDescription, modelDescription, isSlow, resolver, fullName, themeIconId) {
         const handle = ExtHostChatVariables._idPool++;
-        this._resolver.set(handle, { extension, data: { name, description }, resolver: resolver });
-        this._proxy.$registerVariable(handle, { name, description });
+        const icon = themeIconId ? ThemeIcon.fromId(themeIconId) : undefined;
+        this._resolver.set(handle, { extension, data: { id, name, description: userDescription, modelDescription, icon }, resolver: resolver });
+        this._proxy.$registerVariable(handle, { id, name, description: userDescription, modelDescription, isSlow, fullName, icon });
         return toDisposable(() => {
             this._resolver.delete(handle);
             this._proxy.$unregisterVariable(handle);
         });
     }
+    attachContext(name, value, location) {
+        this._proxy.$attachContext(name, Location.isLocation(value) ? Location$1.from(value) : value, ChatLocation.from(location));
+    }
 }
 class ChatVariableResolverResponseStream {
     constructor(_requestId, _proxy) {

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

@@ -1,6 +1,7 @@
 import { asPromise } from '../../../base/common/async.js';
 import { Emitter } from '../../../base/common/event.js';
 import { MutableDisposable, DisposableStore } from '../../../base/common/lifecycle.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';
 import { ExtensionIdentifierMap } from '../../../platform/extensions/common/extensions.js';
@@ -17,14 +18,14 @@ function createExtHostComments(mainContext, commands, documents) {
             this._commentControllersByExtension = ( new ExtensionIdentifierMap());
             commands.registerArgumentProcessor({
                 processArgument: arg => {
-                    if (arg && arg.$mid === 6 ) {
+                    if (arg && arg.$mid === MarshalledId.CommentController) {
                         const commentController = this._commentControllers.get(arg.handle);
                         if (!commentController) {
                             return arg;
                         }
                         return commentController.value;
                     }
-                    else if (arg && arg.$mid === 7 ) {
+                    else if (arg && arg.$mid === MarshalledId.CommentThread) {
                         const marshalledCommentThread = arg;
                         const commentController = this._commentControllers.get(marshalledCommentThread.commentControlHandle);
                         if (!commentController) {
@@ -36,7 +37,7 @@ function createExtHostComments(mainContext, commands, documents) {
                         }
                         return commentThread.value;
                     }
-                    else if (arg && ((arg.$mid === 9  || arg.$mid === 8) )) {
+                    else if (arg && (arg.$mid === MarshalledId.CommentThreadReply || arg.$mid === MarshalledId.CommentThreadInstance)) {
                         const commentController = this._commentControllers.get(arg.thread.commentControlHandle);
                         if (!commentController) {
                             return arg;
@@ -45,7 +46,7 @@ function createExtHostComments(mainContext, commands, documents) {
                         if (!commentThread) {
                             return arg;
                         }
-                        if (arg.$mid === 8 ) {
+                        if (arg.$mid === MarshalledId.CommentThreadInstance) {
                             return commentThread.value;
                         }
                         return {
@@ -53,7 +54,7 @@ function createExtHostComments(mainContext, commands, documents) {
                             text: arg.text
                         };
                     }
-                    else if (arg && arg.$mid === 10 ) {
+                    else if (arg && arg.$mid === MarshalledId.CommentNode) {
                         const commentController = this._commentControllers.get(arg.thread.commentControlHandle);
                         if (!commentController) {
                             return arg;
@@ -69,7 +70,7 @@ function createExtHostComments(mainContext, commands, documents) {
                         }
                         return comment;
                     }
-                    else if (arg && arg.$mid === 11 ) {
+                    else if (arg && arg.$mid === MarshalledId.CommentThreadNode) {
                         const commentController = this._commentControllers.get(arg.thread.commentControlHandle);
                         if (!commentController) {
                             return arg;
@@ -105,12 +106,12 @@ function createExtHostComments(mainContext, commands, documents) {
             this._commentControllersByExtension.set(extension.identifier, commentControllers);
             return commentController.value;
         }
-        async $createCommentThreadTemplate(commentControllerHandle, uriComponents, range) {
+        async $createCommentThreadTemplate(commentControllerHandle, uriComponents, range, editorId) {
             const commentController = this._commentControllers.get(commentControllerHandle);
             if (!commentController) {
                 return;
             }
-            commentController.$createCommentThreadTemplate(uriComponents, range);
+            commentController.$createCommentThreadTemplate(uriComponents, range, editorId);
         }
         async $setActiveComment(controllerHandle, commentInfo) {
             const commentController = this._commentControllers.get(controllerHandle);
@@ -272,7 +273,7 @@ function createExtHostComments(mainContext, commands, documents) {
         get isDisposed() {
             return this._isDiposed;
         }
-        constructor(commentControllerId, _commentControllerHandle, _id, _uri, _range, _comments, extensionDescription, _isTemplate) {
+        constructor(commentControllerId, _commentControllerHandle, _id, _uri, _range, _comments, extensionDescription, _isTemplate, editorId) {
             this._commentControllerHandle = _commentControllerHandle;
             this._id = _id;
             this._uri = _uri;
@@ -292,7 +293,7 @@ function createExtHostComments(mainContext, commands, documents) {
             if (this._id === undefined) {
                 this._id = `${commentControllerId}.${this.handle}`;
             }
-            proxy.$createCommentThread(_commentControllerHandle, this.handle, this._id, this._uri, Range.from(this._range), extensionDescription.identifier, this._isTemplate);
+            proxy.$createCommentThread(_commentControllerHandle, this.handle, this._id, this._uri, Range.from(this._range), extensionDescription.identifier, this._isTemplate, editorId);
             this._localDisposables = [];
             this._isDiposed = false;
             this._localDisposables.push(this.onDidUpdateCommentThread(() => {
@@ -492,7 +493,7 @@ function createExtHostComments(mainContext, commands, documents) {
                 this._activeThread = thread;
             }
         }
-        $createCommentThreadTemplate(uriComponents, range) {
+        $createCommentThreadTemplate(uriComponents, range, editorId) {
             const commentThread = ( new ExtHostCommentThread(
                 this.id,
                 this.handle,
@@ -501,7 +502,8 @@ function createExtHostComments(mainContext, commands, documents) {
                 Range.to(range),
                 [],
                 this._extension,
-                true
+                true,
+                editorId
             ));
             commentThread.collapsibleState = CommentThreadCollapsibleState.Expanded;
             this._threads.set(commentThread.handle, commentThread);

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

@@ -3,9 +3,10 @@ import { mixin, deepClone } from '../../../base/common/objects.js';
 import { Emitter } from '../../../base/common/event.js';
 import { IExtHostWorkspace } from './extHostWorkspace.js';
 import { MainContext } from './extHost.protocol.js';
-import { ConfigurationTarget } from './extHostTypes.js';
+import { ConfigurationTarget as ConfigurationTarget$1 } from './extHostTypes.js';
+import { ConfigurationTarget } from '../../../platform/configuration/common/configuration.js';
 import { Configuration as Configuration$1, ConfigurationChangeEvent } from '../../../platform/configuration/common/configurationModels.js';
-import { OVERRIDE_PROPERTY_REGEX } from '../../../platform/configuration/common/configurationRegistry.js';
+import { OVERRIDE_PROPERTY_REGEX, ConfigurationScope } from '../../../platform/configuration/common/configurationRegistry.js';
 import { isObject } from '../../../base/common/types.js';
 import { Barrier } from '../../../base/common/async.js';
 import { createDecorator } from '../../../platform/instantiation/common/instantiation.js';
@@ -114,12 +115,12 @@ class ExtHostConfigProvider {
                 return null;
             }
             if (typeof arg === 'boolean') {
-                return arg ? 2  : 5 ;
+                return arg ? ConfigurationTarget.USER : ConfigurationTarget.WORKSPACE;
             }
             switch (arg) {
-                case ConfigurationTarget.Global: return 2 ;
-                case ConfigurationTarget.Workspace: return 5 ;
-                case ConfigurationTarget.WorkspaceFolder: return 6 ;
+                case ConfigurationTarget$1.Global: return ConfigurationTarget.USER;
+                case ConfigurationTarget$1.Workspace: return ConfigurationTarget.WORKSPACE;
+                case ConfigurationTarget$1.WorkspaceFolder: return ConfigurationTarget.WORKSPACE_FOLDER;
             }
         }
         const result = {
@@ -246,15 +247,15 @@ class ExtHostConfigProvider {
         return readonlyProxy(result);
     }
     _validateConfigurationAccess(key, overrides, extensionId) {
-        const scope = OVERRIDE_PROPERTY_REGEX.test(key) ? 4  : this._configurationScopes.get(key);
+        const scope = OVERRIDE_PROPERTY_REGEX.test(key) ? ConfigurationScope.RESOURCE : this._configurationScopes.get(key);
         const extensionIdText = extensionId ? `[${extensionId.value}] ` : '';
-        if (4  === scope) {
+        if (ConfigurationScope.RESOURCE === scope) {
             if (typeof overrides?.resource === 'undefined') {
                 this._logService.warn(`${extensionIdText}Accessing a resource scoped configuration without providing a resource is not expected. To get the effective value for '${key}', provide the URI of a resource or 'null' for any resource.`);
             }
             return;
         }
-        if (3  === scope) {
+        if (ConfigurationScope.WINDOW === scope) {
             if (overrides?.resource) {
                 this._logService.warn(`${extensionIdText}Accessing a window scoped configuration for a resource is not expected. To associate '${key}' to a resource, define its scope to 'resource' in configuration contributions in 'package.json'.`);
             }

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

@@ -85,24 +85,29 @@ class CustomDocumentStore {
         return `${viewType}@@@${resource}`;
     }
 }
+var CustomEditorType;
+( (function(CustomEditorType) {
+    CustomEditorType[CustomEditorType["Text"] = 0] = "Text";
+    CustomEditorType[CustomEditorType["Custom"] = 1] = "Custom";
+})(CustomEditorType || (CustomEditorType = {})));
 class EditorProviderStore {
     constructor() {
         this._providers = ( new Map());
     }
     addTextProvider(viewType, extension, provider) {
-        return this.add(0 , viewType, extension, provider);
+        return this.add(viewType, { type: CustomEditorType.Text, extension, provider });
     }
     addCustomProvider(viewType, extension, provider) {
-        return this.add(1 , viewType, extension, provider);
+        return this.add(viewType, { type: CustomEditorType.Custom, extension, provider });
     }
     get(viewType) {
         return this._providers.get(viewType);
     }
-    add(type, viewType, extension, provider) {
+    add(viewType, entry) {
         if (( this._providers.has(viewType))) {
             throw ( new Error(`Provider for viewType:${viewType} already registered`));
         }
-        this._providers.set(viewType, { type, extension, provider });
+        this._providers.set(viewType, entry);
         return new Disposable(() => this._providers.delete(viewType));
     }
 }
@@ -149,7 +154,7 @@ class ExtHostCustomEditors {
         if (!entry) {
             throw ( new Error(`No provider found for '${viewType}'`));
         }
-        if (entry.type !== 1 ) {
+        if (entry.type !== CustomEditorType.Custom) {
             throw ( new Error(`Invalid provide type for '${viewType}'`));
         }
         const revivedResource = URI.revive(resource);
@@ -166,7 +171,7 @@ class ExtHostCustomEditors {
         if (!entry) {
             throw ( new Error(`No provider found for '${viewType}'`));
         }
-        if (entry.type !== 1 ) {
+        if (entry.type !== CustomEditorType.Custom) {
             throw ( new Error(`Invalid provider type for '${viewType}'`));
         }
         const revivedResource = URI.revive(resource);
@@ -184,11 +189,11 @@ class ExtHostCustomEditors {
         const panel = this._extHostWebviewPanels.createNewWebviewPanel(handle, viewType, initData.title, viewColumn, initData.options, webview, initData.active);
         const revivedResource = URI.revive(resource);
         switch (entry.type) {
-            case 1 : {
+            case CustomEditorType.Custom: {
                 const { document } = this.getCustomDocumentEntry(viewType, revivedResource);
                 return entry.provider.resolveCustomEditor(document, panel, cancellation);
             }
-            case 0 : {
+            case CustomEditorType.Text: {
                 const document = this._extHostDocuments.getDocument(revivedResource);
                 return entry.provider.resolveCustomTextEditor(document, panel, cancellation);
             }

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

@@ -11,6 +11,7 @@ import { IExtHostRpcService } from './extHostRpcService.js';
 import { SourceBreakpoint, DebugConsoleMode, Disposable, setBreakpointId, FunctionBreakpoint, Location, Position, DebugAdapterExecutable, DebugAdapterServer, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation, ThemeIcon as ThemeIcon$1, DataBreakpoint, DebugThread, DebugStackFrame } from './extHostTypes.js';
 import { IExtHostWorkspace } from './extHostWorkspace.js';
 import { AbstractDebugAdapter } from '../../contrib/debug/common/abstractDebugAdapter.js';
+import { DebugVisualizationType } from '../../contrib/debug/common/debug.js';
 import { convertToVSCPaths, convertToDAPaths, isDebuggerMainContribution } from '../../contrib/debug/common/debugUtils.js';
 import { IExtHostConfiguration } from './extHostConfiguration.js';
 import { IExtHostVariableResolverProvider } from './extHostVariableResolverService.js';
@@ -18,6 +19,7 @@ import { toDisposable } from '../../../base/common/lifecycle.js';
 import { ThemeIcon } from '../../../base/common/themables.js';
 import { IExtHostCommands } from './extHostCommands.js';
 import { DebugTreeItem } from './extHostTypeConverters.js';
+import { coalesce } from '../../../base/common/arrays.js';
 const IExtHostDebugService = ( createDecorator('IExtHostDebugService'));
 let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
     get onDidStartDebugSession() { return this._onDidStartDebugSession.event; }
@@ -768,7 +770,7 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
         ));
         return Promise.race([
             Promise.all(promises).then(result => {
-                const trackers = result.filter(t => !!t);
+                const trackers = coalesce(result);
                 if (trackers.length > 0) {
                     return ( new MultiTracker(trackers));
                 }
@@ -853,10 +855,10 @@ let ExtHostDebugServiceBase = class ExtHostDebugServiceBase {
             return undefined;
         }
         if ('title' in viz && 'command' in viz) {
-            return { type: 0  };
+            return { type: DebugVisualizationType.Command };
         }
         if ('treeId' in viz) {
-            return { type: 1 , id: `${extensionId}\0${viz.treeId}` };
+            return { type: DebugVisualizationType.Tree, id: `${extensionId}\0${viz.treeId}` };
         }
         throw ( new Error('Unsupported debug visualization type'));
     }