@codingame/monaco-vscode-extensions-service-override 21.5.1 → 22.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "21.5.1",
+  "version": "22.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extensions service-override",
   "keywords": [],
@@ -15,35 +15,34 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common": "21.5.1",
-    "@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common": "21.5.1",
-    "@codingame/monaco-vscode-23b6fb38-5e58-5886-b34b-27abc4f5df02-common": "21.5.1",
-    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "21.5.1",
-    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "21.5.1",
-    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "21.5.1",
-    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "21.5.1",
-    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "21.5.1",
-    "@codingame/monaco-vscode-4dda7789-5a25-5e8b-b2de-c2f11b1b96e5-common": "21.5.1",
-    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "21.5.1",
-    "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-common": "21.5.1",
-    "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common": "21.5.1",
-    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "21.5.1",
-    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "21.5.1",
-    "@codingame/monaco-vscode-71c8dbff-4c98-552f-aef0-e72b00fdcfc0-common": "21.5.1",
-    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "21.5.1",
-    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "21.5.1",
-    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "21.5.1",
-    "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common": "21.5.1",
-    "@codingame/monaco-vscode-api": "21.5.1",
-    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "21.5.1",
-    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "21.5.1",
-    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "21.5.1",
-    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "21.5.1",
-    "@codingame/monaco-vscode-d0569cfb-4706-5ad6-b0b0-5115ad8685db-common": "21.5.1",
-    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "21.5.1",
-    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "21.5.1",
-    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "21.5.1",
-    "@codingame/monaco-vscode-files-service-override": "21.5.1"
+    "@codingame/monaco-vscode-05a2a821-e4de-5941-b7f9-bbf01c09f229-common": "22.0.0",
+    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "22.0.0",
+    "@codingame/monaco-vscode-256d5b78-0649-50e9-8354-2807f95f68f4-common": "22.0.0",
+    "@codingame/monaco-vscode-2a94c04a-b85b-5669-b06b-89c1bfa11cb9-common": "22.0.0",
+    "@codingame/monaco-vscode-4a3ac544-9a61-534c-88df-756262793ef7-common": "22.0.0",
+    "@codingame/monaco-vscode-4bf376c2-03c7-58cb-8303-c67aeefa3d3d-common": "22.0.0",
+    "@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common": "22.0.0",
+    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "22.0.0",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "22.0.0",
+    "@codingame/monaco-vscode-622c0cca-d5fa-59b6-b730-0715afcf93ee-common": "22.0.0",
+    "@codingame/monaco-vscode-670aae94-7f88-54d7-90ea-6fcbef423557-common": "22.0.0",
+    "@codingame/monaco-vscode-6845754f-e617-5ed9-8aaa-6ca3653a9532-common": "22.0.0",
+    "@codingame/monaco-vscode-7969284a-1a12-5148-9750-fcf9656a693f-common": "22.0.0",
+    "@codingame/monaco-vscode-7f39b6f1-3542-5430-8760-0f404d7a7cee-common": "22.0.0",
+    "@codingame/monaco-vscode-8ccb7637-50ea-5359-97bf-00015d7fe567-common": "22.0.0",
+    "@codingame/monaco-vscode-a17e9d37-b6c1-5556-8402-5db73960fae3-common": "22.0.0",
+    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "22.0.0",
+    "@codingame/monaco-vscode-a8d3bd74-e63e-5327-96e8-4f931661e329-common": "22.0.0",
+    "@codingame/monaco-vscode-a9da9abe-278d-5ce6-9418-99c7c07c5c37-common": "22.0.0",
+    "@codingame/monaco-vscode-api": "22.0.0",
+    "@codingame/monaco-vscode-b994942c-360d-5b68-8a33-77d4bde6b714-common": "22.0.0",
+    "@codingame/monaco-vscode-bba55be6-41a2-50cd-a3cc-8bafa35bfa89-common": "22.0.0",
+    "@codingame/monaco-vscode-bf94ddb5-e436-506a-9763-5ab86b642508-common": "22.0.0",
+    "@codingame/monaco-vscode-caeb744c-8e3f-5c11-80fb-0f057d24d544-common": "22.0.0",
+    "@codingame/monaco-vscode-eb7d5efd-2e60-59f8-9ba4-9a8ae8cb2957-common": "22.0.0",
+    "@codingame/monaco-vscode-eba0b9b3-174c-5dae-9867-a37810ca1808-common": "22.0.0",
+    "@codingame/monaco-vscode-f22e7e55-aee8-5b52-a6bc-950efd9f5890-common": "22.0.0",
+    "@codingame/monaco-vscode-files-service-override": "22.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(1820, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(1822, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    1821,
+    1823,
     "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(1822, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(1824, "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(1823, "Installing extensions on {0}...", this.location)) : ( localize(1824, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(1825, "Installing extensions on {0}...", this.location)) : ( localize(1826, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -109,11 +109,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(1825, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(1827, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( new Error(( localize(1826, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( new Error(( localize(1828, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -125,7 +125,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            1827,
+            1829,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -142,11 +142,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(1828, "No extension to update")));
+            this.logger.info(( localize(1830, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            1829,
+            1831,
             "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(
-                    1830,
+                    1832,
                     "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(
-                    1831,
+                    1833,
                     "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(
-                        1832,
+                        1834,
                         "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(1833, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(1835, "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(
-                        1833,
+                        1835,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    1834,
+                    1836,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(1835, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1836, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1837, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(1838, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(1837, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1838, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(1839, "Installing extension '{0}' v{1}...", id, version)) : ( localize(1840, "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(
-                        1839,
+                        1841,
                         "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(
-                        1840,
+                        1842,
                         "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(1841, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(1843, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(1842, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(1844, "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(
-                    1843,
+                    1845,
                     "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(
-                    1844,
+                    1846,
                     "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(
-                    1845,
+                    1847,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(1846, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(1848, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    1847,
+                    1849,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(1848, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(1850, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -392,7 +392,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(1849, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1850, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(1851, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(1852, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( __decorate([

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

@@ -1,9 +1,9 @@
 import { Disposable } from "@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
-import { AuthenticationSession, AuthenticationSessionsChangeEvent, AuthenticationSessionAccount } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication";
+import { AuthenticationSession, AuthenticationSessionsChangeEvent, AuthenticationSessionAccount, IAuthenticationWwwAuthenticateRequest } 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 { AuthenticationWWWAuthenticateRequest, MainThreadAuthenticationShape } from "@codingame/monaco-vscode-api/vscode/vs/workbench/api/common/extHost.protocol";
+import { MainThreadAuthenticationShape } 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";
 import { INotificationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service";
 import { IExtensionService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/extensions.service";
@@ -72,7 +72,7 @@ export declare class MainThreadAuthentication extends Disposable implements Main
     private loginPrompt;
     private continueWithIncorrectAccountPrompt;
     private doGetSession;
-    $getSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | AuthenticationWWWAuthenticateRequest, extensionId: string, extensionName: string, options: AuthenticationGetSessionOptions): Promise<AuthenticationSession | undefined>;
+    $getSession(providerId: string, scopeListOrRequest: ReadonlyArray<string> | IAuthenticationWwwAuthenticateRequest, extensionId: string, extensionName: string, options: AuthenticationGetSessionOptions): Promise<AuthenticationSession | undefined>;
     $getAccounts(providerId: string): Promise<ReadonlyArray<AuthenticationSessionAccount>>;
     private _sentClientIdUsageEvents;
     private sendClientIdUsageTelemetry;

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

@@ -3,7 +3,7 @@ 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 { isAuthenticationWWWAuthenticateRequest } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/authentication/common/authentication';
+import { isAuthenticationWwwAuthenticateRequest } 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';
@@ -178,8 +178,8 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return await deferredPromise.p;
     }
     $showContinueNotification(message) {
-        const yes = ( localize(2424, "Yes"));
-        const no = ( localize(2425, "No"));
+        const yes = ( localize(2429, "Yes"));
+        const no = ( localize(2430, "No"));
         const deferredPromise = ( new DeferredPromise());
         let result = false;
         const handle = this.notificationService.prompt(Severity.Warning, message, [{
@@ -221,13 +221,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                2426,
+                2431,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                2427,
+                2432,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -235,7 +235,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(2428, "&&Allow")),
+                label: ( localize(2433, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -243,7 +243,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(2429, "Learn more")),
+                label: ( localize(2434, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -262,9 +262,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(2430, "Incorrect account detected")),
+            message: ( localize(2435, "Incorrect account detected")),
             detail: ( localize(
-                2431,
+                2436,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -273,11 +273,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(2432, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(2437, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(2433, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(2438, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -371,15 +371,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         return undefined;
     }
     async $getSession(providerId, scopeListOrRequest, extensionId, extensionName, options) {
-        const scopes = isAuthenticationWWWAuthenticateRequest(scopeListOrRequest) ? scopeListOrRequest.scopes : scopeListOrRequest;
+        const scopes = isAuthenticationWwwAuthenticateRequest(scopeListOrRequest) ? scopeListOrRequest.fallbackScopes : scopeListOrRequest;
         if (scopes) {
             this.sendClientIdUsageTelemetry(extensionId, providerId, scopes);
         }
         const session = await this.doGetSession(providerId, scopeListOrRequest, extensionId, extensionName, options);
         if (session) {
             this.sendProviderUsageTelemetry(extensionId, providerId);
-            const scopes = isAuthenticationWWWAuthenticateRequest(scopeListOrRequest) ? scopeListOrRequest.scopes : scopeListOrRequest;
-            this.authenticationUsageService.addAccountUsage(providerId, session.account.label, scopes, extensionId, extensionName);
+            this.authenticationUsageService.addAccountUsage(providerId, session.account.label, session.scopes, extensionId, extensionName);
         }
         return session;
     }
@@ -420,16 +419,16 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     async $showDeviceCodeModal(userCode, verificationUri) {
         const { result } = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2434, "Device Code Authentication")),
+            message: ( localize(2439, "Device Code Authentication")),
             detail: ( localize(
-                2435,
+                2440,
                 "Your code: {0}\n\nTo complete authentication, navigate to {1} and enter the code above.",
                 userCode,
                 verificationUri
             )),
             buttons: [
                 {
-                    label: ( localize(2436, "Copy & Continue")),
+                    label: ( localize(2441, "Copy & Continue")),
                     run: () => true
                 }
             ],
@@ -441,46 +440,56 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                 return await this.openerService.open(( URI.parse(verificationUri)));
             }
             catch (error) {
-                this.notificationService.error(( localize(2437, "Failed to open {0}", verificationUri)));
+                this.notificationService.error(( localize(2442, "Failed to open {0}", verificationUri)));
             }
         }
         return false;
     }
     async $promptForClientRegistration(authorizationServerUrl) {
+        const redirectUrls = 'http://127.0.0.1:33418\nhttps://vscode.dev/redirect';
         const result = await this.dialogService.prompt({
             type: Severity.Info,
-            message: ( localize(2438, "Dynamic Client Registration not supported")),
+            message: ( localize(2443, "Dynamic Client Registration not supported")),
             detail: ( localize(
-                2439,
-                "The authorization server '{0}' does not support automatic client registration. Do you want to proceed by manually providing a client registration (client ID)?\n\nNote: When registering your OAuth application, make sure to include these redirect URIs:\nhttp://127.0.0.1:33418\nhttps://vscode.dev/redirect",
-                authorizationServerUrl
+                2444,
+                "The authorization server '{0}' does not support automatic client registration. Do you want to proceed by manually providing a client registration (client ID)?\n\nNote: When registering your OAuth application, make sure to include these redirect URIs:\n{1}",
+                authorizationServerUrl,
+                redirectUrls
             )),
             buttons: [
                 {
-                    label: ( localize(2440, "Proceed")),
-                    run: () => true
-                }
+                    label: ( localize(2445, "Copy URIs & Proceed")),
+                    run: async () => {
+                        try {
+                            await this.clipboardService.writeText(redirectUrls);
+                        }
+                        catch (error) {
+                            this.notificationService.error(( localize(2446, "Failed to copy redirect URIs to clipboard.")));
+                        }
+                        return true;
+                    }
+                },
             ],
             cancelButton: {
-                label: ( localize(2441, "Cancel")),
+                label: ( localize(2447, "Cancel")),
                 run: () => false
             }
         });
         if (!result) {
             return undefined;
         }
-        const sharedTitle = ( localize(2442, "Add Client Registration Details"));
+        const sharedTitle = ( localize(2448, "Add Client Registration Details"));
         const clientId = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2443,
+                2449,
                 "Enter an existing client ID that has been registered with the following redirect URIs: http://127.0.0.1:33418, https://vscode.dev/redirect"
             )),
-            placeHolder: ( localize(2444, "OAuth client ID (azye39d...)")),
+            placeHolder: ( localize(2450, "OAuth client ID (azye39d...)")),
             ignoreFocusLost: true,
             validateInput: async (value) => {
                 if (!value || value.trim().length === 0) {
-                    return localize(2445, "Client ID is required");
+                    return localize(2451, "Client ID is required");
                 }
                 return undefined;
             }
@@ -491,11 +500,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         const clientSecret = await this.quickInputService.input({
             title: sharedTitle,
             prompt: ( localize(
-                2446,
+                2452,
                 "(optional) Enter an existing client secret associated with the client id '{0}' or leave this field blank",
                 clientId
             )),
-            placeHolder: ( localize(2447, "OAuth client secret (wer32o50f...) or leave it blank")),
+            placeHolder: ( localize(2453, "OAuth client secret (wer32o50f...) or leave it blank")),
             password: true,
             ignoreFocusLost: true
         });

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(
-                2448,
+                2454,
                 "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

@@ -4,10 +4,10 @@ import { DeferredPromise } from '@codingame/monaco-vscode-api/vscode/vs/base/com
 import { Emitter } from '@codingame/monaco-vscode-api/vscode/vs/base/common/event';
 import { Disposable, DisposableMap } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { revive } from '@codingame/monaco-vscode-api/vscode/vs/base/common/marshalling';
+import { Schemas } from '@codingame/monaco-vscode-api/vscode/vs/base/common/network';
 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';
@@ -20,7 +20,7 @@ import { IChatWidgetService } from '@codingame/monaco-vscode-api/vscode/vs/workb
 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-b994942c-360d-5b68-8a33-77d4bde6b714-common/vscode/vs/workbench/contrib/chat/common/chatParserTypes';
-import { ChatRequestParser } from '@codingame/monaco-vscode-0af61f78-dfc5-57ba-8d32-66268c8de38d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
+import { ChatRequestParser } from '@codingame/monaco-vscode-5084de40-f866-5cb5-9d9b-33a10f6f235d-common/vscode/vs/workbench/contrib/chat/common/chatRequestParser';
 import { IChatService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService.service';
 import { ChatModeKind, ChatAgentLocation } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/constants';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
@@ -129,7 +129,8 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
             invoke: async (request, progress, history, token) => {
                 this._pendingProgress.set(request.requestId, progress);
                 try {
-                    return (await this._proxy.$invokeAgent(handle, request, { history }, token)) ?? {};
+                    const chatSessionContext = this._chatService.getChatSessionFromInternalId(request.sessionId);
+                    return (await this._proxy.$invokeAgent(handle, request, { history, chatSessionContext }, token)) ?? {};
                 }
                 finally {
                     this._pendingProgress.delete(request.requestId);
@@ -167,7 +168,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
                 metadata: revive(metadata),
                 slashCommands: [],
                 disambiguation: [],
-                locations: [ChatAgentLocation.Panel],
+                locations: [ChatAgentLocation.Chat],
                 modes: [ChatModeKind.Ask, ChatModeKind.Agent, ChatModeKind.Edit],
             }, impl);
         }
@@ -177,7 +178,7 @@ let MainThreadChatAgents2 = class MainThreadChatAgents2 extends Disposable {
         this._agents.set(handle, {
             id: id,
             extensionId: extension,
-            dispose: disposable.dispose,
+            dispose: () => disposable.dispose(),
             hasFollowups: metadata.hasFollowups
         });
     }

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

@@ -7,7 +7,8 @@ import { IChatAgentRequest } from "@codingame/monaco-vscode-b994942c-360d-5b68-8
 import { IChatContentInlineReference, IChatProgress } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatService";
 import { ChatSession, IChatSessionHistoryItem } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService";
 import { IChatSessionsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/chatSessionsService.service";
-import { EditorGroupColumn } from "@codingame/monaco-vscode-5e2c24a1-3217-55e8-bc90-521eaf7df5a6-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 { IEditorGroupsService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorGroupsService.service";
 import { IEditorService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service";
 import { IExtHostContext } from "../../services/extensions/common/extHostCustomers.js";
 import { Dto } from "@codingame/monaco-vscode-api/vscode/vs/workbench/services/extensions/common/proxyIdentifier";
@@ -57,6 +58,7 @@ export declare class MainThreadChatSessions extends Disposable implements MainTh
     private readonly _chatSessionsService;
     private readonly _dialogService;
     private readonly _editorService;
+    private readonly editorGroupService;
     private readonly _logService;
     private readonly _viewsService;
     private readonly _itemProvidersRegistrations;
@@ -64,9 +66,10 @@ export declare class MainThreadChatSessions extends Disposable implements MainTh
     private readonly _activeSessions;
     private readonly _sessionDisposables;
     private readonly _proxy;
-    constructor(_extHostContext: IExtHostContext, _chatSessionsService: IChatSessionsService, _dialogService: IDialogService, _editorService: IEditorService, _logService: ILogService, _viewsService: IViewsService);
+    constructor(_extHostContext: IExtHostContext, _chatSessionsService: IChatSessionsService, _dialogService: IDialogService, _editorService: IEditorService, editorGroupService: IEditorGroupsService, _logService: ILogService, _viewsService: IViewsService);
     $registerChatSessionItemProvider(handle: number, chatSessionType: string): void;
     $onDidChangeChatSessionItems(handle: number): void;
+    $onDidCommitChatSessionItem(handle: number, original: string, modified: string): void;
     private _provideChatSessionItems;
     private _provideNewChatSessionItem;
     private _provideChatSessionContent;