@codingame/monaco-vscode-extensions-service-override 22.1.8 → 23.0.0

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

@@ -9,18 +9,18 @@ import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log
 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-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 { isGroupEditorMoveEvent } from '@codingame/monaco-vscode-d392702e-4ad7-5904-a915-f6063284cf14-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 { AbstractTextResourceEditorInput } from '@codingame/monaco-vscode-16b9b017-9377-5198-9904-c344b3b2ad14-common/vscode/vs/workbench/common/editor/textResourceEditorInput';
+import { ChatEditorInput } from '@codingame/monaco-vscode-aac7027b-326c-513a-95a9-e4eedd151b38-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-7969284a-1a12-5148-9750-fcf9656a693f-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 { MultiDiffEditorInput } from '@codingame/monaco-vscode-bc6f260d-ec63-5c95-9446-1ca7d0872719-common/vscode/vs/workbench/contrib/multiDiffEditor/browser/multiDiffEditorInput';
+import { NotebookEditorInput } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/notebook/common/notebookEditorInput';
 import { TerminalEditorInput } from '@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-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 { WebviewInput } from '@codingame/monaco-vscode-4db3f2fb-d745-58fe-9e0e-eb67152ab711-common/vscode/vs/workbench/contrib/webviewPanel/browser/webviewEditorInput';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-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-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn";
+import { EditorGroupColumn } from "@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-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-a17e9d37-b6c1-5556-8402-5db73960fae3-common/vscode/vs/workbench/services/editor/common/editorGroupColumn';
+import { editorGroupToColumn, columnToEditorGroup } from '@codingame/monaco-vscode-3b5a5cd1-d4ff-500a-b609-57e0cd4afa0a-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/mainThreadErrors.d.ts

@@ -2,5 +2,5 @@ import { SerializedError } from "@codingame/monaco-vscode-api/vscode/vs/base/com
 import { MainThreadErrorsShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadErrors implements MainThreadErrorsShape {
     dispose(): void;
-    $onUnexpectedError(err: any | SerializedError): void;
+    $onUnexpectedError(err: unknown | SerializedError): void;
 }

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

@@ -8,7 +8,7 @@ let MainThreadErrors = class MainThreadErrors {
     dispose() {
     }
     $onUnexpectedError(err) {
-        if (err && err.$isError) {
+        if (err?.$isError) {
             err = transformErrorFromSerialization(err);
         }
         onUnexpectedError(err);

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

@@ -1,6 +1,6 @@
 
 import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib/tslib.es6';
-import { Action } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
+import { toAction } from '@codingame/monaco-vscode-api/vscode/vs/base/common/actions';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { transformErrorFromSerialization } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { FileAccess } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
@@ -89,13 +89,13 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2460,
+                    2472,
                     "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(2461, "Reload Window")), '', true, () => this._hostService.reload()))]
+                    primary: [toAction({ id: 'reload', label: ( localize(2473, "Reload Window")), run: () => this._hostService.reload() })]
                 }
             });
         }
@@ -105,7 +105,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2462,
+                        2474,
                         "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(
-                        2463,
+                        2475,
                         "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(2464, "Manage Workspace Trust")), '', true, () => this._commandService.executeCommand('workbench.trust.manage')))]
+                        primary: [toAction({ id: 'manageWorkspaceTrust', label: ( localize(2476, "Manage Workspace Trust")), run: () => this._commandService.executeCommand('workbench.trust.manage') })]
                     }
                 });
             }
@@ -130,14 +130,17 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2465,
+                        2477,
                         "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(2466, "Enable and Reload")), '', true, () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
-                                .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
+                        primary: [toAction({
+                                id: 'enable', label: ( localize(2478, "Enable and Reload")), enabled: true,
+                                run: () => this._extensionEnablementService.setEnablement([missingInstalledDependency], enablementState === EnablementState.DisabledGlobally ? EnablementState.EnabledGlobally : EnablementState.EnabledWorkspace)
+                                    .then(() => this._hostService.reload(), e => this._notificationService.error(e))
+                            })]
                     }
                 });
             }
