@codingame/monaco-vscode-extensions-service-override 19.1.4 → 20.0.1

package/vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js

@@ -8,19 +8,19 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { ExtHostContext, TabInputKind, TabModelOperationKind, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { EditorResourceAccessor, SideBySideEditor, GroupModelChangeKind } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
-import { DiffEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/diffEditorInput';
-import { isGroupEditorMoveEvent } from '@codingame/monaco-vscode-ca445022-b812-53ca-a041-e46c7e0b13de-common/vscode/vs/workbench/common/editor/editorGroupModel';
-import { SideBySideEditorInput } from '@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common/vscode/vs/workbench/common/editor/sideBySideEditorInput';
-import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
-import { ChatEditorInput } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
+import { DiffEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/diffEditorInput';
+import { isGroupEditorMoveEvent } from '@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common/vscode/vs/workbench/common/editor/editorGroupModel';
+import { SideBySideEditorInput } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor/sideBySideEditorInput';
+import { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/browser/chatEditorInput';
 import { CustomEditorInput } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/customEditor/browser/customEditorInput';
 import { InteractiveEditorInput } from '@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common/vscode/vs/workbench/contrib/interactive/browser/interactiveEditorInput';
 import { MergeEditorInput } from '@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common/vscode/vs/workbench/contrib/mergeEditor/browser/mergeEditorInput';
-import { MultiDiffEditorInput } from '@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
-import { NotebookEditorInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
-import { TerminalEditorInput } from '@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
-import { WebviewInput } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { MultiDiffEditorInput } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
+import { TerminalEditorInput } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/terminal/browser/terminalEditorInput';
+import { WebviewInput } from '@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { GroupDirection, preferredSideBySideGroupDirection } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { SIDE_GROUP } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService';

package/vscode/src/vs/workbench/api/browser/mainThreadEditors.d.ts

@@ -6,7 +6,7 @@ import { IDecorationOptions, IDecorationRenderOptions } from "@codingame/monaco-
 import { ISingleEditOperation } from "@codingame/monaco-vscode-api/vscode/vs/editor/common/core/editOperation";
 import { MainThreadTextEditor } from "./mainThreadEditor.js";
 import { IApplyEditsOptions, ITextDocumentShowOptions, ITextEditorConfigurationUpdate, IUndoStopOptions, MainThreadTextEditorsShape, TextEditorRevealType } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";

package/vscode/src/vs/workbench/api/browser/mainThreadEditors.js

@@ -8,7 +8,7 @@ import { ICodeEditorService } from '@codingame/monaco-vscode-api/vscode/vs/edito
 import { CommandsRegistry } from '@codingame/monaco-vscode-api/vscode/vs/platform/commands/common/commands';
 import { isTextEditorDiffInformationEqual, EditorResolution, EditorActivation } from '@codingame/monaco-vscode-api/vscode/vs/platform/editor/common/editor';
 import { ExtHostContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
 import { IEditorGroupsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';

package/vscode/src/vs/workbench/api/browser/mainThreadExtensionService.js

@@ -89,13 +89,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2423,
+                    2450,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension, which is not loaded. Would you like to reload the window to load the extension?",
                     extName,
                     missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                 )),
                 actions: {
-                    primary: [( new Action('reload', ( localize(2424, "Reload Window")), '', true, () => this._hostService.reload()))]
+                    primary: [( new Action('reload', ( localize(2451, "Reload Window")), '', true, () => this._hostService.reload()))]
                 }
             });
         }
@@ -105,7 +105,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2425,
+                        2452,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in the current workspace",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -116,13 +116,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2426,
+                        2453,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is not supported in Restricted Mode",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( new Action('manageWorkspaceTrust', ( localize(2427, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
+                        primary: [( new Action('manageWorkspaceTrust', ( localize(2454, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
                     }
                 });
             }
@@ -130,13 +130,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2428,
+                        2455,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled. Would you like to enable the extension and reload the window?",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
                     )),
                     actions: {
-                        primary: [( new Action('enable', ( localize(2429, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
+                        primary: [( new Action('enable', ( localize(2456, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
                                 .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                     }
                 });
@@ -145,7 +145,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2430,
+                        2457,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -166,21 +166,21 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2431,
+                    2458,
                     "Cannot activate the '{0}' extension because it depends on the '{1}' extension from '{2}', which is not installed. Would you like to install the extension and reload the window?",
                     extName,
                     dependencyExtension.displayName,
                     dependencyExtension.publisherDisplayName
                 )),
                 actions: {
-                    primary: [( new Action('install', ( localize(2432, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
+                    primary: [( new Action('install', ( localize(2459, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
                             .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
                 }
             });
         }
         else {
             this._notificationService.error(( localize(
-                2433,
+                2460,
                 "Cannot activate the '{0}' extension because it depends on an unknown '{1}' extension.",
                 extName,
                 missingDependency

package/vscode/src/vs/workbench/api/browser/mainThreadFileSystemEventService.js

@@ -75,28 +75,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     if (data.extensionNames.length === 1) {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2434,
+                                2461,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2435,
+                                2462,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2436,
+                                2463,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2437,
+                                2464,
                                 "Extension '{0}' wants to make refactoring changes with this file deletion",
                                 data.extensionNames[0]
                             ));
@@ -105,28 +105,28 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                     else {
                         if (operation === FileOperation.CREATE) {
                             message = ( localize(
-                                2438,
+                                2465,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2439,
+                                2466,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2440,
+                                2467,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2441,
+                                2468,
                                 "{0} extensions want to make refactoring changes with this file deletion",
                                 data.extensionNames.length
                             ));
@@ -136,8 +136,8 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                         const { confirmed } = await dialogService.confirm({
                             type: Severity.Info,
                             message,
-                            primaryButton: ( localize(2442, "Show &&Preview")),
-                            cancelButton: ( localize(2443, "Skip Changes"))
+                            primaryButton: ( localize(2469, "Show &&Preview")),
+                            cancelButton: ( localize(2470, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2444, "&&OK")),
+                                    label: ( localize(2471, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2442, "Show &&Preview")),
+                                    label: ( localize(2469, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2443, "Skip Changes")),
+                                label: ( localize(2470, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2445, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2472, "Do not ask me again")) }
                         });
                         if (result === Choice.Cancel) {
                             return;
@@ -185,15 +185,15 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
             _progressLabel(operation) {
                 switch (operation) {
                     case FileOperation.CREATE:
-                        return localize(2446, "Running 'File Create' participants...");
+                        return localize(2473, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2447, "Running 'File Rename' participants...");
+                        return localize(2474, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2448, "Running 'File Copy' participants...");
+                        return localize(2475, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2449, "Running 'File Delete' participants...");
+                        return localize(2476, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2450, "Running 'File Write' participants...");
+                        return localize(2477, "Running 'File Write' participants...");
                 }
             }
         });
@@ -264,7 +264,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2451, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2478, "Reset choice for 'File operation needs preview'")),
                 original: `Reset choice for 'File operation needs preview'`
             },
             f1: true

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.d.ts

@@ -12,16 +12,16 @@ import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/plat
 import { IUriIdentityService } from "@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { ExtHostLanguageFeaturesShape, ICodeActionProviderMetadataDto, IDocumentDropEditProviderMetadata, IDocumentFilterDto, ILanguageConfigurationDto, IPasteEditProviderMetadataDto, ISignatureHelpProviderMetadataDto, MainThreadLanguageFeaturesShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
-import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
+import { IInstantiationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation";
 export declare class MainThreadLanguageFeatures extends Disposable implements MainThreadLanguageFeaturesShape {
     private readonly _languageService;
     private readonly _languageConfigurationService;
     private readonly _languageFeaturesService;
     private readonly _uriIdentService;
-    private readonly _telemetryService;
+    private readonly _instantiationService;
     private readonly _proxy;
     private readonly _registrations;
-    constructor(extHostContext: IExtHostContext, _languageService: ILanguageService, _languageConfigurationService: ILanguageConfigurationService, _languageFeaturesService: ILanguageFeaturesService, _uriIdentService: IUriIdentityService, _telemetryService: ITelemetryService);
+    constructor(extHostContext: IExtHostContext, _languageService: ILanguageService, _languageConfigurationService: ILanguageConfigurationService, _languageFeaturesService: ILanguageFeaturesService, _uriIdentService: IUriIdentityService, _instantiationService: IInstantiationService);
     $unregister(handle: number): void;
     private static _reviveLocationDto;
     private static _reviveLocationLinkDto;

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageFeatures.js

@@ -9,7 +9,7 @@ import { ResourceMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
 import { mixin } from '@codingame/monaco-vscode-api/vscode/vs/base/common/objects';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
-import { CompletionItemKind, InlineCompletionEndOfLifeReasonKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
+import { CompletionItemKind, ProviderId, InlineCompletionEndOfLifeReasonKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
 import { ILanguageService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/language.service';
 import { ILanguageConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages/languageConfigurationRegistry.service';
 import { ILanguageFeaturesService } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/services/languageFeatures.service';
@@ -23,18 +23,19 @@ import { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-6f931a
 import { TypeHierarchyProviderRegistry } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/typeHierarchy/common/typeHierarchy';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { ExtHostContext, ISuggestDataDtoField, ISuggestResultDtoField, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { ITelemetryService } from '@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service';
 import { InlineCompletionEndOfLifeReasonKind as InlineCompletionEndOfLifeReasonKind$1 } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypes';
+import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
+import { DataChannelForwardingTelemetryService } from '../../contrib/editTelemetry/browser/telemetry/forwardingTelemetryService.js';
 
 var MainThreadLanguageFeatures_1;
 let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThreadLanguageFeatures extends Disposable {
-    constructor(extHostContext, _languageService, _languageConfigurationService, _languageFeaturesService, _uriIdentService, _telemetryService) {
+    constructor(extHostContext, _languageService, _languageConfigurationService, _languageFeaturesService, _uriIdentService, _instantiationService) {
         super();
         this._languageService = _languageService;
         this._languageConfigurationService = _languageConfigurationService;
         this._languageFeaturesService = _languageFeaturesService;
         this._uriIdentService = _uriIdentService;
-        this._telemetryService = _telemetryService;
+        this._instantiationService = _instantiationService;
         this._registrations = this._register(( new DisposableMap()));
         this._pasteEditProviders = ( new Map());
         this._documentOnDropEditProviders = ( new Map());
@@ -535,8 +536,11 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                     timeUntilShown: lifetimeSummary.timeUntilShown,
                     editorType: lifetimeSummary.editorType,
                     viewKind: lifetimeSummary.viewKind,
+                    preceeded: lifetimeSummary.preceeded,
                     requestReason: lifetimeSummary.requestReason,
                     error: lifetimeSummary.error,
+                    typingInterval: lifetimeSummary.typingInterval,
+                    typingIntervalCharacterCount: lifetimeSummary.typingIntervalCharacterCount,
                     languageId: lifetimeSummary.languageId,
                     cursorColumnDistance: lifetimeSummary.cursorColumnDistance,
                     cursorLineDistance: lifetimeSummary.cursorLineDistance,
@@ -554,7 +558,8 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                         : reason.kind === InlineCompletionEndOfLifeReasonKind$1.Rejected ? 'rejected'
                             : 'ignored'
                 };
-                this._telemetryService.publicLog2('inlineCompletion.endOfLife', endOfLifeSummary);
+                const telemetryService = this._instantiationService.createInstance(DataChannelForwardingTelemetryService);
+                telemetryService.publicLog2('inlineCompletion.endOfLife', endOfLifeSummary);
             },
             disposeInlineCompletions: (completions, reason) => {
                 this._proxy.$freeInlineCompletionsList(handle, completions.pid, reason);
@@ -565,6 +570,7 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                 }
             },
             groupId: groupId ?? extensionId,
+            providerId: new ProviderId(extensionId, extensionVersion, groupId),
             yieldsToGroupIds: yieldsToExtensionIds,
             debounceDelayMs,
             displayName,
@@ -882,7 +888,7 @@ MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = __decorate([
     ( __param(2, ILanguageConfigurationService)),
     ( __param(3, ILanguageFeaturesService)),
     ( __param(4, IUriIdentityService)),
-    ( __param(5, ITelemetryService))
+    ( __param(5, IInstantiationService))
 ], MainThreadLanguageFeatures);
 let MainThreadPasteEditProvider = class MainThreadPasteEditProvider {
     constructor(_handle, _proxy, metadata, _uriIdentService) {

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.js

@@ -28,6 +28,7 @@ let MainThreadLanguageModelTools = class MainThreadLanguageModelTools extends Di
             userDescription: tool.userDescription,
             modelDescription: tool.modelDescription,
             inputSchema: tool.inputSchema,
+            source: tool.source,
         })));
     }
     async $getTools() {

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.d.ts

@@ -4,8 +4,7 @@ import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/commo
 import { ExtensionIdentifier } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions";
 import { ILogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service";
 import { ILanguageModelIgnoredFilesService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service";
-import { ILanguageModelStatsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats.service";
-import { IChatMessage, IChatResponseFragment, ILanguageModelChatMetadata, ILanguageModelChatSelector } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
+import { IChatMessage, IChatResponseFragment, ILanguageModelChatSelector } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels";
 import { ILanguageModelsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service";
 import { IAuthenticationAccessService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service";
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
@@ -15,7 +14,6 @@ import { SerializableObjectWithBuffers } from "@codingame/monaco-vscode-api/vsco
 import { MainThreadLanguageModelsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadLanguageModels implements MainThreadLanguageModelsShape {
     private readonly _chatProviderService;
-    private readonly _languageModelStatsService;
     private readonly _logService;
     private readonly _authenticationService;
     private readonly _authenticationAccessService;
@@ -24,18 +22,19 @@ export declare class MainThreadLanguageModels implements MainThreadLanguageModel
     private readonly _proxy;
     private readonly _store;
     private readonly _providerRegistrations;
+    private readonly _lmProviderChange;
     private readonly _pendingProgress;
     private readonly _ignoredFileProviderRegistrations;
-    constructor(extHostContext: IExtHostContext, _chatProviderService: ILanguageModelsService, _languageModelStatsService: ILanguageModelStatsService, _logService: ILogService, _authenticationService: IAuthenticationService, _authenticationAccessService: IAuthenticationAccessService, _extensionService: IExtensionService, _ignoredFilesService: ILanguageModelIgnoredFilesService);
+    constructor(extHostContext: IExtHostContext, _chatProviderService: ILanguageModelsService, _logService: ILogService, _authenticationService: IAuthenticationService, _authenticationAccessService: IAuthenticationAccessService, _extensionService: IExtensionService, _ignoredFilesService: ILanguageModelIgnoredFilesService);
     dispose(): void;
-    $registerLanguageModelProvider(handle: number, identifier: string, metadata: ILanguageModelChatMetadata): void;
+    $registerLanguageModelProvider(vendor: string): void;
+    $onLMProviderChange(vendor: string): void;
     $reportResponsePart(requestId: number, chunk: IChatResponseFragment | IChatResponseFragment[]): Promise<void>;
     $reportResponseDone(requestId: number, err: SerializedError | undefined): Promise<void>;
-    $unregisterProvider(handle: number): void;
+    $unregisterProvider(vendor: string): void;
     $selectChatModels(selector: ILanguageModelChatSelector): Promise<string[]>;
-    $whenLanguageModelChatRequestMade(identifier: string, extensionId: ExtensionIdentifier, participant?: string | undefined, tokenCount?: number | undefined): void;
-    $tryStartChatRequest(extension: ExtensionIdentifier, providerId: string, requestId: number, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {}, token: CancellationToken): Promise<any>;
-    $countTokens(provider: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
+    $tryStartChatRequest(extension: ExtensionIdentifier, modelIdentifier: string, requestId: number, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {}, token: CancellationToken): Promise<any>;
+    $countTokens(modelId: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
     private _registerAuthenticationProvider;
     $fileIsIgnored(uri: UriComponents, token: CancellationToken): Promise<boolean>;
     $registerFileIgnoreProvider(handle: number): void;

package/vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js

@@ -4,14 +4,13 @@ import { DeferredPromise, AsyncIterableSource } from '@codingame/monaco-vscode-a
 import { VSBuffer } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import { toErrorMessage } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errorMessage';
 import { transformErrorFromSerialization, transformErrorForSerialization } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
-import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
+import { Emitter, Event } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { DisposableStore, DisposableMap, Disposable, toDisposable } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
-import { resizeImage } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { resizeImage } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.service';
-import { ILanguageModelStatsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModelStats.service';
 import { ILanguageModelsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/languageModels.service';
 import { IAuthenticationAccessService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationAccessService.service';
 import { INTERNAL_AUTH_PROVIDER_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
@@ -23,9 +22,8 @@ import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode
 import { LanguageModelError } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypes';
 
 let MainThreadLanguageModels = class MainThreadLanguageModels {
-    constructor(extHostContext, _chatProviderService, _languageModelStatsService, _logService, _authenticationService, _authenticationAccessService, _extensionService, _ignoredFilesService) {
+    constructor(extHostContext, _chatProviderService, _logService, _authenticationService, _authenticationAccessService, _extensionService, _ignoredFilesService) {
         this._chatProviderService = _chatProviderService;
-        this._languageModelStatsService = _languageModelStatsService;
         this._logService = _logService;
         this._authenticationService = _authenticationService;
         this._authenticationAccessService = _authenticationAccessService;
@@ -33,24 +31,31 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         this._ignoredFilesService = _ignoredFilesService;
         this._store = ( new DisposableStore());
         this._providerRegistrations = ( new DisposableMap());
+        this._lmProviderChange = ( new Emitter());
         this._pendingProgress = ( new Map());
         this._ignoredFileProviderRegistrations = ( new DisposableMap());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostChatProvider));
-        this._proxy.$acceptChatModelMetadata({ added: ( _chatProviderService.getLanguageModelIds().map(
-            id => ({ identifier: id, metadata: _chatProviderService.lookupLanguageModel(id) })
-        )) });
-        this._store.add(_chatProviderService.onDidChangeLanguageModels(this._proxy.$acceptChatModelMetadata, this._proxy));
     }
     dispose() {
+        this._lmProviderChange.dispose();
         this._providerRegistrations.dispose();
         this._ignoredFileProviderRegistrations.dispose();
         this._store.dispose();
     }
-    $registerLanguageModelProvider(handle, identifier, metadata) {
+    $registerLanguageModelProvider(vendor) {
         const dipsosables = ( new DisposableStore());
-        dipsosables.add(this._chatProviderService.registerLanguageModelChat(identifier, {
-            metadata,
-            sendChatRequest: async (messages, from, options, token) => {
+        dipsosables.add(this._chatProviderService.registerLanguageModelProvider(vendor, {
+            onDidChange: Event.filter(this._lmProviderChange.event, e => e.vendor === vendor, dipsosables),
+            prepareLanguageModelChat: async (options, token) => {
+                const modelsAndIdentifiers = await this._proxy.$prepareLanguageModelProvider(vendor, options, token);
+                modelsAndIdentifiers.forEach(m => {
+                    if (m.metadata.auth) {
+                        dipsosables.add(this._registerAuthenticationProvider(m.metadata.extension, m.metadata.auth));
+                    }
+                });
+                return modelsAndIdentifiers;
+            },
+            sendChatRequest: async (modelId, messages, from, options, token) => {
                 const requestId = (Math.random() * 1e6) | 0;
                 const defer = ( new DeferredPromise());
                 const stream = ( new AsyncIterableSource());
@@ -61,7 +66,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
                         .map(async (part) => {
                         part.value.data = VSBuffer.wrap(await resizeImage(part.value.data.buffer));
                     })));
-                    await this._proxy.$startChatRequest(handle, requestId, from, ( new SerializableObjectWithBuffers(messages)), options, token);
+                    await this._proxy.$startChatRequest(modelId, requestId, from, ( new SerializableObjectWithBuffers(messages)), options, token);
                 }
                 catch (err) {
                     this._pendingProgress.delete(requestId);
@@ -72,14 +77,14 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
                     stream: stream.asyncIterable
                 };
             },
-            provideTokenCount: (str, token) => {
-                return this._proxy.$provideTokenLength(handle, str, token);
+            provideTokenCount: (modelId, str, token) => {
+                return this._proxy.$provideTokenLength(modelId, str, token);
             },
         }));
-        if (metadata.auth) {
-            dipsosables.add(this._registerAuthenticationProvider(metadata.extension, metadata.auth));
-        }
-        this._providerRegistrations.set(handle, dipsosables);
+        this._providerRegistrations.set(vendor, dipsosables);
+    }
+    $onLMProviderChange(vendor) {
+        this._lmProviderChange.fire({ vendor });
     }
     async $reportResponsePart(requestId, chunk) {
         const data = this._pendingProgress.get(requestId);
@@ -104,20 +109,17 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
             }
         }
     }
-    $unregisterProvider(handle) {
-        this._providerRegistrations.deleteAndDispose(handle);
+    $unregisterProvider(vendor) {
+        this._providerRegistrations.deleteAndDispose(vendor);
     }
     $selectChatModels(selector) {
         return this._chatProviderService.selectLanguageModels(selector);
     }
-    $whenLanguageModelChatRequestMade(identifier, extensionId, participant, tokenCount) {
-        this._languageModelStatsService.update(identifier, extensionId, participant, tokenCount);
-    }
-    async $tryStartChatRequest(extension, providerId, requestId, messages, options, token) {
+    async $tryStartChatRequest(extension, modelIdentifier, requestId, messages, options, token) {
         this._logService.trace('[CHAT] request STARTED', extension.value, requestId);
         let response;
         try {
-            response = await this._chatProviderService.sendChatRequest(providerId, extension, messages.value, options, token);
+            response = await this._chatProviderService.sendChatRequest(modelIdentifier, extension, messages.value, options, token);
         }
         catch (err) {
             this._logService.error('[CHAT] request FAILED', extension.value, requestId, err);
@@ -144,15 +146,15 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
             this._proxy.$acceptResponseDone(requestId, transformErrorForSerialization(err));
         });
     }
-    $countTokens(provider, value, token) {
-        return this._chatProviderService.computeTokenLength(provider, value, token);
+    $countTokens(modelId, value, token) {
+        return this._chatProviderService.computeTokenLength(modelId, value, token);
     }
     _registerAuthenticationProvider(extension, auth) {
         const authProviderId = INTERNAL_AUTH_PROVIDER_PREFIX + extension.value;
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2452, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2479, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {
@@ -190,12 +192,11 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
 MainThreadLanguageModels = __decorate([
     extHostNamedCustomer(MainContext.MainThreadLanguageModels),
     ( __param(1, ILanguageModelsService)),
-    ( __param(2, ILanguageModelStatsService)),
-    ( __param(3, ILogService)),
-    ( __param(4, IAuthenticationService)),
-    ( __param(5, IAuthenticationAccessService)),
-    ( __param(6, IExtensionService)),
-    ( __param(7, ILanguageModelIgnoredFilesService))
+    ( __param(2, ILogService)),
+    ( __param(3, IAuthenticationService)),
+    ( __param(4, IAuthenticationAccessService)),
+    ( __param(5, IExtensionService)),
+    ( __param(6, ILanguageModelIgnoredFilesService))
 ], MainThreadLanguageModels);
 class LanguageModelAccessAuthProvider {
     constructor(id, label, _accountLabel) {
@@ -229,7 +230,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2453,
+            2480,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label