@codingame/monaco-vscode-api 9.0.2 → 10.0.0

package/vscode/src/vs/workbench/api/common/extHost.common.services.js

@@ -1,4 +1,4 @@
-import { registerSingleton, InstantiationType } from '../../../platform/instantiation/common/extensions.js';
+import { registerSingleton } from '../../../platform/instantiation/common/extensions.js';
 import { ExtHostOutputService, IExtHostOutputService } from './extHostOutput.js';
 import { ExtHostWorkspace, IExtHostWorkspace } from './extHostWorkspace.js';
 import { ExtHostDecorations, IExtHostDecorations } from './extHostDecorations.js';
@@ -27,30 +27,30 @@ import { ExtHostAuthentication, IExtHostAuthentication } from './extHostAuthenti
 import { ExtHostLanguageModels, IExtHostLanguageModels } from './extHostLanguageModels.js';
 import { ExtHostTerminalShellIntegration, IExtHostTerminalShellIntegration } from './extHostTerminalShellIntegration.js';
 import { ExtHostTesting, IExtHostTesting } from './extHostTesting.js';
-registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, InstantiationType.Delayed);
-registerSingleton(ILoggerService, ExtHostLoggerService, InstantiationType.Delayed);
-registerSingleton(IExtHostApiDeprecationService, ExtHostApiDeprecationService, InstantiationType.Delayed);
-registerSingleton(IExtHostCommands, ExtHostCommands, InstantiationType.Eager);
-registerSingleton(IExtHostAuthentication, ExtHostAuthentication, InstantiationType.Eager);
-registerSingleton(IExtHostLanguageModels, ExtHostLanguageModels, InstantiationType.Eager);
-registerSingleton(IExtHostConfiguration, ExtHostConfiguration, InstantiationType.Eager);
-registerSingleton(IExtHostConsumerFileSystem, ExtHostConsumerFileSystem, InstantiationType.Eager);
-registerSingleton(IExtHostTesting, ExtHostTesting, InstantiationType.Eager);
-registerSingleton(IExtHostDebugService, WorkerExtHostDebugService, InstantiationType.Eager);
-registerSingleton(IExtHostDecorations, ExtHostDecorations, InstantiationType.Eager);
-registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors, InstantiationType.Eager);
-registerSingleton(IExtHostManagedSockets, ExtHostManagedSockets, InstantiationType.Eager);
-registerSingleton(IExtHostFileSystemInfo, ExtHostFileSystemInfo, InstantiationType.Eager);
-registerSingleton(IExtHostOutputService, ExtHostOutputService, InstantiationType.Delayed);
-registerSingleton(IExtHostSearch, ExtHostSearch, InstantiationType.Eager);
-registerSingleton(IExtHostStorage, ExtHostStorage, InstantiationType.Eager);
-registerSingleton(IExtHostTask, WorkerExtHostTask, InstantiationType.Eager);
-registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService, InstantiationType.Eager);
-registerSingleton(IExtHostTerminalShellIntegration, ExtHostTerminalShellIntegration, InstantiationType.Eager);
-registerSingleton(IExtHostTunnelService, ExtHostTunnelService, InstantiationType.Eager);
-registerSingleton(IExtHostWindow, ExtHostWindow, InstantiationType.Eager);
-registerSingleton(IExtHostWorkspace, ExtHostWorkspace, InstantiationType.Eager);
-registerSingleton(IExtHostSecretState, ExtHostSecretState, InstantiationType.Eager);
-registerSingleton(IExtHostTelemetry, ExtHostTelemetry, InstantiationType.Eager);
-registerSingleton(IExtHostEditorTabs, ExtHostEditorTabs, InstantiationType.Eager);
-registerSingleton(IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService, InstantiationType.Eager);
+registerSingleton(IExtHostLocalizationService, ExtHostLocalizationService, 1 );
+registerSingleton(ILoggerService, ExtHostLoggerService, 1 );
+registerSingleton(IExtHostApiDeprecationService, ExtHostApiDeprecationService, 1 );
+registerSingleton(IExtHostCommands, ExtHostCommands, 0 );
+registerSingleton(IExtHostAuthentication, ExtHostAuthentication, 0 );
+registerSingleton(IExtHostLanguageModels, ExtHostLanguageModels, 0 );
+registerSingleton(IExtHostConfiguration, ExtHostConfiguration, 0 );
+registerSingleton(IExtHostConsumerFileSystem, ExtHostConsumerFileSystem, 0 );
+registerSingleton(IExtHostTesting, ExtHostTesting, 0 );
+registerSingleton(IExtHostDebugService, WorkerExtHostDebugService, 0 );
+registerSingleton(IExtHostDecorations, ExtHostDecorations, 0 );
+registerSingleton(IExtHostDocumentsAndEditors, ExtHostDocumentsAndEditors, 0 );
+registerSingleton(IExtHostManagedSockets, ExtHostManagedSockets, 0 );
+registerSingleton(IExtHostFileSystemInfo, ExtHostFileSystemInfo, 0 );
+registerSingleton(IExtHostOutputService, ExtHostOutputService, 1 );
+registerSingleton(IExtHostSearch, ExtHostSearch, 0 );
+registerSingleton(IExtHostStorage, ExtHostStorage, 0 );
+registerSingleton(IExtHostTask, WorkerExtHostTask, 0 );
+registerSingleton(IExtHostTerminalService, WorkerExtHostTerminalService, 0 );
+registerSingleton(IExtHostTerminalShellIntegration, ExtHostTerminalShellIntegration, 0 );
+registerSingleton(IExtHostTunnelService, ExtHostTunnelService, 0 );
+registerSingleton(IExtHostWindow, ExtHostWindow, 0 );
+registerSingleton(IExtHostWorkspace, ExtHostWorkspace, 0 );
+registerSingleton(IExtHostSecretState, ExtHostSecretState, 0 );
+registerSingleton(IExtHostTelemetry, ExtHostTelemetry, 0 );
+registerSingleton(IExtHostEditorTabs, ExtHostEditorTabs, 0 );
+registerSingleton(IExtHostVariableResolverProvider, ExtHostVariableResolverProviderService, 0 );

