@codingame/monaco-vscode-extensions-service-override 9.0.3 → 10.0.1

package/_virtual/semver.js

@@ -0,0 +1,5 @@
+import { __require } from 'vscode/external/vscode-semver/semver.js';
+
+var semverExports = __require();
+
+export { semverExports };

package/assets/webWorkerExtensionHostIframe.esm.html

@@ -4,7 +4,7 @@
 		<meta http-equiv="Content-Security-Policy" content="
 			default-src 'none';
 			child-src 'self' data: blob:;
-			script-src 'self' 'unsafe-eval' 'sha256-8MVeUdk5qF4PxUj/3OPSsosE9rIR9mo+m5ulCU+h+VI=' https: http://localhost:* blob:;
+			script-src 'self' 'unsafe-eval' 'sha256-fCnZ3iXydTZHO961jO3ioYDdWSfm8PZg/rI6zFX/SE0=' 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>
@@ -95,13 +95,17 @@
 
 			const isESM = true;
 
+			// In below blob code, we are using JSON.stringify to ensure the passed
+			// in values are not breaking our script. The values may contain string
+			// terminating characters (such as ' or ").
+
 			const blob = new Blob([[
 				`/*extensionHostWorker*/`,
-				`globalThis.MonacoEnvironment = { baseUrl: '${baseUrl}' };`,
+				`globalThis.MonacoEnvironment = { baseUrl: ${JSON.stringify(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}');`,
+				`globalThis._VSCODE_FILE_ROOT = ${JSON.stringify(fileRoot)};`,
+				isESM ? `await import(${JSON.stringify(workerUrl)});` : `importScripts(${JSON.stringify(workerUrl)});`,
 				`/*extensionHostWorker*/`
 			].join('')], { type: 'application/javascript' });
 

package/extensions.js

@@ -40,6 +40,7 @@ import './vscode/src/vs/workbench/api/browser/mainThreadBulkEdits.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadLanguageModels.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatAgents2.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadChatVariables.js';
+import './vscode/src/vs/workbench/api/browser/mainThreadChatCodeMapper.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadLanguageModelTools.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadEmbeddings.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadCodeInsets.js';
@@ -58,12 +59,12 @@ import './vscode/src/vs/workbench/api/browser/mainThreadDocumentsAndEditors.js';
 import 'vscode/vscode/vs/base/common/event';
 import 'vscode/vscode/vs/base/common/lifecycle';
 import 'vscode/vscode/vs/editor/common/config/editorOptions';
-import 'vscode/vscode/vs/editor/common/core/selection';
-import 'vscode/vscode/vs/editor/common/editorCommon';
 import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetController2';
 import 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import 'vscode/vscode/vs/base/common/arrays';
-import 'vscode/vscode/vs/editor/contrib/editorState/browser/editorState';
+import 'vscode/vscode/vs/base/common/strings';
+import 'vscode/vscode/vs/base/common/cancellation';
+import 'vscode/vscode/vs/editor/contrib/editorState/browser/keybindingCancellation';
 import 'vscode/vscode/vs/editor/contrib/snippet/browser/snippetParser';
 import './vscode/src/vs/workbench/api/browser/mainThreadEditors.js';
 import './vscode/src/vs/workbench/api/browser/mainThreadEditorTabs.js';
@@ -139,7 +140,9 @@ let BrowserExtensionHostFactoryOverride = class BrowserExtensionHostFactoryOverr
                 if (!this.workerExtHostEnabled) {
                     return null;
                 }
-                const startup = ((isInitialStart ? 2  : 1) );
+                const startup = isInitialStart
+                    ? 2
+                    : 1 ;
                 return this._instantiationService.createInstance(WebWorkerExtensionHost, runningLocation, startup, this._createLocalExtensionHostDataProvider(runningLocations, runningLocation, isInitialStart));
             }
             case 3 : {
@@ -179,7 +182,13 @@ let ExtensionServiceOverride = class ExtensionServiceOverride extends ExtensionS
     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(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);
+        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));

package/override/vs/workbench/browser/parts/editor/textEditor.weak.js

