@codingame/monaco-vscode-extensions-service-override 18.4.0 → 19.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "18.4.0",
+  "version": "19.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extensions service-override",
   "keywords": [],
@@ -15,35 +15,32 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-1cb11a73-359e-5a2f-9e95-6989cc9858ee-common": "18.4.0",
-    "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "18.4.0",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "18.4.0",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "18.4.0",
-    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "18.4.0",
-    "@codingame/monaco-vscode-3a35f433-1297-5707-ab58-c261b8180e6d-common": "18.4.0",
-    "@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common": "18.4.0",
-    "@codingame/monaco-vscode-47472025-cc45-5680-86cd-09ceaba921a1-common": "18.4.0",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "18.4.0",
-    "@codingame/monaco-vscode-4ee27008-17b4-593f-9c09-19e8e3077f51-common": "18.4.0",
-    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "18.4.0",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "18.4.0",
-    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "18.4.0",
-    "@codingame/monaco-vscode-7adbeffb-8051-54a9-8c9b-b62ce9e5836f-common": "18.4.0",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "18.4.0",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "18.4.0",
-    "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "18.4.0",
-    "@codingame/monaco-vscode-a4683c2b-a0d2-5112-96ba-eedc605346d2-common": "18.4.0",
-    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "18.4.0",
-    "@codingame/monaco-vscode-api": "18.4.0",
-    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "18.4.0",
-    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "18.4.0",
-    "@codingame/monaco-vscode-c3c61c00-c254-5856-9dc9-d7929c1f9062-common": "18.4.0",
-    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "18.4.0",
-    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "18.4.0",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "18.4.0",
-    "@codingame/monaco-vscode-f48982c4-9e82-55e2-b800-20e6d1e6096f-common": "18.4.0",
-    "@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common": "18.4.0",
-    "@codingame/monaco-vscode-files-service-override": "18.4.0"
+    "@codingame/monaco-vscode-1cc4ea0a-c5b6-54ed-bb60-078a99119b55-common": "19.0.0",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "19.0.0",
+    "@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common": "19.0.0",
+    "@codingame/monaco-vscode-2726569c-a06b-5f25-b851-14311bef12fa-common": "19.0.0",
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "19.0.0",
+    "@codingame/monaco-vscode-34a0ffd3-b9f5-5699-b43b-38af5732f38a-common": "19.0.0",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "19.0.0",
+    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "19.0.0",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "19.0.0",
+    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "19.0.0",
+    "@codingame/monaco-vscode-6f931a91-88ea-5232-897f-a17ec3929ba5-common": "19.0.0",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "19.0.0",
+    "@codingame/monaco-vscode-86d65fc6-30f9-5dca-9501-e249de688591-common": "19.0.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "19.0.0",
+    "@codingame/monaco-vscode-9c72783f-914c-50be-b9ef-da16356d81a8-common": "19.0.0",
+    "@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common": "19.0.0",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "19.0.0",
+    "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common": "19.0.0",
+    "@codingame/monaco-vscode-api": "19.0.0",
+    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "19.0.0",
+    "@codingame/monaco-vscode-ca445022-b812-53ca-a041-e46c7e0b13de-common": "19.0.0",
+    "@codingame/monaco-vscode-caf773dd-ab1d-5936-941d-a2fe9e896ffc-common": "19.0.0",
+    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "19.0.0",
+    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "19.0.0",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "19.0.0",
+    "@codingame/monaco-vscode-files-service-override": "19.0.0"
   },
   "main": "index.js",
   "module": "index.js",

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementCLI.js