package/vscode/src/vs/workbench/api/common/extHost.protocol.js

@@ -6,44 +6,6 @@ var TextEditorRevealType;
     TextEditorRevealType[TextEditorRevealType["InCenterIfOutsideViewport"] = 2] = "InCenterIfOutsideViewport";
     TextEditorRevealType[TextEditorRevealType["AtTop"] = 3] = "AtTop";
 })(TextEditorRevealType || (TextEditorRevealType = {})));
-var TabInputKind;
-( (function(TabInputKind) {
-    TabInputKind[TabInputKind["UnknownInput"] = 0] = "UnknownInput";
-    TabInputKind[TabInputKind["TextInput"] = 1] = "TextInput";
-    TabInputKind[TabInputKind["TextDiffInput"] = 2] = "TextDiffInput";
-    TabInputKind[TabInputKind["TextMergeInput"] = 3] = "TextMergeInput";
-    TabInputKind[TabInputKind["NotebookInput"] = 4] = "NotebookInput";
-    TabInputKind[TabInputKind["NotebookDiffInput"] = 5] = "NotebookDiffInput";
-    TabInputKind[TabInputKind["CustomEditorInput"] = 6] = "CustomEditorInput";
-    TabInputKind[TabInputKind["WebviewEditorInput"] = 7] = "WebviewEditorInput";
-    TabInputKind[TabInputKind["TerminalEditorInput"] = 8] = "TerminalEditorInput";
-    TabInputKind[TabInputKind["InteractiveEditorInput"] = 9] = "InteractiveEditorInput";
-    TabInputKind[TabInputKind["ChatEditorInput"] = 10] = "ChatEditorInput";
-    TabInputKind[TabInputKind["MultiDiffEditorInput"] = 11] = "MultiDiffEditorInput";
-})(TabInputKind || (TabInputKind = {})));
-var TabModelOperationKind;
-( (function(TabModelOperationKind) {
-    TabModelOperationKind[TabModelOperationKind["TAB_OPEN"] = 0] = "TAB_OPEN";
-    TabModelOperationKind[TabModelOperationKind["TAB_CLOSE"] = 1] = "TAB_CLOSE";
-    TabModelOperationKind[TabModelOperationKind["TAB_UPDATE"] = 2] = "TAB_UPDATE";
-    TabModelOperationKind[TabModelOperationKind["TAB_MOVE"] = 3] = "TAB_MOVE";
-})(TabModelOperationKind || (TabModelOperationKind = {})));
-var WebviewMessageArrayBufferViewType;
-( (function(WebviewMessageArrayBufferViewType) {
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["Int8Array"] = 1] = "Int8Array";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["Uint8Array"] = 2] = "Uint8Array";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["Uint8ClampedArray"] = 3] = "Uint8ClampedArray";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["Int16Array"] = 4] = "Int16Array";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["Uint16Array"] = 5] = "Uint16Array";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["Int32Array"] = 6] = "Int32Array";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["Uint32Array"] = 7] = "Uint32Array";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["Float32Array"] = 8] = "Float32Array";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["Float64Array"] = 9] = "Float64Array";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["BigInt64Array"] = 10] = "BigInt64Array";
-    WebviewMessageArrayBufferViewType[WebviewMessageArrayBufferViewType["BigUint64Array"] = 11] = "BigUint64Array";
-})(
-    WebviewMessageArrayBufferViewType || (WebviewMessageArrayBufferViewType = {})
-));
 var NotebookEditorRevealType;
 ( (function(NotebookEditorRevealType) {
     NotebookEditorRevealType[NotebookEditorRevealType["Default"] = 0] = "Default";
@@ -58,38 +20,13 @@ var CandidatePortSource;
     CandidatePortSource[CandidatePortSource["Output"] = 2] = "Output";
     CandidatePortSource[CandidatePortSource["Hybrid"] = 3] = "Hybrid";
 })(CandidatePortSource || (CandidatePortSource = {})));
