@codingame/monaco-vscode-extensions-service-override 8.0.4 → 9.0.2

package/assets/{webWorkerExtensionHostIframe.html → webWorkerExtensionHostIframe.esm.html}

@@ -4,21 +4,19 @@
 		<meta http-equiv="Content-Security-Policy" content="
 			default-src 'none';
 			child-src 'self' data: blob:;
-			script-src 'self' 'unsafe-eval' 'sha256-OTnWt0xD0mDGlMgzQref1DqApnE9MipgFz2t0Q/3vcE=' https:;
+			script-src 'self' 'unsafe-eval' 'sha256-8MVeUdk5qF4PxUj/3OPSsosE9rIR9mo+m5ulCU+h+VI=' https: http://localhost:* blob:;
 			connect-src 'self' https: wss: http://localhost:* http://127.0.0.1:* ws://localhost:* ws://127.0.0.1:*;"/>
 	</head>
 	<body>
 	<script>
-(function() {
+(function () {
 	const searchParams = new URL(document.location.href).searchParams;
 	const vscodeWebWorkerExtHostId = searchParams.get('vscodeWebWorkerExtHostId') || '';
-	const name = searchParams.get('debugged') ? 'DebugWorkerExtensionHost' : 'WorkerExtensionHost';
+	const name = searchParams.get('debugged') ? 'DebugExtensionHostWorker' : 'ExtensionHostWorker';
 	const parentOrigin = searchParams.get('parentOrigin') || window.origin;
 	const salt = searchParams.get('salt');
-	const vscodeExtHostWorkerSrc = searchParams.get('vscodeExtHostWorkerSrc');
-	const vscodeExtHostWorkerOptions = JSON.parse(searchParams.get('vscodeExtHostWorkerOptions') ?? '{}');
 
-	(async function() {
+	(async function () {
 		const hostnameValidationMarker = 'v--';
 		const hostname = location.hostname;
 		if (!hostname.startsWith(hostnameValidationMarker)) {
@@ -30,8 +28,9 @@
 			return sendError(new Error(`Cannot validate in current context!`));
 		}
 
-		// Here the `parentOriginHash()` function from `src/vs/workbench/common/webview.ts` is inlined
+		// Here the `parentOriginHash()` function from `src/vs/base/browser/iframe.ts` is inlined
 		// compute a sha-256 composed of `parentOrigin` and `salt` converted to base 32
+		/** @type {string} */
 		let parentOriginHash;
 		try {
 			const strData = JSON.stringify({ parentOrigin, salt });
@@ -42,7 +41,7 @@
 			const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join('');
 			// sha256 has 256 bits, so we need at most ceil(lg(2^256-1)/lg(32)) = 52 chars to represent it in base 32
 			parentOriginHash = BigInt(`0x${hashHex}`).toString(32).padStart(52, '0');
-		} catch(err) {
+		} catch (err) {
 			return sendError(err instanceof Error ? err : new Error(String(err)));
 		}
 
@@ -67,13 +66,50 @@
 	}
 
 	function start() {
+
+		// Before we can load the worker, we need to get the current set of NLS
+		// configuration into this iframe. We ask the parent window to send it
+		// together with the necessary information to load the worker via Blob.
+
+		const bootstrapNlsType = 'vscode.bootstrap.nls';
+
+		self.onmessage = (event) => {
+			if (event.origin !== parentOrigin || event.data.type !== bootstrapNlsType) {
+				return;
+			}
+			const { data } = event.data;
+			createWorker(data.baseUrl, data.workerUrl, data.fileRoot, data.nls.messages, data.nls.language);
+		};
+
+		window.parent.postMessage({
+			vscodeWebWorkerExtHostId,
+			type: bootstrapNlsType
+		}, '*');
+	}
+
+	function createWorker(baseUrl, workerUrl, fileRoot, nlsMessages, nlsLanguage) {
 		try {
-			let workerUrl = vscodeExtHostWorkerSrc
-			if(globalThis.crossOriginIsolated) {
+			if (globalThis.crossOriginIsolated) {
 				workerUrl += '?vscode-coi=2'; // COEP
 			}
 
-			const worker = new Worker(workerUrl, Object.assign({ name }, vscodeExtHostWorkerOptions));
+			const isESM = true;
+
+			const blob = new Blob([[
+				`/*extensionHostWorker*/`,
+				`globalThis.MonacoEnvironment = { baseUrl: '${baseUrl}' };`,
+				`globalThis._VSCODE_NLS_MESSAGES = ${JSON.stringify(nlsMessages)};`,
+				`globalThis._VSCODE_NLS_LANGUAGE = ${JSON.stringify(nlsLanguage)};`,
+				`globalThis._VSCODE_FILE_ROOT = '${fileRoot}';`,
+				isESM ? `await import('${workerUrl}');` : `importScripts('${workerUrl}');`,
+				`/*extensionHostWorker*/`
+			].join('')], { type: 'application/javascript' });
+
+			const worker = new Worker(URL.createObjectURL(blob), { name, type: isESM ? 'module' : undefined });
+			if (!isESM) {
+				// Note: cannot postMessage into a worker that is ESM because imports are async
+				worker.postMessage('vs/workbench/api/worker/extensionHostWorker');
+			}
 			const nestedWorkers = new Map();
 
 			worker.onmessage = (event) => {
@@ -83,12 +119,12 @@
 					const { id, port, url, options } = data;
 					const newWorker = new Worker(url, options);
 					newWorker.postMessage(port, [port]);
-					worker.onerror = console.error.bind(console);
+					newWorker.onerror = console.error.bind(console);
 					nestedWorkers.set(id, newWorker);
 
 				} else if (data?.type === '_terminateWorker') {
 					const { id } = data;
-					if(nestedWorkers.has(id)) {
+					if (nestedWorkers.has(id)) {
 						nestedWorkers.get(id).terminate();
 						nestedWorkers.delete(id);
 					}
@@ -111,8 +147,8 @@
 					return;
 				}
 				worker.postMessage(event.data, event.ports);
-			}
-		} catch(err) {
+			};
+		} catch (err) {
 			console.error(err);
 			sendError(err);
 		}

package/extensions.js

@@ -2,7 +2,7 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { ILifecycleService } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle.service';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
-import { ILogService, ILoggerService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
@@ -24,10 +24,6 @@ import { ExtensionsProposedApi } from './vscode/src/vs/workbench/services/extens
 import { BrowserExtensionHostFactory, BrowserExtensionHostKindPicker, ExtensionService } from './vscode/src/vs/workbench/services/extensions/browser/extensionService.js';
 export { ExtensionHostKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionHostKind';
 import { WebWorkerExtensionHost } from './vscode/src/vs/workbench/services/extensions/browser/webWorkerExtensionHost.js';
-import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
-import { ILayoutService } from 'vscode/vscode/vs/platform/layout/browser/layoutService.service';
-import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
-import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label.service';
 import { IUserDataProfileService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { IRemoteExplorerService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteExplorerService.service';
@@ -122,41 +118,14 @@ import './vscode/src/vs/workbench/api/browser/mainThreadProfileContentHandlers.j
 import './vscode/src/vs/workbench/api/browser/mainThreadAiRelatedInformation.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadAiEmbeddingVector.js';
 
-let EsmWebWorkerExtensionHost = class EsmWebWorkerExtensionHost extends WebWorkerExtensionHost {
-    constructor(workerConfig, runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService) {
-        super(runningLocation, startup, _initDataProvider, _telemetryService, _contextService, _labelService, _logService, _loggerService, _environmentService, _userDataProfilesService, _productService, _layoutService, _storageService);
-        this.workerConfig = workerConfig;
-    }
-    async _getWebWorkerExtensionHostIframeSrc() {
-        const url = new URL(await super._getWebWorkerExtensionHostIframeSrc(), window.location.href);
-        url.searchParams.set('vscodeExtHostWorkerSrc', this.workerConfig.url);
-        if (this.workerConfig.options != null) {
-            url.searchParams.set('vscodeExtHostWorkerOptions', JSON.stringify(this.workerConfig.options));
-        }
-        url.searchParams.set('parentOrigin', window.origin);
-        return ( url.toString());
-    }
-};
-EsmWebWorkerExtensionHost = __decorate([
-    ( __param(4, ITelemetryService)),
-    ( __param(5, IWorkspaceContextService)),
-    ( __param(6, ILabelService)),
-    ( __param(7, ILogService)),
-    ( __param(8, ILoggerService)),
-    ( __param(9, IBrowserWorkbenchEnvironmentService)),
-    ( __param(10, IUserDataProfilesService)),
-    ( __param(11, IProductService)),
-    ( __param(12, ILayoutService)),
-    ( __param(13, IStorageService))
-], EsmWebWorkerExtensionHost);
 let localExtensionHost;
 function setLocalExtensionHost(_localExtensionHost) {
     localExtensionHost = _localExtensionHost;
 }
 let BrowserExtensionHostFactoryOverride = class BrowserExtensionHostFactoryOverride extends BrowserExtensionHostFactory {
-    constructor(workerConfig, _extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService) {
+    constructor(workerExtHostEnabled, _extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService) {
         super(_extensionsProposedApi, _scanWebExtensions, _getExtensionRegistrySnapshotWhenReady, _instantiationService, _remoteAgentService, _remoteAuthorityResolverService, _extensionEnablementService, _logService);
-        this.workerConfig = workerConfig;
+        this.workerExtHostEnabled = workerExtHostEnabled;
     }
     createExtensionHost(runningLocations, runningLocation, isInitialStart) {
         switch (runningLocation.kind) {
@@ -167,11 +136,11 @@ let BrowserExtensionHostFactoryOverride = class BrowserExtensionHostFactoryOverr
                 return this._instantiationService.createInstance(localExtensionHost, runningLocation, 1 , this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
             }
             case 2 : {
-                if (this.workerConfig == null) {
+                if (!this.workerExtHostEnabled) {
                     return null;
                 }
                 const startup = ((isInitialStart ? 2  : 1) );
-                return this._instantiationService.createInstance(EsmWebWorkerExtensionHost, this.workerConfig, runningLocation, startup, this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
+                return this._instantiationService.createInstance(WebWorkerExtensionHost, runningLocation, startup, this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
             }
             case 3 : {
                 return super.createExtensionHost(runningLocations, runningLocation, isInitialStart);
@@ -207,10 +176,10 @@ LocalBrowserExtensionHostKindPicker = __decorate([
     ( __param(1, ILogService))
 ], LocalBrowserExtensionHostKindPicker);
 let ExtensionServiceOverride = class ExtensionServiceOverride extends ExtensionService {
-    constructor(workerConfig, instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, webExtensionsScannerService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, userDataInitializationService, userDataProfileService, workspaceTrustManagementService, remoteExplorerService, dialogService) {
+    constructor(workerExtHostEnabled, instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, webExtensionsScannerService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, userDataInitializationService, userDataProfileService, workspaceTrustManagementService, remoteExplorerService, dialogService) {
         const extensionsProposedApi = instantiationService.createInstance(ExtensionsProposedApi);
-        const extensionHostFactory = new BrowserExtensionHostFactoryOverride(workerConfig, extensionsProposedApi, async () => this._scanWebExtensions(), () => this._getExtensionRegistrySnapshotWhenReady(), instantiationService, remoteAgentService, remoteAuthorityResolverService, extensionEnablementService, logService);
-        super(extensionsProposedApi, extensionHostFactory, new LocalBrowserExtensionHostKindPicker(workerConfig != null ? [2 , 1 , 3 ] : [1 , 3 ], logService), instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, webExtensionsScannerService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, userDataInitializationService, userDataProfileService, workspaceTrustManagementService, remoteExplorerService, dialogService);
+        const extensionHostFactory = new BrowserExtensionHostFactoryOverride(workerExtHostEnabled, extensionsProposedApi, async () => await this._scanWebExtensions(), () => this._getExtensionRegistrySnapshotWhenReady(), instantiationService, remoteAgentService, remoteAuthorityResolverService, extensionEnablementService, logService);
+        super(extensionsProposedApi, extensionHostFactory, new LocalBrowserExtensionHostKindPicker(workerExtHostEnabled ? [2 , 1 , 3 ] : [1 , 3 ], logService), instantiationService, notificationService, browserEnvironmentService, telemetryService, extensionEnablementService, fileService, productService, extensionManagementService, contextService, configurationService, extensionManifestPropertiesService, webExtensionsScannerService, logService, remoteAgentService, remoteExtensionsScannerService, lifecycleService, remoteAuthorityResolverService, userDataInitializationService, userDataProfileService, workspaceTrustManagementService, remoteExplorerService, dialogService);
     }
     async deltaExtensions(toAdd, toRemove) {
         await this._handleDeltaExtensions(new DeltaExtensionsQueueItem(toAdd, toRemove));
@@ -246,12 +215,12 @@ class ExtensionResourceLoaderServiceOverride extends ExtensionResourceLoaderServ
             const result = await this._fileService.readFile(uri);
             return ( result.value.toString());
         }
-        return super.readExtensionResource(uri);
+        return await super.readExtensionResource(uri);
     }
 }
 let iframeAlternateDomains;
 registerAssets({
-    'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.html': () => changeUrlDomain(new URL('./assets/webWorkerExtensionHostIframe.html', import.meta.url).href, iframeAlternateDomains)
+    'vs/workbench/services/extensions/worker/webWorkerExtensionHostIframe.esm.html': () => changeUrlDomain(new URL('./assets/webWorkerExtensionHostIframe.esm.html', import.meta.url).href, iframeAlternateDomains)
 });
 function getServiceOverride(workerConfig, _iframeAlternateDomains) {
     if (_iframeAlternateDomains != null) {
@@ -263,6 +232,11 @@ function getServiceOverride(workerConfig, _iframeAlternateDomains) {
             url: changeUrlDomain(workerConfig.url, iframeAlternateDomains)
         }
         : undefined;
+    if (workerConfig != null) {
+        registerAssets({
+            'vs/workbench/api/worker/extensionHostWorker.esm.js': () => workerConfig.url
+        });
+    }
     return {
         [( IExtensionService.toString())]: new SyncDescriptor(ExtensionServiceOverride, [_workerConfig], false),
         [( IExtensionManifestPropertiesService.toString())]: new SyncDescriptor(ExtensionManifestPropertiesService, [], true),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extensions-service-override",
-  "version": "8.0.4",
+  "version": "9.0.2",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,7 +26,7 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@8.0.4",
-    "@codingame/monaco-vscode-files-service-override": "8.0.4"
+    "vscode": "npm:@codingame/monaco-vscode-api@9.0.2",
+    "@codingame/monaco-vscode-files-service-override": "9.0.2"
   }
 }

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

@@ -11,9 +11,9 @@ import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vs
 import { getIdAndVersion, areSameExtensions, getGalleryExtensionId, getExtensionId } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { ExtensionType, EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 
-const notFound = (id) => ( localize(9800, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(9830, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    9801,
+    9831,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -50,7 +50,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(9802, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(9832, "Extensions installed on {0}:", this.location)));
         }
         extensions = extensions.sort((e1, e2) => e1.identifier.id.localeCompare(e2.identifier.id));
         let lastId = undefined;
@@ -65,7 +65,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         const failed = [];
         try {
             if (extensions.length) {
-                this.logger.info(this.location ? ( localize(9803, "Installing extensions on {0}...", this.location)) : ( localize(9804, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(9833, "Installing extensions on {0}...", this.location)) : ( localize(9834, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -108,11 +108,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(9805, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(9835, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( (new Error(localize(9806, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( (new Error(localize(9836, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
@@ -124,7 +124,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            9807,
+            9837,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -141,11 +141,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(9808, "No extension to update")));
+            this.logger.info(( localize(9838, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            9809,
+            9839,
             "Updating extensions: {0}",
             ( (extensionsToUpdate.map(ext => ext.extension.identifier.id))).join(', ')
         )));
@@ -153,7 +153,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         for (const extensionResult of installationResult) {
             if (extensionResult.error) {
                 this.logger.error(( localize(
-                    9810,
+                    9840,
                     "Error while updating extension {0}: {1}",
                     extensionResult.identifier.id,
                     getErrorMessage(extensionResult.error)
@@ -161,7 +161,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             else {
                 this.logger.info(( localize(
-                    9811,
+                    9841,
                     "Extension '{0}' v{1} was successfully updated.",
                     extensionResult.identifier.id,
                     extensionResult.local?.manifest.version
@@ -175,7 +175,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (!force && (!version || (version === 'prerelease' && installedExtension.preRelease))) {
                     this.logger.info(( localize(
-                        9812,
+                        9842,
                         "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,
@@ -184,7 +184,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                     return false;
                 }
                 if (version && installedExtension.manifest.version === version) {
-                    this.logger.info(( localize(9813, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(9843, "Extension '{0}' is already installed.", `${id}@${version}`)));
                     return false;
                 }
             }
@@ -218,24 +218,24 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (installedExtension) {
                 if (gallery.version === installedExtension.manifest.version) {
                     this.logger.info(( localize(
-                        9813,
+                        9843,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    9814,
+                    9844,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(9815, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(9816, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(9845, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(9846, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(9817, "Installing extension '{0}' v{1}...", id, version)) : ( localize(9818, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(9847, "Installing extension '{0}' v{1}...", id, version)) : ( localize(9848, "Installing extension '{0}'...", id)));
             }
             extensionsToInstall.push({
                 extension: gallery,
@@ -247,7 +247,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             for (const extensionResult of installationResult) {
                 if (extensionResult.error) {
                     this.logger.error(( localize(
-                        9819,
+                        9849,
                         "Error while installing extension {0}: {1}",
                         extensionResult.identifier.id,
                         getErrorMessage(extensionResult.error)
@@ -256,7 +256,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 }
                 else {
                     this.logger.info(( localize(
-                        9820,
+                        9850,
                         "Extension '{0}' v{1} was successfully installed.",
                         extensionResult.identifier.id,
                         extensionResult.local?.manifest.version
@@ -275,11 +275,11 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         if (valid) {
             try {
                 await this.extensionManagementService.install(vsix, { ...installOptions, installGivenVersion: true });
-                this.logger.info(( localize(9821, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(9851, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(9822, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(9852, "Cancelled installing extension '{0}'.", basename(vsix))));
                 }
                 else {
                     throw error;
@@ -314,7 +314,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(
-                    9823,
+                    9853,
                     "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,
@@ -342,7 +342,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (( (extensionsToUninstall.some(e => e.type === ExtensionType.System)))) {
                 this.logger.info(( localize(
-                    9824,
+                    9854,
                     "Extension '{0}' is a Built-in extension and cannot be uninstalled",
                     id
                 )));
@@ -350,26 +350,26 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
             if (!force && ( (extensionsToUninstall.some(e => e.isBuiltin)))) {
                 this.logger.info(( localize(
-                    9825,
+                    9855,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(9826, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(9856, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    9827,
+                    9857,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(9828, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(9858, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -387,7 +387,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(9829, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(9830, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(9859, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(9860, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( (__decorate([

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

@@ -17,6 +17,7 @@ import { IAuthenticationUsageService } from 'vscode/vscode/vs/workbench/services
 import { getAuthenticationProviderActivationEvent } from 'vscode/vscode/vs/workbench/services/authentication/browser/authenticationService';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
 
 class MainThreadAuthenticationProvider extends Disposable {
     constructor(_proxy, id, label, supportsMultipleAccounts, notificationService, onDidChangeSessionsEmitter) {
@@ -36,7 +37,7 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
-        this.notificationService.info(( localize(4878, "Successfully signed out.")));
+        this.notificationService.info(( localize(4852, "Successfully signed out.")));
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
@@ -92,7 +93,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         let message;
         if (provider.id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
             message = ( localize(
-                4879,
+                4853,
                 "The extension '{0}' wants to access the language models provided by {1}.",
                 extensionName,
                 provider.label
@@ -101,13 +102,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                4880,
+                4854,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                4881,
+                4855,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -115,7 +116,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(4882, "&&Allow")),
+                label: ( localize(4856, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -123,7 +124,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(4883, "Learn more")),
+                label: ( localize(4857, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -140,6 +141,33 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         });
         return result ?? false;
     }
+    async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
+        const result = await this.dialogService.prompt({
+            message: ( localize(4858, "Incorrect account detected")),
+            detail: ( localize(
+                4859,
+                "The chosen account, {0}, does not match the requested account, {1}.",
+                chosenAccountLabel,
+                requestedAccountLabel
+            )),
+            type: Severity$1.Warning,
+            cancelButton: true,
+            buttons: [
+                {
+                    label: ( localize(4860, 'Keep {0}', chosenAccountLabel)),
+                    run: () => chosenAccountLabel
+                },
+                {
+                    label: ( localize(4861, 'Login with {0}', requestedAccountLabel)),
+                    run: () => requestedAccountLabel
+                }
+            ],
+        });
+        if (!result.result) {
+            throw ( (new CancellationError()));
+        }
+        return result.result === chosenAccountLabel;
+    }
     async doGetSession(providerId, scopes, extensionId, extensionName, options) {
         const sessions = await this.authenticationService.getSessions(providerId, scopes, options.account, true);
         const provider = this.authenticationService.getProvider(providerId);
@@ -192,12 +220,16 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                     : sessions[0];
             }
             else {
-                let account = options.account;
-                if (!account) {
+                let accountToCreate = options.account;
+                if (!accountToCreate) {
                     const sessionIdToRecreate = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
-                    account = sessionIdToRecreate ? sessions.find(session => session.id === sessionIdToRecreate)?.account : undefined;
+                    accountToCreate = sessionIdToRecreate ? sessions.find(session => session.id === sessionIdToRecreate)?.account : undefined;
                 }
-                session = await this.authenticationService.createSession(providerId, scopes, { activateImmediate: true, account });
+                do {
+                    session = await this.authenticationService.createSession(providerId, scopes, { activateImmediate: true, account: accountToCreate });
+                } while (accountToCreate
+                    && accountToCreate.label !== session.account.label
+                    && !(await this.continueWithIncorrectAccountPrompt(session.account.label, accountToCreate.label)));
             }
             this.authenticationAccessService.updateAllowedExtensions(providerId, session.account.label, [{ id: extensionId, name: extensionName, allowed: true }]);
             this.authenticationExtensionsService.updateSessionPreference(providerId, extensionId, session);

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

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