@@ -12,9 +12,9 @@ import { IExtensionManagementService, IExtensionGalleryService } from '@codingam
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionType, EXTENSION_CATEGORIES } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 
-const notFound = (id) => ( localize(1792, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(1804, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1793,
+    1805,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -51,7 +51,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(1794, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1806, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -66,7 +66,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localize(1795, "Installing extensions on {0}...", this.location)) : ( localize(1796, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1807, "Installing extensions on {0}...", this.location)) : ( localize(1808, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -109,11 +109,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(1797, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1809, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1798, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( new Error(( localize(1810, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -125,7 +125,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1799,
+            1811,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1800, "No extension to update")));
+            this.logger.info(( localize(1812, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1801,
+            1813,
             "Updating extensions: {0}",
             ( extensionsToUpdate.map(ext => ext.extension.identifier.id)).join(', ')
         )));
@@ -154,7 +154,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
                 this.logger.error(( localize(
-                    1802,
+                    1814,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
@@ -162,7 +162,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             else {
                 this.logger.info(( localize(
-                    1803,
+                    1815,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -177,7 +177,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        1804,
+                        1816,
                         "Extension '{0}' v{1} is already installed. Use '--force' option to update to latest version or provide '@<version>' to install a specific version, for example: '{2}@1.2.3'.",
                         id,
                         installedExtension.manifest.version,
@@ -186,7 +186,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(1805, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1817, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
                 if (installedExtension.preRelease && version !== 'prerelease') {
@@ -223,24 +223,24 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        1805,
+                        1817,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1806,
+                    1818,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1807, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1808, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1819, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1820, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(1809, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1810, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1821, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1822, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -252,7 +252,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        1811,
+                        1823,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -261,7 +261,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 else {
                     this.logger.info(( localize(
-                        1812,
+                        1824,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -280,11 +280,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         if (valid) {
             try {
                 await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
-                this.logger.info(( localize(1813, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1825, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1814, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1826, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -319,7 +319,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             const newer = installedExtensions.find(local => areSameExtensions(extensionIdentifier, local.identifier) && semverExports.gt(local.manifest.version, manifest.version));
             if (newer) {
                 this.logger.info(( localize(
-                    1815,
+                    1827,
                     "A newer version of extension '{0}' v{1} is already installed. Use '--force' option to downgrade to older version.",
                     newer.identifier.id,
                     newer.manifest.version,
@@ -347,7 +347,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( extensionsToUninstall.some(e => e.type === ExtensionType.System))) {
                 this.logger.info(( localize(
-                    1816,
+                    1828,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -355,26 +355,26 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( extensionsToUninstall.some(e => e.isBuiltin))) {
                 this.logger.info(( localize(
-                    1817,
+                    1829,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1818, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1830, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    1819,
+                    1831,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(1820, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1832, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -392,7 +392,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1821, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1822, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1833, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1834, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( __decorate([

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

@@ -1,6 +1,6 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
-import { IAuthenticationCreateSessionOptions, AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationProvider, AuthenticationSessionAccount, IAuthenticationProviderSessionOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication";
+import { AuthenticationSession, AuthenticationSessionsChangeEvent, IAuthenticationProvider, AuthenticationSessionAccount, IAuthenticationProviderSessionOptions } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication";
 import { IAuthenticationExtensionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { IAuthenticationService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service";
 import { ExtHostAuthenticationShape, MainThreadAuthenticationShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
@@ -37,11 +37,10 @@ export declare class MainThreadAuthenticationProvider extends Disposable impleme
     readonly label: string;
     readonly supportsMultipleAccounts: boolean;
     readonly authorizationServers: ReadonlyArray<URI>;
-    private readonly notificationService;
     readonly onDidChangeSessions: Event<AuthenticationSessionsChangeEvent>;
-    constructor(_proxy: ExtHostAuthenticationShape, id: string, label: string, supportsMultipleAccounts: boolean, authorizationServers: ReadonlyArray<URI>, notificationService: INotificationService, onDidChangeSessionsEmitter: Emitter<AuthenticationSessionsChangeEvent>);
+    constructor(_proxy: ExtHostAuthenticationShape, id: string, label: string, supportsMultipleAccounts: boolean, authorizationServers: ReadonlyArray<URI>, onDidChangeSessionsEmitter: Emitter<AuthenticationSessionsChangeEvent>);
     getSessions(scopes: string[] | undefined, options: IAuthenticationProviderSessionOptions): Promise<readonly AuthenticationSession[]>;
-    createSession(scopes: string[], options: IAuthenticationCreateSessionOptions): Promise<AuthenticationSession>;
+    createSession(scopes: string[], options: IAuthenticationProviderSessionOptions): Promise<AuthenticationSession>;
     removeSession(sessionId: string): Promise<void>;
 }
 export declare class MainThreadAuthentication extends Disposable implements MainThreadAuthenticationShape {
@@ -61,6 +60,7 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     private readonly _proxy;
     private readonly _registrations;
     private _sentProviderUsageEvents;
+    private _suppressUnregisterEvent;
     constructor(extHostContext: IExtHostContext, authenticationService: IAuthenticationService, authenticationExtensionsService: IAuthenticationExtensionsService, authenticationAccessService: IAuthenticationAccessService, authenticationUsageService: IAuthenticationUsageService, dialogService: IDialogService, notificationService: INotificationService, extensionService: IExtensionService, telemetryService: ITelemetryService, openerService: IOpenerService, logService: ILogService, urlService: IURLService, dynamicAuthProviderStorageService: IDynamicAuthenticationProviderStorageService, clipboardService: IClipboardService);
     $registerAuthenticationProvider(id: string, label: string, supportsMultipleAccounts: boolean, supportedAuthorizationServer?: UriComponents[]): Promise<void>;
     $unregisterAuthenticationProvider(id: string): Promise<void>;
@@ -73,6 +73,12 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     $setSessionsForDynamicAuthProvider(authProviderId: string, clientId: string, sessions: (IAuthorizationTokenResponse & {
         created_at: number;
     })[]): Promise<void>;
+    $sendDidChangeDynamicProviderInfo({ providerId, clientId, authorizationServer, label }: Partial<{
+        providerId: string;
+        clientId: string;
+        authorizationServer: UriComponents;
+        label: string;
+    }>): Promise<void>;
     private loginPrompt;
     private continueWithIncorrectAccountPrompt;
     private doGetSession;

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

@@ -3,7 +3,6 @@ import { __decorate, __param } from '@codingame/monaco-vscode-api/external/tslib
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
-import { INTERNAL_AUTH_PROVIDER_PREFIX } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
 import { IAuthenticationService, IAuthenticationExtensionsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
@@ -27,14 +26,13 @@ import { IDynamicAuthenticationProviderStorageService } from '@codingame/monaco-
 import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 
 class MainThreadAuthenticationProvider extends Disposable {
-    constructor(_proxy, id, label, supportsMultipleAccounts, authorizationServers, notificationService, onDidChangeSessionsEmitter) {
+    constructor(_proxy, id, label, supportsMultipleAccounts, authorizationServers, onDidChangeSessionsEmitter) {
         super();
         this._proxy = _proxy;
         this.id = id;
         this.label = label;
         this.supportsMultipleAccounts = supportsMultipleAccounts;
         this.authorizationServers = authorizationServers;
-        this.notificationService = notificationService;
         this.onDidChangeSessions = onDidChangeSessionsEmitter.event;
     }
     async getSessions(scopes, options) {
@@ -45,7 +43,6 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
-        this.notificationService.info(( localize(2387, "Successfully signed out.")));
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
@@ -66,10 +63,15 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         this.clipboardService = clipboardService;
         this._registrations = this._register(( new DisposableMap()));
         this._sentProviderUsageEvents = ( new Set());
+        this._suppressUnregisterEvent = false;
         this._sentClientIdUsageEvents = ( new Set());
         this._proxy = ( extHostContext.getProxy(ExtHostContext.ExtHostAuthentication));
         this._register(this.authenticationService.onDidChangeSessions(e => this._proxy.$onDidChangeAuthenticationSessions(e.providerId, e.label)));
-        this._register(this.authenticationService.onDidUnregisterAuthenticationProvider(e => this._proxy.$onDidUnregisterAuthenticationProvider(e.id)));
+        this._register(this.authenticationService.onDidUnregisterAuthenticationProvider(e => {
+            if (!this._suppressUnregisterEvent) {
+                this._proxy.$onDidUnregisterAuthenticationProvider(e.id);
+            }
+        }));
         this._register(this.authenticationExtensionsService.onDidChangeAccountPreference(e => {
             const providerInfo = this.authenticationService.getProvider(e.providerId);
             this._proxy.$onDidChangeAuthenticationSessions(providerInfo.id, providerInfo.label, e.extensionIds);
@@ -80,7 +82,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         this._register(authenticationService.registerAuthenticationProviderHostDelegate({
             priority: extHostContext.extensionHostKind === ExtensionHostKind.LocalWebWorker ? 0 : 1,
             create: async (authorizationServer, serverMetadata, resource) => {
-                const authProviderId = ( authorizationServer.toString(true));
+                const authProviderId = resource ? `${( authorizationServer.toString(true))} ${resource.resource}` : ( authorizationServer.toString(true));
                 const clientId = this.dynamicAuthProviderStorageService.getClientId(authProviderId);
                 let initialTokens = undefined;
                 if (clientId) {
@@ -104,14 +106,19 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             label,
             supportsMultipleAccounts,
             supportedAuthorizationServerUris,
-            this.notificationService,
             emitter
         ));
         this.authenticationService.registerAuthenticationProvider(id, provider);
     }
     async $unregisterAuthenticationProvider(id) {
         this._registrations.deleteAndDispose(id);
-        this.authenticationService.unregisterAuthenticationProvider(id);
+        this._suppressUnregisterEvent = true;
+        try {
+            this.authenticationService.unregisterAuthenticationProvider(id);
+        }
+        finally {
+            this._suppressUnregisterEvent = false;
+        }
     }
     async $ensureProvider(id) {
         if (!this.authenticationService.isAuthenticationProviderRegistered(id)) {
@@ -146,8 +153,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2388, "Yes"));
-        const no = ( localize(2389, "No"));
+        const yes = ( localize(2404, "Yes"));
+        const no = ( localize(2405, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -164,32 +171,38 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return deferredPromise.p;
     }
     async $registerDynamicAuthenticationProvider(id, label, authorizationServer, clientId) {
-        await this.$registerAuthenticationProvider(id, label, false, [authorizationServer]);
+        await this.$registerAuthenticationProvider(id, label, true, [authorizationServer]);
         this.dynamicAuthProviderStorageService.storeClientId(id, ( URI.revive(authorizationServer).toString(true)), clientId, label);
     }
     async $setSessionsForDynamicAuthProvider(authProviderId, clientId, sessions) {
         await this.dynamicAuthProviderStorageService.setSessionsForDynamicAuthProvider(authProviderId, clientId, sessions);
     }
+    async $sendDidChangeDynamicProviderInfo({ providerId, clientId, authorizationServer, label }) {
+        this.logService.info(`Client ID for authentication provider ${providerId} changed to ${clientId}`);
+        const existing = this.dynamicAuthProviderStorageService.getInteractedProviders().find(p => p.providerId === providerId);
+        if (!existing) {
+            throw ( new Error(
+                `Dynamic authentication provider ${providerId} not found. Has it been registered?`
+            ));
+        }
+        this.dynamicAuthProviderStorageService.storeClientId(providerId || existing.providerId, authorizationServer ? ( URI.revive(authorizationServer).toString(true)) : existing.authorizationServer, clientId || existing.clientId, label || existing.label);
+    }
     async loginPrompt(provider, extensionName, recreatingSession, options) {
         let message;
-        if (provider.id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
-            message = ( localize(
-                2390,
-                "The extension '{0}' wants to access the language models provided by {1}.",
-                extensionName,
-                provider.label
-            ));
+        const customMessage = provider.confirmation?.(extensionName, recreatingSession);
+        if (customMessage) {
+            message = customMessage;
         }
         else {
             message = recreatingSession
                 ? ( localize(
-                2391,
+                2406,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                2392,
+                2407,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -197,7 +210,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(2393, "&&Allow")),
+                label: ( localize(2408, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -205,7 +218,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2394, "Learn more")),
+                label: ( localize(2409, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -224,9 +237,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2395, "Incorrect account detected")),
+            message: ( localize(2410, "Incorrect account detected")),
             detail: ( localize(
-                2396,
+                2411,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -235,11 +248,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2397, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2412, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2398, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2413, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -393,16 +406,16 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     async $showDeviceCodeModal(userCode, verificationUri) {
         const { result } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2399, "Device Code Authentication")),
+            message: ( localize(2414, "Device Code Authentication")),
             detail: ( localize(
-                2400,
+                2415,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [
                 {
-                    label: ( localize(2401, "Copy & Continue")),
+                    label: ( localize(2416, "Copy & Continue")),
                     run: () => true
                 }
             ],
@@ -414,7 +427,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 return await this.openerService.open(( URI.parse(verificationUri)));
             }
             catch (error) {
-                this.notificationService.error(( localize(2402, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2417, "Failed to open {0}", verificationUri)));
             }
         }
         return false;

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

@@ -7,7 +7,7 @@ import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
-import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-4372ad43-a220-5e78-83e6-95a9cfd64384-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
+import { ResourceNotebookCellEdit } from '@codingame/monaco-vscode-271a23cd-c7d7-5761-ae35-a923a42987b8-common/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
 import { CellEditType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 

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

@@ -92,7 +92,7 @@ let RemoteExtensionManagementCLI = class RemoteExtensionManagementCLI extends Ex
         if (!this._extensionManifestPropertiesService.canExecuteOnWorkspace(manifest)
             && !(isWeb && this._extensionManifestPropertiesService.canExecuteOnWeb(manifest))) {
             this.logger.info(( localize(
-                2403,
+                2418,
                 "Cannot install the '{0}' extension because it is declared to not run in this setup.",
                 getExtensionId(manifest.publisher, manifest.name)
             )));

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

@@ -7,6 +7,7 @@ import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marsh
 import { escapeRegExpCharacters } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { ThemeIcon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/themables';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { getWordAtText } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/wordHelper';
 import { CompletionItemKind } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/languages';
@@ -16,13 +17,12 @@ import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
 import { IUriIdentityService } from '@codingame/monaco-vscode-api/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/browser/chat.service';
-import { ChatInputPart } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/browser/chatInputPart';
 import { IChatAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatAgents.service';
 import { IChatEditingService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatEditingService.service';
-import { ChatRequestAgentPart } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-fab30422-b487-5f4e-8d30-8b4d266e3fcd-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { ChatRequestAgentPart } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
+import { ChatRequestParser } from '@codingame/monaco-vscode-9ebd6daf-8734-5a28-ad24-b238f5e5819d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
-import { ChatMode, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
+import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 import { IExtensionService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ExtHostContext, MainContext } from '@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol';
@@ -111,7 +111,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         }
         const inputValue = widget?.inputEditor.getValue() ?? '';
         const location = widget.location;
-        const mode = widget.input.currentMode;
+        const mode = widget.input.currentModeKind;
         this._chatService.transferChatSession({ sessionId, inputValue, location, mode }, URI.revive(toWorkspace));
     }
     async $registerAgent(handle, extension, id, metadata, dynamicProps) {
@@ -147,6 +147,9 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             provideChatTitle: (history, token) => {
                 return this._proxy.$provideChatTitle(handle, history, token);
             },
+            provideChatSummary: (history, token) => {
+                return this._proxy.$provideChatSummary(handle, history, token);
+            },
         };
         let disposable;
         if (!staticAgentRegistration && dynamicProps) {
@@ -164,7 +167,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 slashCommands: [],
                 disambiguation: [],
                 locations: [ChatAgentLocation.Panel],
-                modes: [ChatMode.Ask]
+                modes: [ChatModeKind.Ask]
             }, impl);
         }
         else {
@@ -255,7 +258,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             return ( completions.map((c) => ({ ...c, icon: c.icon ? ThemeIcon.fromId(c.icon) : undefined })));
         };
         this._agentIdsToCompletionProviders.set(id, this._chatAgentService.registerAgentCompletionProvider(id, provide));
-        this._agentCompletionProviders.set(handle, this._languageFeaturesService.completionProvider.register({ scheme: ChatInputPart.INPUT_SCHEME, hasAccessToAllModels: true }, {
+        this._agentCompletionProviders.set(handle, this._languageFeaturesService.completionProvider.register({ scheme: Schemas.vscodeChatInput, hasAccessToAllModels: true }, {
             _debugDisplayName: 'chatAgentCompletions:' + handle,
             triggerCharacters,
             provideCompletionItems: async (model, position, _context, token) => {