@@ -1,7 +1,7 @@
 let AbstractTextEditor = class {};
 class FakeAbstractTextEditor {
   static [Symbol.hasInstance](instance) {
-      return AbstractTextEditor != null && instance instanceof AbstractTextEditor
+    return AbstractTextEditor != null && instance instanceof AbstractTextEditor
   }
 }
 function setAbstractTextEditor(_AbstractTextEditor) {

package/package.json

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

package/vscode/src/vs/base/common/console.js

@@ -1,5 +1,3 @@
-import 'vscode/vscode/vs/base/common/charCode';
-import 'vscode/vscode/vs/base/common/marshallingIds';
 import 'vscode/vscode/vs/base/common/path';
 import 'vscode/vscode/vs/base/common/platform';
 

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

@@ -3,17 +3,17 @@ import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { getErrorMessage, isCancellationError } from 'vscode/vscode/vs/base/common/errors';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import { basename } from 'vscode/vscode/vs/base/common/resources';
-import { semverExports } from 'vscode/external/vscode-semver/semver.js';
+import { semverExports } from '../../../../../../_virtual/semver.js';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localize } from 'vscode/vscode/vs/nls';
-import { InstallOperation, EXTENSION_IDENTIFIER_REGEX } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { EXTENSION_IDENTIFIER_REGEX } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IExtensionManagementService, IExtensionGalleryService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 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';
+import { EXTENSION_CATEGORIES } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 
-const notFound = (id) => ( localize(9830, "Extension '{0}' not found.", id));
+const notFound = (id) => ( localize(9904, "Extension '{0}' not found.", id));
 const useId = ( localize(
-    9831,
+    9905,
     "Make sure you use the full extension ID, including the publisher, e.g.: {0}",
     'ms-dotnettools.csharp'
 ));