@@ -145,7 +148,7 @@ let MainThreadExtensionService = class MainThreadExtensionService {
                 this._notificationService.notify({
                     severity: Severity.Error,
                     message: ( localize(
-                        2467,
+                        2479,
                         "Cannot activate the '{0}' extension because it depends on the '{1}' extension which is disabled.",
                         extName,
                         missingInstalledDependency.manifest.displayName || missingInstalledDependency.manifest.name
@@ -166,21 +169,25 @@ let MainThreadExtensionService = class MainThreadExtensionService {
             this._notificationService.notify({
                 severity: Severity.Error,
                 message: ( localize(
-                    2468,
+                    2480,
                     "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(2469, "Install and Reload")), '', true, () => this._extensionsWorkbenchService.install(dependencyExtension)
-                            .then(() => this._hostService.reload(), e => this._notificationService.error(e))))]
+                    primary: [toAction({
+                            id: 'install',
+                            label: ( localize(2481, "Install and Reload")),
+                            run: () => this._extensionsWorkbenchService.install(dependencyExtension)
+                                .then(() => this._hostService.reload(), e => this._notificationService.error(e))
+                        })]
                 }
             });
         }
         else {
             this._notificationService.error(( localize(
-                2470,
+                2482,
                 "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(
-                                2471,
+                                2483,
                                 "Extension '{0}' wants to make refactoring changes with this file creation",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2472,
+                                2484,
                                 "Extension '{0}' wants to make refactoring changes with this file copy",
                                 data.extensionNames[0]
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2473,
+                                2485,
                                 "Extension '{0}' wants to make refactoring changes with this file move",
                                 data.extensionNames[0]
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2474,
+                                2486,
                                 "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(
-                                2475,
+                                2487,
                                 "{0} extensions want to make refactoring changes with this file creation",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.COPY) {
                             message = ( localize(
-                                2476,
+                                2488,
                                 "{0} extensions want to make refactoring changes with this file copy",
                                 data.extensionNames.length
                             ));
                         }
                         else if (operation === FileOperation.MOVE) {
                             message = ( localize(
-                                2477,
+                                2489,
                                 "{0} extensions want to make refactoring changes with this file move",
                                 data.extensionNames.length
                             ));
                         }
                         else  {
                             message = ( localize(
-                                2478,
+                                2490,
                                 "{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(2479, "Show &&Preview")),
-                            cancelButton: ( localize(2480, "Skip Changes"))
+                            primaryButton: ( localize(2491, "Show &&Preview")),
+                            cancelButton: ( localize(2492, "Skip Changes"))
                         });
                         showPreview = true;
                         if (!confirmed) {
@@ -156,19 +156,19 @@ let MainThreadFileSystemEventService = class MainThreadFileSystemEventService {
                             message,
                             buttons: [
                                 {
-                                    label: ( localize(2481, "&&OK")),
+                                    label: ( localize(2493, "&&OK")),
                                     run: () => Choice.OK
                                 },
                                 {
-                                    label: ( localize(2479, "Show &&Preview")),
+                                    label: ( localize(2491, "Show &&Preview")),
                                     run: () => Choice.Preview
                                 }
                             ],
                             cancelButton: {
-                                label: ( localize(2480, "Skip Changes")),
+                                label: ( localize(2492, "Skip Changes")),
                                 run: () => Choice.Cancel
                             },
-                            checkbox: { label: ( localize(2482, "Do not ask me again")) }
+                            checkbox: { label: ( localize(2494, "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(2483, "Running 'File Create' participants...");
+                        return localize(2495, "Running 'File Create' participants...");
                     case FileOperation.MOVE:
-                        return localize(2484, "Running 'File Rename' participants...");
+                        return localize(2496, "Running 'File Rename' participants...");
                     case FileOperation.COPY:
-                        return localize(2485, "Running 'File Copy' participants...");
+                        return localize(2497, "Running 'File Copy' participants...");
                     case FileOperation.DELETE:
-                        return localize(2486, "Running 'File Delete' participants...");
+                        return localize(2498, "Running 'File Delete' participants...");
                     case FileOperation.WRITE:
-                        return localize(2487, "Running 'File Write' participants...");
+                        return localize(2499, "Running 'File Write' participants...");
                 }
             }
         });
@@ -264,7 +264,7 @@ registerAction2(class ResetMemento extends Action2 {
         super({
             id: 'files.participants.resetChoice',
             title: {
-                value: ( localize(2488, "Reset choice for 'File operation needs preview'")),
+                value: ( localize(2500, "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

@@ -34,7 +34,7 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     private static _reviveTypeHierarchyItemDto;
     $registerDocumentSymbolProvider(handle: number, selector: IDocumentFilterDto[], displayName: string): void;
     $registerCodeLensSupport(handle: number, selector: IDocumentFilterDto[], eventHandle: number | undefined): void;
-    $emitCodeLensEvent(eventHandle: number, event?: any): void;
+    $emitCodeLensEvent(eventHandle: number, event?: unknown): void;
     $registerDefinitionSupport(handle: number, selector: IDocumentFilterDto[]): void;
     $registerDeclarationSupport(handle: number, selector: IDocumentFilterDto[]): void;
     $registerImplementationSupport(handle: number, selector: IDocumentFilterDto[]): void;
@@ -42,7 +42,7 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     $registerHoverProvider(handle: number, selector: IDocumentFilterDto[]): void;
     $registerEvaluatableExpressionProvider(handle: number, selector: IDocumentFilterDto[]): void;
     $registerInlineValuesProvider(handle: number, selector: IDocumentFilterDto[], eventHandle: number | undefined): void;
-    $emitInlineValuesEvent(eventHandle: number, event?: any): void;
+    $emitInlineValuesEvent(eventHandle: number, event?: unknown): void;
     $registerDocumentHighlightProvider(handle: number, selector: IDocumentFilterDto[]): void;
     $registerMultiDocumentHighlightProvider(handle: number, selector: IDocumentFilterDto[]): void;
     $registerLinkedEditingRangeProvider(handle: number, selector: IDocumentFilterDto[]): void;
@@ -59,7 +59,8 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     $registerNewSymbolNamesProvider(handle: number, selector: IDocumentFilterDto[]): void;
     $registerDocumentSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend, eventHandle: number | undefined): void;
     $emitDocumentSemanticTokensEvent(eventHandle: number): void;
-    $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend): void;
+    $emitDocumentRangeSemanticTokensEvent(eventHandle: number): void;
+    $registerDocumentRangeSemanticTokensProvider(handle: number, selector: IDocumentFilterDto[], legend: languages.SemanticTokensLegend, eventHandle: number | undefined): void;
     private static _inflateSuggestDto;
     $registerCompletionsProvider(handle: number, selector: IDocumentFilterDto[], triggerCharacters: string[], supportsResolveDetails: boolean, extensionId: ExtensionIdentifier): void;
     $registerInlineCompletionsSupport(handle: number, selector: IDocumentFilterDto[], supportsHandleEvents: boolean, extensionId: string, extensionVersion: string, groupId: string | undefined, yieldsToExtensionIds: string[], displayName: string | undefined, debounceDelayMs: number | undefined, excludesExtensionIds: string[], eventHandle: number | undefined): void;
@@ -70,7 +71,7 @@ export declare class MainThreadLanguageFeatures extends Disposable implements Ma
     $registerDocumentLinkProvider(handle: number, selector: IDocumentFilterDto[], supportsResolve: boolean): void;
     $registerDocumentColorProvider(handle: number, selector: IDocumentFilterDto[]): void;
     $registerFoldingRangeProvider(handle: number, selector: IDocumentFilterDto[], extensionId: ExtensionIdentifier, eventHandle: number | undefined): void;
-    $emitFoldingRangeEvent(eventHandle: number, event?: any): void;
+    $emitFoldingRangeEvent(eventHandle: number, event?: unknown): void;
     $registerSelectionRangeProvider(handle: number, selector: IDocumentFilterDto[]): void;
     $registerCallHierarchyProvider(handle: number, selector: IDocumentFilterDto[]): void;
     private static _reviveRegExp;
@@ -97,7 +98,8 @@ export declare class MainThreadDocumentRangeSemanticTokensProvider implements la
     private readonly _proxy;
     private readonly _handle;
     private readonly _legend;
-    constructor(_proxy: ExtHostLanguageFeaturesShape, _handle: number, _legend: languages.SemanticTokensLegend);
+    readonly onDidChange: Event<void> | undefined;
+    constructor(_proxy: ExtHostLanguageFeaturesShape, _handle: number, _legend: languages.SemanticTokensLegend, onDidChange: Event<void> | undefined);
     getLegend(): languages.SemanticTokensLegend;
     provideDocumentRangeSemanticTokens(model: ITextModel, range: EditorRange, token: CancellationToken): Promise<languages.SemanticTokens | null>;
 }

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

@@ -19,7 +19,7 @@ import { reviveWorkspaceEditDto } from './mainThreadBulkEdits.js';
 import { DataTransfer } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHostTypeConverters';
 import { DataTransferFileCache } from '../common/shared/dataTransferCache.js';
 import { CallHierarchyProviderRegistry } from '@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common/vscode/vs/workbench/contrib/callHierarchy/common/callHierarchy';
-import { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/search/common/search';
+import { WorkspaceSymbolProviderRegistry } from '@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common/vscode/vs/workbench/contrib/search/common/search';
 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';
@@ -439,8 +439,20 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
             obj.fire(undefined);
         }
     }
-    $registerDocumentRangeSemanticTokensProvider(handle, selector, legend) {
-        this._registrations.set(handle, this._languageFeaturesService.documentRangeSemanticTokensProvider.register(selector, ( new MainThreadDocumentRangeSemanticTokensProvider(this._proxy, handle, legend))));
+    $emitDocumentRangeSemanticTokensEvent(eventHandle) {
+        const obj = this._registrations.get(eventHandle);
+        if (obj instanceof Emitter) {
+            obj.fire(undefined);
+        }
+    }
+    $registerDocumentRangeSemanticTokensProvider(handle, selector, legend, eventHandle) {
+        let event = undefined;
+        if (typeof eventHandle === 'number') {
+            const emitter = ( new Emitter());
+            this._registrations.set(eventHandle, emitter);
+            event = emitter.event;
+        }
+        this._registrations.set(handle, this._languageFeaturesService.documentRangeSemanticTokensProvider.register(selector, ( new MainThreadDocumentRangeSemanticTokensProvider(this._proxy, handle, legend, event))));
     }
     static _inflateSuggestDto(defaultRange, data, extensionId) {
         const label = data[ISuggestDataDtoField.label];
@@ -576,7 +588,6 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                     });
                 }
                 const endOfLifeSummary = {
-                    id: lifetimeSummary.requestUuid,
                     opportunityId: lifetimeSummary.requestUuid,
                     correlationId: lifetimeSummary.correlationId,
                     shown: lifetimeSummary.shown,
@@ -589,7 +600,6 @@ let MainThreadLanguageFeatures = MainThreadLanguageFeatures_1 = class MainThread
                     viewKind: lifetimeSummary.viewKind,
                     preceeded: lifetimeSummary.preceeded,
                     requestReason: lifetimeSummary.requestReason,
-                    error: lifetimeSummary.error,
                     typingInterval: lifetimeSummary.typingInterval,
                     typingIntervalCharacterCount: lifetimeSummary.typingIntervalCharacterCount,
                     languageId: lifetimeSummary.languageId,
@@ -1124,10 +1134,11 @@ class MainThreadDocumentSemanticTokensProvider {
     }
 }
 class MainThreadDocumentRangeSemanticTokensProvider {
-    constructor(_proxy, _handle, _legend) {
+    constructor(_proxy, _handle, _legend, onDidChange) {
         this._proxy = _proxy;
         this._handle = _handle;
         this._legend = _legend;
+        this.onDidChange = onDidChange;
     }
     getLegend() {
         return this._legend;

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

@@ -33,7 +33,7 @@ export declare class MainThreadLanguageModels implements MainThreadLanguageModel
     $reportResponseDone(requestId: number, err: SerializedError | undefined): Promise<void>;
     $unregisterProvider(vendor: string): void;
     $selectChatModels(selector: ILanguageModelChatSelector): Promise<string[]>;
-    $tryStartChatRequest(extension: ExtensionIdentifier, modelIdentifier: string, requestId: number, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {}, token: CancellationToken): Promise<any>;
+    $tryStartChatRequest(extension: ExtensionIdentifier, modelIdentifier: string, requestId: number, messages: SerializableObjectWithBuffers<IChatMessage[]>, options: {}, token: CancellationToken): Promise<void>;
     $countTokens(modelId: string, value: string | IChatMessage, token: CancellationToken): Promise<number>;
     private _registerAuthenticationProvider;
     $fileIsIgnored(uri: UriComponents, token: CancellationToken): Promise<boolean>;

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

@@ -9,7 +9,7 @@ import { DisposableStore, DisposableMap, Disposable, toDisposable } from '@codin
 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-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
+import { resizeImage } from '@codingame/monaco-vscode-9d2c06d1-1f89-51a5-9964-aa01fe50c198-common/vscode/vs/workbench/contrib/chat/browser/imageUtils';
 import { ILanguageModelIgnoredFilesService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/ignoredFiles.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';
@@ -160,7 +160,7 @@ let MainThreadLanguageModels = class MainThreadLanguageModels {
         if (this._authenticationService.getProviderIds().includes(authProviderId)) {
             return Disposable.None;
         }
-        const accountLabel = auth.accountLabel ?? ( localize(2489, 'Language Models'));
+        const accountLabel = auth.accountLabel ?? ( localize(2501, 'Language Models'));
         const disposables = ( new DisposableStore());
         this._authenticationService.registerAuthenticationProvider(authProviderId, ( new LanguageModelAccessAuthProvider(authProviderId, auth.providerLabel, accountLabel)));
         disposables.add(toDisposable(() => {
@@ -236,7 +236,7 @@ class LanguageModelAccessAuthProvider {
     }
     confirmation(extensionName, _recreatingSession) {
         return localize(
-            2490,
+            2502,
             "The extension '{0}' wants to access the language models provided by {1}.",
             extensionName,
             this.label

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

@@ -1,6 +1,4 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
-import { IAuthorizationProtectedResourceMetadata, IAuthorizationServerMetadata } from "@codingame/monaco-vscode-api/vscode/vs/base/common/oauth";
-import { UriComponents } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IContextKeyService } from "@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service";
 import { IDialogService } from "@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service";
 import { LogLevel } from "@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log";
@@ -10,9 +8,10 @@ import { IAuthenticationMcpAccessService } from "@codingame/monaco-vscode-api/vs
 import { IAuthenticationMcpService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpService.service";
 import { IAuthenticationMcpUsageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/browser/authenticationMcpUsageService.service";
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
+import { IDynamicAuthenticationProviderStorageService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/dynamicAuthenticationProviderStorage.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
-import { MainThreadMcpShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { IMcpAuthenticationDetails, IMcpAuthenticationOptions, MainThreadMcpShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
 export declare class MainThreadMcp extends Disposable implements MainThreadMcpShape {
     private readonly _extHostContext;
     private readonly _mcpRegistry;
@@ -21,6 +20,7 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private readonly authenticationMcpServersService;
     private readonly authenticationMCPServerAccessService;
     private readonly authenticationMCPServerUsageService;
+    private readonly _dynamicAuthenticationProviderStorageService;
     private readonly _extensionService;
     private readonly _contextKeyService;
     private _serverIdCounter;
@@ -28,13 +28,13 @@ export declare class MainThreadMcp extends Disposable implements MainThreadMcpSh
     private readonly _serverDefinitions;
     private readonly _proxy;
     private readonly _collectionDefinitions;
-    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, dialogService: IDialogService, _authenticationService: IAuthenticationService, authenticationMcpServersService: IAuthenticationMcpService, authenticationMCPServerAccessService: IAuthenticationMcpAccessService, authenticationMCPServerUsageService: IAuthenticationMcpUsageService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService);
+    constructor(_extHostContext: IExtHostContext, _mcpRegistry: IMcpRegistry, dialogService: IDialogService, _authenticationService: IAuthenticationService, authenticationMcpServersService: IAuthenticationMcpService, authenticationMCPServerAccessService: IAuthenticationMcpAccessService, authenticationMCPServerUsageService: IAuthenticationMcpUsageService, _dynamicAuthenticationProviderStorageService: IDynamicAuthenticationProviderStorageService, _extensionService: IExtensionService, _contextKeyService: IContextKeyService);
     $upsertMcpCollection(collection: McpCollectionDefinition.FromExtHost, serversDto: McpServerDefinition.Serialized[]): void;
     $deleteMcpCollection(collectionId: string): void;
     $onDidChangeState(id: number, update: McpConnectionState): void;
     $onDidPublishLog(id: number, level: LogLevel, log: string): void;
     $onDidReceiveMessage(id: number, message: string): void;
-    $getTokenFromServerMetadata(id: number, authServerComponents: UriComponents, serverMetadata: IAuthorizationServerMetadata, resourceMetadata: IAuthorizationProtectedResourceMetadata | undefined, errorOnUserInteraction?: boolean): Promise<string | undefined>;
+    $getTokenFromServerMetadata(id: number, authDetails: IMcpAuthenticationDetails, { errorOnUserInteraction, forceNewRegistration }?: IMcpAuthenticationOptions): Promise<string | undefined>;
     private continueWithIncorrectAccountPrompt;
     private loginPrompt;
     dispose(): void;