-var ISuggestDataDtoField;
-( (function(ISuggestDataDtoField) {
-    ISuggestDataDtoField["label"] = "a";
-    ISuggestDataDtoField["kind"] = "b";
-    ISuggestDataDtoField["detail"] = "c";
-    ISuggestDataDtoField["documentation"] = "d";
-    ISuggestDataDtoField["sortText"] = "e";
-    ISuggestDataDtoField["filterText"] = "f";
-    ISuggestDataDtoField["preselect"] = "g";
-    ISuggestDataDtoField["insertText"] = "h";
-    ISuggestDataDtoField["insertTextRules"] = "i";
-    ISuggestDataDtoField["range"] = "j";
-    ISuggestDataDtoField["commitCharacters"] = "k";
-    ISuggestDataDtoField["additionalTextEdits"] = "l";
-    ISuggestDataDtoField["kindModifier"] = "m";
-    ISuggestDataDtoField["commandIdent"] = "n";
-    ISuggestDataDtoField["commandId"] = "o";
-    ISuggestDataDtoField["commandArguments"] = "p";
-})(ISuggestDataDtoField || (ISuggestDataDtoField = {})));
-var ISuggestResultDtoField;
-( (function(ISuggestResultDtoField) {
-    ISuggestResultDtoField["defaultRanges"] = "a";
-    ISuggestResultDtoField["completions"] = "b";
-    ISuggestResultDtoField["isIncomplete"] = "c";
-    ISuggestResultDtoField["duration"] = "d";
-})(ISuggestResultDtoField || (ISuggestResultDtoField = {})));
 const MainContext = {
     MainThreadAuthentication: ( createProxyIdentifier('MainThreadAuthentication')),
     MainThreadBulkEdits: ( createProxyIdentifier('MainThreadBulkEdits')),
     MainThreadLanguageModels: ( createProxyIdentifier('MainThreadLanguageModels')),
     MainThreadEmbeddings: ( createProxyIdentifier('MainThreadEmbeddings')),
     MainThreadChatAgents2: ( createProxyIdentifier('MainThreadChatAgents2')),
+    MainThreadCodeMapper: ( createProxyIdentifier('MainThreadCodeMapper')),
     MainThreadChatVariables: ( createProxyIdentifier('MainThreadChatVariables')),
     MainThreadLanguageModelTools: ( createProxyIdentifier('MainThreadChatSkills')),
     MainThreadClipboard: ( createProxyIdentifier('MainThreadClipboard')),
@@ -157,6 +94,7 @@ const MainContext = {
     MainThreadAiEmbeddingVector: ( createProxyIdentifier('MainThreadAiEmbeddingVector'))
 };
 const ExtHostContext = {
+    ExtHostCodeMapper: ( createProxyIdentifier('ExtHostCodeMapper')),
     ExtHostCommands: ( createProxyIdentifier('ExtHostCommands')),
     ExtHostConfiguration: ( createProxyIdentifier('ExtHostConfiguration')),
     ExtHostDiagnostics: ( createProxyIdentifier('ExtHostDiagnostics')),
@@ -225,4 +163,4 @@ const ExtHostContext = {
     ExtHostTelemetry: ( createProxyIdentifier('ExtHostTelemetry')),
     ExtHostLocalization: ( createProxyIdentifier('ExtHostLocalization'))
 };
-export { CandidatePortSource, ExtHostContext, ISuggestDataDtoField, ISuggestResultDtoField, MainContext, NotebookEditorRevealType, TabInputKind, TabModelOperationKind, TextEditorRevealType, WebviewMessageArrayBufferViewType };
+export { CandidatePortSource, ExtHostContext, MainContext, NotebookEditorRevealType, TextEditorRevealType };

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from '../../../../../../external/tslib/tslib.es6.js';
-import { Emitter } from '../../../base/common/event.js';
+import { Emitter, Event } from '../../../base/common/event.js';
 import { MainContext } from './extHost.protocol.js';
 import { Disposable } from './extHostTypes.js';
 import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
@@ -11,10 +11,15 @@ let ExtHostAuthentication = class ExtHostAuthentication {
     constructor(extHostRpc) {
         this._authenticationProviders = ( new Map());
         this._onDidChangeSessions = ( new Emitter());
-        this.onDidChangeSessions = this._onDidChangeSessions.event;
         this._getSessionTaskSingler = ( new TaskSingler());
         this._proxy = ( extHostRpc.getProxy(MainContext.MainThreadAuthentication));
     }
+    getExtensionScopedSessionsEvent(extensionId) {
+        const normalizedExtensionId = extensionId.toLowerCase();
+        return Event.chain(this._onDidChangeSessions.event, ($) => ( $
+            .filter(e => !e.extensionIdFilter || e.extensionIdFilter.includes(normalizedExtensionId))
+            .map(e => ({ provider: e.provider }))));
+    }
     async getSession(requestingExtension, providerId, scopes, options = {}) {
         const extensionId = ExtensionIdentifier.toKey(requestingExtension.identifier);
         const sortedScopes = [...scopes].sort().join(' ');
@@ -69,9 +74,9 @@ let ExtHostAuthentication = class ExtHostAuthentication {
         }
         throw ( new Error(`Unable to find authentication provider with handle: ${providerId}`));
     }
-    $onDidChangeAuthenticationSessions(id, label) {
+    $onDidChangeAuthenticationSessions(id, label, extensionIdFilter) {
         if (!id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
-            this._onDidChangeSessions.fire({ provider: { id, label } });
+            this._onDidChangeSessions.fire({ provider: { id, label }, extensionIdFilter });
         }
         return Promise.resolve();
     }

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

@@ -6,15 +6,16 @@ import { Iterable } from '../../../base/common/iterator.js';
 import { Disposable, DisposableMap, toDisposable, 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 { ExtensionIdentifier } from '../../../platform/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, 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, ChatResponseReferencePart as ChatResponseReferencePart$1, ChatRequestNotebookData, ChatRequestTurn, ChatResultFeedbackKind, ChatResponseFileTreePart, ChatResponseAnchorPart as ChatResponseAnchorPart$1, ChatResponseCommandButtonPart as ChatResponseCommandButtonPart$1, ChatResponseProgressPart2, ThemeIcon, MarkdownString as MarkdownString$1 } from './extHostTypes.js';
 import { ChatAgentLocation } from '../../contrib/chat/common/chatAgents.js';
 import { ChatAgentVoteDirection } from '../../contrib/chat/common/chatService.js';
-import { checkProposedApiEnabled, isProposedApiEnabled } from '../../services/extensions/common/extensions.js';
+import { isProposedApiEnabled, checkProposedApiEnabled } 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';
 class ChatAgentResponseStream {
     constructor(_extension, _request, _proxy, _commandsConverter, _sessionDisposables) {
         this._extension = _extension;
@@ -93,6 +94,14 @@ class ChatAgentResponseStream {
                     _report(dto);
                     return this;
                 },
+                codeblockUri(value) {
+                    throwIfDone(this.codeblockUri);
+                    checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
+                    const part = new ChatResponseCodeblockUriPart$1(value);
+                    const dto = ChatResponseCodeblockUriPart.from(part);
+                    _report(dto);
+                    return this;
+                },
                 filetree(value, baseUri) {
                     throwIfDone(this.filetree);
                     const part = new ChatResponseFileTreePart(value, baseUri);
@@ -202,12 +211,17 @@ class ChatAgentResponseStream {
                         part instanceof ChatResponseWarningPart ||
                         part instanceof ChatResponseConfirmationPart$1 ||
                         part instanceof ChatResponseCodeCitationPart$1 ||
-                        part instanceof ChatResponseMovePart) {
+                        part instanceof ChatResponseMovePart ||
+                        part instanceof ChatResponseProgressPart2) {
                         checkProposedApiEnabled(that._extension, 'chatParticipantAdditions');
                     }
                     if (part instanceof ChatResponseReferencePart$1) {
                         this.reference2(part.value, part.iconPath, part.options);
                     }
+                    else if (part instanceof ChatResponseProgressPart2) {
+                        const dto = part.task ? ChatTask.from(part) : ChatResponseProgressPart.from(part);
+                        _report(dto, part.task);
+                    }
                     else {
                         const dto = ChatResponsePart.from(part, that._commandsConverter, that._sessionDisposables);
                         _report(dto);
@@ -222,11 +236,12 @@ class ChatAgentResponseStream {
 class ExtHostChatAgents2 extends Disposable {
     static { this._idPool = 0; }
     static { this._participantDetectionProviderIdPool = 0; }
-    constructor(mainContext, _logService, _commands, _documents) {
+    constructor(mainContext, _logService, _commands, _documents, _languageModels) {
         super();
         this._logService = _logService;
         this._commands = _commands;
         this._documents = _documents;
+        this._languageModels = _languageModels;
         this._agents = ( new Map());
         this._participantDetectionProviders = ( new Map());
         this._sessionDisposables = this._register(( new DisposableMap()));
@@ -250,9 +265,9 @@ class ExtHostChatAgents2 extends Disposable {
         this._proxy.$registerAgent(handle, extension.identifier, id, { isSticky: true }, dynamicProps);
         return agent.apiAgent;
     }
-    registerChatParticipantDetectionProvider(provider) {
+    registerChatParticipantDetectionProvider(extension, provider) {
         const handle = ExtHostChatAgents2._participantDetectionProviderIdPool++;
-        this._participantDetectionProviders.set(handle, provider);
+        this._participantDetectionProviders.set(handle, ( new ExtHostParticipantDetector(extension, provider)));
         this._proxy.$registerChatParticipantDetectionProvider(handle);
         return toDisposable(() => {
             this._participantDetectionProviders.delete(handle);
@@ -261,11 +276,15 @@ class ExtHostChatAgents2 extends Disposable {
     }
     async $detectChatParticipant(handle, requestDto, context, options, token) {
         const { request, location, history } = await this._createRequest(requestDto, context);
-        const provider = this._participantDetectionProviders.get(handle);
-        if (!provider) {
+        const detector = this._participantDetectionProviders.get(handle);
+        if (!detector) {
             return undefined;
         }
-        return provider.provideParticipantDetection(ChatAgentRequest.to(request, location), { history }, { participants: options.participants, location: ChatLocation.to(options.location) }, token);
+        const extRequest = ChatAgentRequest.to(request, location);
+        if (request.userSelectedModelId && isProposedApiEnabled(detector.extension, 'chatParticipantAdditions')) {
+            extRequest.userSelectedModel = await this._languageModels.getLanguageModelByIdentifier(detector.extension, request.userSelectedModelId);
+        }
+        return detector.provider.provideParticipantDetection(extRequest, { history }, { participants: options.participants, location: ChatLocation.to(options.location) }, token);
     }
     async _createRequest(requestDto, context) {
         const request = revive(requestDto);
@@ -304,7 +323,11 @@ class ExtHostChatAgents2 extends Disposable {
                 this._commands.converter,
                 sessionDisposables
             ));
-            const task = agent.invoke(ChatAgentRequest.to(request, location), { history }, stream.apiObject, token);
+            const extRequest = ChatAgentRequest.to(request, location);
+            if (request.userSelectedModelId && isProposedApiEnabled(agent.extension, 'chatParticipantAdditions')) {
+                extRequest.userSelectedModel = await this._languageModels.getLanguageModelByIdentifier(agent.extension, request.userSelectedModelId);
+            }
+            const task = agent.invoke(extRequest, { history }, stream.apiObject, token);
             return await raceCancellation(Promise.resolve(task).then((result) => {
                 if (result?.metadata) {
                     try {
@@ -435,12 +458,12 @@ class ExtHostChatAgents2 extends Disposable {
             (i) => ChatAgentCompletionItem.from(i, this._commands.converter, disposables)
         ));
     }
-    async $provideWelcomeMessage(handle, location, token) {
+    async $provideWelcomeMessage(handle, token) {
         const agent = this._agents.get(handle);
         if (!agent) {
             return;
         }
-        return await agent.provideWelcomeMessage(ChatLocation.to(location), token);
+        return await agent.provideWelcomeMessage(token);
     }
     async $provideChatTitle(handle, context, token) {
         const agent = this._agents.get(handle);
@@ -459,6 +482,12 @@ class ExtHostChatAgents2 extends Disposable {
             .map(f => ChatFollowup.from(f, undefined)));
     }
 }
+class ExtHostParticipantDetector {
+    constructor(extension, provider) {
+        this.extension = extension;
+        this.provider = provider;
+    }
+}
 class ExtHostChatAgent {
     constructor(extension, id, _proxy, _handle, _requestHandler) {
         this.extension = extension;
@@ -493,22 +522,20 @@ class ExtHostChatAgent {
             .filter(f => !(f && 'commandId' in f))
             .filter(f => !(f && 'message' in f));
     }
-    async provideWelcomeMessage(location, token) {
-        if (!this._welcomeMessageProvider) {
-            return [];
+    async provideWelcomeMessage(token) {
+        if (!this._welcomeMessageProvider?.provideWelcomeMessage) {
+            return undefined;
         }
-        const content = await this._welcomeMessageProvider.provideWelcomeMessage(location, token);
-        if (!content) {
-            return [];
+        const content = await this._welcomeMessageProvider.provideWelcomeMessage(token);
+        const icon = content?.icon;
+        if (!content || !ThemeIcon.isThemeIcon(icon)) {
+            return undefined;
         }
-        return ( content.map(item => {
-            if (typeof item === 'string') {
-                return item;
-            }
-            else {
-                return MarkdownString.from(item);
-            }
-        }));
+        return {
+            ...content,
+            icon,
+            message: MarkdownString.from(content.message),
+        };
     }
     async provideTitle(context, token) {
         if (!this._titleProvider) {
@@ -546,7 +573,7 @@ class ExtHostChatAgent {
                     iconDark: !this._iconPath ? undefined :
                         'dark' in this._iconPath ? this._iconPath.dark :
                             undefined,
-                    themeIcon: this._iconPath instanceof ThemeIcon ? this._iconPath : undefined,
+                    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),

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

@@ -0,0 +1,47 @@
+import { MainContext } from './extHost.protocol.js';
+import { TextEdit } from './extHostTypeConverters.js';
+import { URI } from '../../../base/common/uri.js';
+class ExtHostCodeMapper {
+    static { this._providerHandlePool = 0; }
+    constructor(mainContext) {
+        this.providers = ( new Map());
+        this._proxy = ( mainContext.getProxy(MainContext.MainThreadCodeMapper));
+    }
+    async $mapCode(handle, internalRequest, token) {
+        const provider = this.providers.get(handle);
+        if (!provider) {
+            throw ( new Error(`Received request to map code for unknown provider handle ${handle}`));
+        }
+        const stream = {
+            textEdit: (target, edits) => {
+                edits = (Array.isArray(edits) ? edits : [edits]);
+                this._proxy.$handleProgress(internalRequest.requestId, {
+                    uri: target,
+                    edits: ( edits.map(TextEdit.from))
+                });
+            }
+        };
+        const request = {
+            codeBlocks: ( internalRequest.codeBlocks.map(block => {
+                return {
+                    code: block.code,
+                    resource: URI.revive(block.resource)
+                };
+            })),
+            conversation: internalRequest.conversation
+        };
+        const result = await provider.provideMappedEdits(request, stream, token);
+        return result ?? null;
+    }
+    registerMappedEditsProvider(extension, provider) {
+        const handle = ExtHostCodeMapper._providerHandlePool++;
+        this._proxy.$registerCodeMapperProvider(handle);
+        this.providers.set(handle, provider);
+        return {
+            dispose: () => {
+                return this._proxy.$unregisterCodeMapperProvider(handle);
+            }
+        };
+    }
+}
+export { ExtHostCodeMapper };

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

@@ -1,12 +1,11 @@
 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 { CommentThreadCollapsibleState as CommentThreadCollapsibleState$1, 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 { Range, MarkdownString, pathOrURIToURI } from './extHostTypeConverters.js';
+import { MarkdownString as MarkdownString$1, CommentThreadFocus, CommentThreadCollapsibleState, CommentThreadState, CommentThreadApplicability } from './extHostTypes.js';
 import { MainContext } from './extHost.protocol.js';
 import { checkProposedApiEnabled } from '../../services/extensions/common/extensions.js';
 function createExtHostComments(mainContext, commands, documents) {
@@ -18,14 +17,14 @@ function createExtHostComments(mainContext, commands, documents) {
             this._commentControllersByExtension = ( new ExtensionIdentifierMap());
             commands.registerArgumentProcessor({
                 processArgument: arg => {
-                    if (arg && arg.$mid === MarshalledId.CommentController) {
+                    if (arg && arg.$mid === 6 ) {
                         const commentController = this._commentControllers.get(arg.handle);
                         if (!commentController) {
                             return arg;
                         }
                         return commentController.value;
                     }
-                    else if (arg && arg.$mid === MarshalledId.CommentThread) {
+                    else if (arg && arg.$mid === 7 ) {
                         const marshalledCommentThread = arg;
                         const commentController = this._commentControllers.get(marshalledCommentThread.commentControlHandle);
                         if (!commentController) {
@@ -37,7 +36,7 @@ function createExtHostComments(mainContext, commands, documents) {
                         }
                         return commentThread.value;
                     }
-                    else if (arg && (arg.$mid === MarshalledId.CommentThreadReply || arg.$mid === MarshalledId.CommentThreadInstance)) {
+                    else if (arg && ((arg.$mid === 9  || arg.$mid === 8) )) {
                         const commentController = this._commentControllers.get(arg.thread.commentControlHandle);
                         if (!commentController) {
                             return arg;
@@ -46,7 +45,7 @@ function createExtHostComments(mainContext, commands, documents) {
                         if (!commentThread) {
                             return arg;
                         }
-                        if (arg.$mid === MarshalledId.CommentThreadInstance) {
+                        if (arg.$mid === 8 ) {
                             return commentThread.value;
                         }
                         return {
@@ -54,7 +53,7 @@ function createExtHostComments(mainContext, commands, documents) {
                             text: arg.text
                         };
                     }
-                    else if (arg && arg.$mid === MarshalledId.CommentNode) {
+                    else if (arg && arg.$mid === 10 ) {
                         const commentController = this._commentControllers.get(arg.thread.commentControlHandle);
                         if (!commentController) {
                             return arg;
@@ -70,7 +69,7 @@ function createExtHostComments(mainContext, commands, documents) {
                         }
                         return comment;
                     }
-                    else if (arg && arg.$mid === MarshalledId.CommentThreadNode) {
+                    else if (arg && arg.$mid === 11 ) {
                         const commentController = this._commentControllers.get(arg.thread.commentControlHandle);
                         if (!commentController) {
                             return arg;
@@ -89,7 +88,7 @@ function createExtHostComments(mainContext, commands, documents) {
                             comment.body = body;
                         }
                         else {
-                            comment.body = new MarkdownString(body);
+                            comment.body = new MarkdownString$1(body);
                         }
                         return comment;
                     }
@@ -533,7 +532,7 @@ function createExtHostComments(mainContext, commands, documents) {
                 true,
                 editorId
             ));
-            commentThread.collapsibleState = CommentThreadCollapsibleState.Expanded;
+            commentThread.collapsibleState = CommentThreadCollapsibleState$1.Expanded;
             this._threads.set(commentThread.handle, commentThread);
             return commentThread;
         }
@@ -574,7 +573,7 @@ function createExtHostComments(mainContext, commands, documents) {
             mode: vscodeComment.mode,
             contextValue: vscodeComment.contextValue,
             uniqueIdInThread: commentUniqueId,
-            body: (typeof vscodeComment.body === 'string') ? vscodeComment.body : MarkdownString$1.from(vscodeComment.body),
+            body: (typeof vscodeComment.body === 'string') ? vscodeComment.body : MarkdownString.from(vscodeComment.body),
             userName: vscodeComment.author.name,
             userIconPath: vscodeComment.author.iconPath,
             label: vscodeComment.label,
@@ -604,13 +603,13 @@ function createExtHostComments(mainContext, commands, documents) {
     function convertToCollapsibleState(kind) {
         if (kind !== undefined) {
             switch (kind) {
-                case CommentThreadCollapsibleState$1.Expanded:
-                    return CommentThreadCollapsibleState.Expanded;
-                case CommentThreadCollapsibleState$1.Collapsed:
-                    return CommentThreadCollapsibleState.Collapsed;
+                case CommentThreadCollapsibleState.Expanded:
+                    return CommentThreadCollapsibleState$1.Expanded;
+                case CommentThreadCollapsibleState.Collapsed:
+                    return CommentThreadCollapsibleState$1.Collapsed;
             }
         }
-        return CommentThreadCollapsibleState.Collapsed;
+        return CommentThreadCollapsibleState$1.Collapsed;
     }
     function convertToState(kind) {
         let resolvedKind;

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

@@ -3,10 +3,9 @@ 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 as ConfigurationTarget$1 } from './extHostTypes.js';
-import { ConfigurationTarget } from '../../../platform/configuration/common/configuration.js';
+import { ConfigurationTarget } from './extHostTypes.js';
 import { Configuration as Configuration$1, ConfigurationChangeEvent } from '../../../platform/configuration/common/configurationModels.js';
-import { OVERRIDE_PROPERTY_REGEX, ConfigurationScope } from '../../../platform/configuration/common/configurationRegistry.js';
+import { OVERRIDE_PROPERTY_REGEX } 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';
@@ -115,12 +114,12 @@ class ExtHostConfigProvider {
                 return null;
             }
             if (typeof arg === 'boolean') {
-                return arg ? ConfigurationTarget.USER : ConfigurationTarget.WORKSPACE;
+                return arg ? 2  : 5 ;
             }
             switch (arg) {
-                case ConfigurationTarget$1.Global: return ConfigurationTarget.USER;
-                case ConfigurationTarget$1.Workspace: return ConfigurationTarget.WORKSPACE;
-                case ConfigurationTarget$1.WorkspaceFolder: return ConfigurationTarget.WORKSPACE_FOLDER;
+                case ConfigurationTarget.Global: return 2 ;
+                case ConfigurationTarget.Workspace: return 5 ;
+                case ConfigurationTarget.WorkspaceFolder: return 6 ;
             }
         }
         const result = {
@@ -247,15 +246,15 @@ class ExtHostConfigProvider {
         return readonlyProxy(result);
     }
     _validateConfigurationAccess(key, overrides, extensionId) {
-        const scope = OVERRIDE_PROPERTY_REGEX.test(key) ? ConfigurationScope.RESOURCE : this._configurationScopes.get(key);
+        const scope = OVERRIDE_PROPERTY_REGEX.test(key) ? 4  : this._configurationScopes.get(key);
         const extensionIdText = extensionId ? `[${extensionId.value}] ` : '';
-        if (ConfigurationScope.RESOURCE === scope) {
+        if (4  === 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 (ConfigurationScope.WINDOW === scope) {
+        if (3  === 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'.`);
             }