@@ -27,7 +27,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         return undefined;
     }
     async listExtensions(showVersions, category, profileLocation) {
-        let extensions = await this.extensionManagementService.getInstalled(ExtensionType.User, profileLocation);
+        let extensions = await this.extensionManagementService.getInstalled(1 , profileLocation);
         const categories = ( (EXTENSION_CATEGORIES.map(c => c.toLowerCase())));
         if (category && category !== '') {
             if (categories.indexOf(category.toLowerCase()) < 0) {
@@ -50,7 +50,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             return;
         }
         if (this.location) {
-            this.logger.info(( localize(9832, "Extensions installed on {0}:", this.location)));
+            this.logger.info(( localize(9906, "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(9833, "Installing extensions on {0}...", this.location)) : ( localize(9834, "Installing extensions...")));
+                this.logger.info(this.location ? ( localize(9907, "Installing extensions on {0}...", this.location)) : ( localize(9908, "Installing extensions...")));
             }
             const installVSIXInfos = [];
             const installExtensionInfos = [];
@@ -108,15 +108,15 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         catch (error) {
-            this.logger.error(( localize(9835, "Error while installing extensions: {0}", getErrorMessage(error))));
+            this.logger.error(( localize(9909, "Error while installing extensions: {0}", getErrorMessage(error))));
             throw error;
         }
         if (failed.length) {
-            throw ( (new Error(localize(9836, "Failed Installing Extensions: {0}", failed.join(', ')))));
+            throw ( (new Error(localize(9910, "Failed Installing Extensions: {0}", failed.join(', ')))));
         }
     }
     async updateExtensions(profileLocation) {
-        const installedExtensions = await this.extensionManagementService.getInstalled(ExtensionType.User, profileLocation);
+        const installedExtensions = await this.extensionManagementService.getInstalled(1 , profileLocation);
         const installedExtensionsQuery = [];
         for (const extension of installedExtensions) {
             if (!!extension.identifier.uuid) {
@@ -124,7 +124,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             }
         }
         this.logger.trace(( localize(
-            9837,
+            9911,
             "Fetching latest versions for {0} extensions",
             installedExtensionsQuery.length
         )));
@@ -135,17 +135,17 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
                 if (areSameExtensions(oldVersion.identifier, newVersion.identifier) && semverExports.gt(newVersion.version, oldVersion.manifest.version)) {
                     extensionsToUpdate.push({
                         extension: newVersion,
-                        options: { operation: InstallOperation.Update, installPreReleaseVersion: oldVersion.preRelease, profileLocation, isApplicationScoped: oldVersion.isApplicationScoped }
+                        options: { operation: 3 , installPreReleaseVersion: oldVersion.preRelease, profileLocation, isApplicationScoped: oldVersion.isApplicationScoped }
                     });
                 }
             }
         }
         if (!extensionsToUpdate.length) {
-            this.logger.info(( localize(9838, "No extension to update")));
+            this.logger.info(( localize(9912, "No extension to update")));
             return;
         }
         this.logger.info(( localize(
-            9839,
+            9913,
             "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(
-                    9840,
+                    9914,
                     "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(
-                    9841,
+                    9915,
                     "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(
-                        9842,
+                        9916,
                         "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(9843, "Extension '{0}' is already installed.", `${id}@${version}`)));
+                    this.logger.info(( localize(9917, "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(
-                        9843,
+                        9917,
                         "Extension '{0}' is already installed.",
                         version ? `${id}@${version}` : id
                     )));
                     return;
                 }
                 this.logger.info(( localize(
-                    9844,
+                    9918,
                     "Updating the extension '{0}' to the version {1}",
                     id,
                     gallery.version
                 )));
             }
             if (installOptions.isBuiltin) {
-                this.logger.info(version ? ( localize(9845, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(9846, "Installing builtin extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(9919, "Installing builtin extension '{0}' v{1}...", id, version)) : ( localize(9920, "Installing builtin extension '{0}'...", id)));
             }
             else {
-                this.logger.info(version ? ( localize(9847, "Installing extension '{0}' v{1}...", id, version)) : ( localize(9848, "Installing extension '{0}'...", id)));
+                this.logger.info(version ? ( localize(9921, "Installing extension '{0}' v{1}...", id, version)) : ( localize(9922, "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(
-                        9849,
+                        9923,
                         "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(
-                        9850,
+                        9924,
                         "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(9851, "Extension '{0}' was successfully installed.", basename(vsix))));
+                this.logger.info(( localize(9925, "Extension '{0}' was successfully installed.", basename(vsix))));
             }
             catch (error) {
                 if (isCancellationError(error)) {
-                    this.logger.info(( localize(9852, "Cancelled installing extension '{0}'.", basename(vsix))));
+                    this.logger.info(( localize(9926, "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(
-                    9853,
+                    9927,
                     "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,
@@ -340,9 +340,9 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
             if (!extensionsToUninstall.length) {
                 throw ( (new Error(`${this.notInstalled(id)}\n${useId}`)));
             }
-            if (( (extensionsToUninstall.some(e => e.type === ExtensionType.System)))) {
+            if (( (extensionsToUninstall.some(e => e.type === 0 )))) {
                 this.logger.info(( localize(
-                    9854,
+                    9928,
                     "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(
-                    9855,
+                    9929,
                     "Extension '{0}' is marked as a Built-in extension by user. Please use '--force' option to uninstall it.",
                     id
                 )));
                 return;
             }
-            this.logger.info(( localize(9856, "Uninstalling {0}...", id)));
+            this.logger.info(( localize(9930, "Uninstalling {0}...", id)));
             for (const extensionToUninstall of extensionsToUninstall) {
                 await this.extensionManagementService.uninstall(extensionToUninstall, { profileLocation });
             }
             if (this.location) {
                 this.logger.info(( localize(
-                    9857,
+                    9931,
                     "Extension '{0}' was successfully uninstalled from {1}!",
                     id,
                     this.location
                 )));
             }
             else {
-                this.logger.info(( localize(9858, "Extension '{0}' was successfully uninstalled!", id)));
+                this.logger.info(( localize(9932, "Extension '{0}' was successfully uninstalled!", id)));
             }
         }
     }
@@ -387,7 +387,7 @@ let ExtensionManagementCLI = class ExtensionManagementCLI {
         });
     }
     notInstalled(id) {
-        return this.location ? ( localize(9859, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(9860, "Extension '{0}' is not installed.", id));
+        return this.location ? ( localize(9933, "Extension '{0}' is not installed on {1}.", id, this.location)) : ( localize(9934, "Extension '{0}' is not installed.", id));
     }
 };
 ExtensionManagementCLI = ( (__decorate([

package/vscode/src/vs/platform/extensionResourceLoader/browser/extensionResourceLoaderService.js

@@ -1,5 +1,4 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IFileService } from 'vscode/vscode/vs/platform/files/common/files.service';
 import { FileAccess, Schemas } from 'vscode/vscode/vs/base/common/network';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';

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

@@ -8,7 +8,6 @@ import { ExtHostContext, MainContext } from 'vscode/vscode/vs/workbench/api/comm
 import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
-import { ActivationKind } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry.service';
 import { Emitter } from 'vscode/vscode/vs/base/common/event';
@@ -37,7 +36,7 @@ class MainThreadAuthenticationProvider extends Disposable {
     }
     async removeSession(sessionId) {
         await this._proxy.$removeSession(this.id, sessionId);
-        this.notificationService.info(( localize(4852, "Successfully signed out.")));
+        this.notificationService.info(( localize(4883, "Successfully signed out.")));
     }
 }
 let MainThreadAuthentication = class MainThreadAuthentication extends Disposable {
@@ -57,6 +56,10 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         this._register(this.authenticationService.onDidChangeSessions(e => {
             this._proxy.$onDidChangeAuthenticationSessions(e.providerId, e.label);
         }));
+        this._register(this.authenticationExtensionsService.onDidChangeAccountPreference(e => {
+            const providerInfo = this.authenticationService.getProvider(e.providerId);
+            this._proxy.$onDidChangeAuthenticationSessions(providerInfo.id, providerInfo.label, e.extensionIds);
+        }));
     }
     async $registerAuthenticationProvider(id, label, supportsMultipleAccounts) {
         const emitter = ( (new Emitter()));
@@ -77,7 +80,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async $ensureProvider(id) {
         if (!this.authenticationService.isAuthenticationProviderRegistered(id)) {
-            return await this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), ActivationKind.Immediate);
+            return await this.extensionService.activateByEvent(getAuthenticationProviderActivationEvent(id), 1 );
         }
     }
     $sendDidChangeSessions(providerId, event) {
@@ -93,7 +96,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         let message;
         if (provider.id.startsWith(INTERNAL_AUTH_PROVIDER_PREFIX)) {
             message = ( localize(
-                4853,
+                4884,
                 "The extension '{0}' wants to access the language models provided by {1}.",
                 extensionName,
                 provider.label
@@ -102,13 +105,13 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         else {
             message = recreatingSession
                 ? ( localize(
-                4854,
+                4885,
                 "The extension '{0}' wants you to sign in again using {1}.",
                 extensionName,
                 provider.label
             ))
                 : ( localize(
-                4855,
+                4886,
                 "The extension '{0}' wants to sign in using {1}.",
                 extensionName,
                 provider.label
@@ -116,7 +119,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         }
         const buttons = [
             {
-                label: ( localize(4856, "&&Allow")),
+                label: ( localize(4887, "&&Allow")),
                 run() {
                     return true;
                 },
@@ -124,7 +127,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
         ];
         if (options?.learnMore) {
             buttons.push({
-                label: ( localize(4857, "Learn more")),
+                label: ( localize(4888, "Learn more")),
                 run: async () => {
                     const result = this.loginPrompt(provider, extensionName, recreatingSession, options);
                     await this.openerService.open(URI.revive(options.learnMore), { allowCommands: true });
@@ -143,9 +146,9 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     }
     async continueWithIncorrectAccountPrompt(chosenAccountLabel, requestedAccountLabel) {
         const result = await this.dialogService.prompt({
-            message: ( localize(4858, "Incorrect account detected")),
+            message: ( localize(4889, "Incorrect account detected")),
             detail: ( localize(
-                4859,
+                4890,
                 "The chosen account, {0}, does not match the requested account, {1}.",
                 chosenAccountLabel,
                 requestedAccountLabel
@@ -154,11 +157,11 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             cancelButton: true,
             buttons: [
                 {
-                    label: ( localize(4860, 'Keep {0}', chosenAccountLabel)),
+                    label: ( localize(4891, 'Keep {0}', chosenAccountLabel)),
                     run: () => chosenAccountLabel
                 },
                 {
-                    label: ( localize(4861, 'Login with {0}', requestedAccountLabel)),
+                    label: ( localize(4892, 'Login with {0}', requestedAccountLabel)),
                     run: () => requestedAccountLabel
                 }
             ],
@@ -187,19 +190,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
             )));
         }
         if (options.clearSessionPreference) {
-            this.authenticationExtensionsService.removeSessionPreference(providerId, extensionId, scopes);
+            this._removeAccountPreference(extensionId, providerId, scopes);
         }
+        const matchingAccountPreferenceSession = this._getAccountPreference(extensionId, providerId, scopes, sessions);
         if (!options.forceNewSession && sessions.length) {
-            if (provider.supportsMultipleAccounts) {
-                const existingSessionPreference = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
-                if (existingSessionPreference) {
-                    const matchingSession = sessions.find(session => session.id === existingSessionPreference);
-                    if (matchingSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingSession.account.label, extensionId)) {
-                        return matchingSession;
-                    }
-                }
+            if (matchingAccountPreferenceSession && this.authenticationAccessService.isAccessAllowed(providerId, matchingAccountPreferenceSession.account.label, extensionId)) {
+                return matchingAccountPreferenceSession;
             }
-            else if (this.authenticationAccessService.isAccessAllowed(providerId, sessions[0].account.label, extensionId)) {
+            if (!provider.supportsMultipleAccounts && this.authenticationAccessService.isAccessAllowed(providerId, sessions[0].account.label, extensionId)) {
                 return sessions[0];
             }
         }
@@ -220,11 +218,7 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                     : sessions[0];
             }
             else {
-                let accountToCreate = options.account;
-                if (!accountToCreate) {
-                    const sessionIdToRecreate = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
-                    accountToCreate = sessionIdToRecreate ? sessions.find(session => session.id === sessionIdToRecreate)?.account : undefined;
-                }
+                const accountToCreate = options.account ?? matchingAccountPreferenceSession?.account;
                 do {
                     session = await this.authenticationService.createSession(providerId, scopes, { activateImmediate: true, account: accountToCreate });
                 } while (accountToCreate
@@ -232,12 +226,14 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
                     && !(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);
+            this._updateAccountPreference(extensionId, providerId, session);
             return session;
         }
-        const validSession = sessions.find(session => this.authenticationAccessService.isAccessAllowed(providerId, session.account.label, extensionId));
-        if (validSession) {
-            return validSession;
+        if (!matchingAccountPreferenceSession && !this.authenticationExtensionsService.getAccountPreference(extensionId, providerId)) {
+            const validSession = sessions.find(session => this.authenticationAccessService.isAccessAllowed(providerId, session.account.label, extensionId));
+            if (validSession) {
+                return validSession;
+            }
         }
         if (!options.silent) {
             sessions.length
@@ -261,6 +257,33 @@ let MainThreadAuthentication = class MainThreadAuthentication extends Disposable
     sendProviderUsageTelemetry(extensionId, providerId) {
         this.telemetryService.publicLog2('authentication.providerUsage', { providerId, extensionId });
     }
+    _getAccountPreference(extensionId, providerId, scopes, sessions) {
+        if (sessions.length === 0) {
+            return undefined;
+        }
+        const accountNamePreference = this.authenticationExtensionsService.getAccountPreference(extensionId, providerId);
+        if (accountNamePreference) {
+            const session = sessions.find(session => session.account.label === accountNamePreference);
+            return session;
+        }
+        const sessionIdPreference = this.authenticationExtensionsService.getSessionPreference(providerId, extensionId, scopes);
+        if (sessionIdPreference) {
+            const session = sessions.find(session => session.id === sessionIdPreference);
+            if (session) {
+                this.authenticationExtensionsService.updateAccountPreference(extensionId, providerId, session.account);
+                return session;
+            }
+        }
+        return undefined;
+    }
+    _updateAccountPreference(extensionId, providerId, session) {
+        this.authenticationExtensionsService.updateAccountPreference(extensionId, providerId, session.account);
+        this.authenticationExtensionsService.updateSessionPreference(providerId, extensionId, session);
+    }
+    _removeAccountPreference(extensionId, providerId, scopes) {
+        this.authenticationExtensionsService.removeAccountPreference(extensionId, providerId);
+        this.authenticationExtensionsService.removeSessionPreference(providerId, extensionId, scopes);
+    }
 };
 MainThreadAuthentication = __decorate([
     extHostNamedCustomer(MainContext.MainThreadAuthentication),

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

@@ -6,7 +6,6 @@ import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import { IUriIdentityService } from 'vscode/vscode/vs/platform/uriIdentity/common/uriIdentity.service';
 import { MainContext } from 'vscode/vscode/vs/workbench/api/common/extHost.protocol';
 import { ResourceNotebookCellEdit } from 'vscode/vscode/vs/workbench/contrib/bulkEdit/browser/bulkCellEdits';
-import { CellEditType } from 'vscode/vscode/vs/workbench/contrib/notebook/common/notebookCommon';
 import { extHostNamedCustomer } from '../../services/extensions/common/extHostCustomers.js';
 
 let MainThreadBulkEdits = class MainThreadBulkEdits {
@@ -62,7 +61,7 @@ function reviveWorkspaceEditDto(data, uriIdentityService, resolveDataTransferFil
         if (ResourceNotebookCellEdit.is(edit)) {
             edit.resource = uriIdentityService.asCanonicalUri(edit.resource);
             const cellEdit = edit.cellEdit;
-            if (cellEdit.editType === CellEditType.Replace) {
+            if (cellEdit.editType === 1 ) {
                 edit.cellEdit = {
                     ...cellEdit,
                     cells: ( cellEdit.cells.map(cell => ({

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(
-                4803,
+                4834,
                 "Cannot install the '{0}' extension because it is declared to not run in this setup.",
                 getExtensionId(manifest.publisher, manifest.name)
             )));