@codingame/monaco-vscode-extension-gallery-service-override 2.2.2 → 3.1.0

package/extensionGallery.js

@@ -21,30 +21,44 @@ import { ExtensionTipsService } from './vscode/src/vs/platform/extensionManageme
 import { ExtensionManagementService } from './vscode/src/vs/workbench/services/extensionManagement/common/extensionManagementService.js';
 import { IRemoteUserDataProfilesService, RemoteUserDataProfilesService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/remoteUserDataProfiles';
 import { ExtensionEnablementService } from './vscode/src/vs/workbench/services/extensionManagement/browser/extensionEnablementService.js';
-import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.contribution.js';
-import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.js';
 import { IExtensionUrlHandler, ExtensionUrlHandler } from 'vscode/vscode/vs/workbench/services/extensions/browser/extensionUrlHandler';
 import { IRemoteAgentService } from 'vscode/vscode/vs/workbench/services/remote/common/remoteAgentService';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
+import { IExtensionFeaturesManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
+import { ExtensionFeaturesManagementService } from './vscode/src/vs/workbench/services/extensionManagement/common/extensionFeaturesManagemetService.js';
 import { registerAssets } from 'vscode/assets';
 import { getExtensionManifests } from 'vscode/extensions';
+import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.contribution.js';
+import './vscode/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.js';
 
 registerAssets({
     'vs/workbench/services/extensionManagement/common/media/defaultIcon.png': ( new URL('./assets/defaultIcon.png', import.meta.url).toString()),
     'vs/workbench/contrib/extensions/browser/media/theme-icon.png': new URL('./assets/theme-icon.png', import.meta.url).href,
     'vs/workbench/contrib/extensions/browser/media/language-icon.svg': new URL('./assets/theme-icon.png', import.meta.url).href
 });
+class EmptyRemoteAgentService {
+    constructor() {
+        this.getConnection = () => null;
+        this.getEnvironment = async () => null;
+        this.getRawEnvironment = async () => null;
+        this.getExtensionHostExitInfo = async () => null;
+        this.getRoundTripTime = async () => undefined;
+        this.whenExtensionsReady = async () => undefined;
+        this.scanExtensions = async () => [];
+        this.scanSingleExtension = async () => null;
+        this.getDiagnosticInfo = async () => undefined;
+        this.updateTelemetryLevel = async () => undefined;
+        this.logTelemetry = async () => undefined;
+        this.flushTelemetry = async () => undefined;
+    }
+}
 let ExtensionManagementServerServiceOverride = class ExtensionManagementServerServiceOverride extends ExtensionManagementServerService {
     constructor(isWebOnly, remoteAgentService, labelService, instantiationService) {
-        super(remoteAgentService, labelService, instantiationService);
-        this.isWebOnly = isWebOnly;
+        super(isWebOnly ? new EmptyRemoteAgentService() : remoteAgentService, labelService, instantiationService);
         this.remoteAgentService = remoteAgentService;
         this.labelService = labelService;
         this.instantiationService = instantiationService;
-        if (this.isWebOnly) {
-            this.remoteExtensionManagementServer = null;
-        }
     }
 };
 ExtensionManagementServerServiceOverride = __decorate([
@@ -75,7 +89,8 @@ function getServiceOverride(options = { webOnly: false }) {
         [( IExtensionTipsService.toString())]: new SyncDescriptor(ExtensionTipsService, [], true),
         [( IRemoteUserDataProfilesService.toString())]: new SyncDescriptor(RemoteUserDataProfilesService, [], true),
         [( IWorkbenchExtensionEnablementService.toString())]: new SyncDescriptor(ExtensionEnablementService, [], true),
-        [( IExtensionUrlHandler.toString())]: new SyncDescriptor(ExtensionUrlHandler, [], true)
+        [( IExtensionUrlHandler.toString())]: new SyncDescriptor(ExtensionUrlHandler, [], true),
+        [( IExtensionFeaturesManagementService.toString())]: new SyncDescriptor(ExtensionFeaturesManagementService, [], true)
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "2.2.2",
+  "version": "3.1.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -18,15 +18,15 @@
   "module": "index.js",
   "types": "index.d.ts",
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@2.2.2",
+    "vscode": "npm:@codingame/monaco-vscode-api@3.1.0",
     "vscode-marked": "npm:marked@=3.0.2",
     "vscode-semver": "npm:semver@=5.5.0",
-    "@codingame/monaco-vscode-files-service-override": "2.2.2",
-    "@codingame/monaco-vscode-quickaccess-service-override": "2.2.2",
-    "@codingame/monaco-vscode-extensions-service-override": "2.2.2",
-    "@codingame/monaco-vscode-environment-service-override": "2.2.2",
-    "@codingame/monaco-vscode-layout-service-override": "2.2.2",
-    "@codingame/monaco-vscode-host-service-override": "2.2.2",
-    "@codingame/monaco-vscode-base-service-override": "2.2.2"
+    "@codingame/monaco-vscode-files-service-override": "3.1.0",
+    "@codingame/monaco-vscode-quickaccess-service-override": "3.1.0",
+    "@codingame/monaco-vscode-extensions-service-override": "3.1.0",
+    "@codingame/monaco-vscode-environment-service-override": "3.1.0",
+    "@codingame/monaco-vscode-layout-service-override": "3.1.0",
+    "@codingame/monaco-vscode-host-service-override": "3.1.0",
+    "@codingame/monaco-vscode-base-service-override": "3.1.0"
   }
 }

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

@@ -10,7 +10,7 @@ import { isDefined } from 'vscode/vscode/vs/base/common/types';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { isTargetPlatformCompatible, ExtensionManagementError, ExtensionManagementErrorCode, EXTENSION_INSTALL_DEP_PACK_CONTEXT, TargetPlatformToString, IExtensionGalleryService, ExtensionGalleryError } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement';
-import { areSameExtensions, getGalleryExtensionTelemetryData, adoptToGalleryExtensionId, getGalleryExtensionId, ExtensionKey, getLocalExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
+import { areSameExtensions, getGalleryExtensionTelemetryData, ExtensionKey, getLocalExtensionTelemetryData } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { isApplicationScopedExtension } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
@@ -145,191 +145,153 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     }
     async installExtensions(extensions) {
         const results = [];
-        await Promise.allSettled(( extensions.map(async (e) => {
-            try {
-                const result = await this.installExtension(e, (taskToWait, taskToWaitFor) => {
-                    if (( extensions.some(
-                        e => adoptToGalleryExtensionId(taskToWaitFor.identifier.id) === getGalleryExtensionId(e.manifest.publisher, e.manifest.name)
-                    ))) {
-                        return false;
-                    }
-                    return this.canWaitForTask(taskToWait, taskToWaitFor);
-                });
-                results.push(...result);
-            }
-            catch (error) {
-                results.push({ identifier: { id: getGalleryExtensionId(e.manifest.publisher, e.manifest.name) }, operation: 2 , source: e.extension, error });
+        const installingExtensionsMap = ( new Map());
+        const alreadyRequestedInstallations = [];
+        const successResults = [];
+        const getInstallExtensionTaskKey = (extension, profileLocation) => `${( ExtensionKey.create(extension).toString())}-${( profileLocation.toString())}`;
+        const createInstallExtensionTask = (manifest, extension, options) => {
+            const installExtensionTask = this.createInstallExtensionTask(manifest, extension, options);
+            const key = URI.isUri(extension) ? extension.path : `${extension.identifier.id.toLowerCase()}-${( options.profileLocation.toString())}`;
+            installingExtensionsMap.set(key, { task: installExtensionTask, manifest });
+            this._onInstallExtension.fire({ identifier: installExtensionTask.identifier, source: extension, profileLocation: options.profileLocation });
+            this.logService.info('Installing extension:', installExtensionTask.identifier.id);
+            if (!URI.isUri(extension)) {
+                this.installingExtensions.set(getInstallExtensionTaskKey(extension, options.profileLocation), { task: installExtensionTask, waitingTasks: [] });
             }
-        })));
-        this._onDidInstallExtensions.fire(results);
-        return results;
-    }
-    async installExtension({ manifest, extension, options }, shouldWait) {
-        const isApplicationScoped = options.isApplicationScoped || options.isBuiltin || isApplicationScopedExtension(manifest);
-        const installExtensionTaskOptions = {
-            ...options,
-            installOnlyNewlyAddedFromExtensionPack: URI.isUri(extension) ? options.installOnlyNewlyAddedFromExtensionPack : true,
-            isApplicationScoped,
-            profileLocation: isApplicationScoped ? this.userDataProfilesService.defaultProfile.extensionsResource : options.profileLocation ?? this.getCurrentExtensionsManifestLocation()
         };
-        const getInstallExtensionTaskKey = (extension) => `${( ExtensionKey.create(extension).toString())}${installExtensionTaskOptions.profileLocation ? `-${( installExtensionTaskOptions.profileLocation.toString())}` : ''}`;
-        if (!URI.isUri(extension)) {
-            const installingExtension = this.installingExtensions.get(getInstallExtensionTaskKey(extension));
-            if (installingExtension) {
-                this.logService.info('Extensions is already requested to install', extension.identifier.id);
-                await installingExtension.task.waitUntilTaskIsFinished();
-                return [];
-            }
-        }
-        const allInstallExtensionTasks = [];
-        const alreadyRequestedInstallations = [];
-        const installResults = [];
-        const installExtensionTask = this.createInstallExtensionTask(manifest, extension, installExtensionTaskOptions);
-        if (!URI.isUri(extension)) {
-            this.installingExtensions.set(getInstallExtensionTaskKey(extension), { task: installExtensionTask, waitingTasks: [] });
-        }
-        this._onInstallExtension.fire({ identifier: installExtensionTask.identifier, source: extension, profileLocation: installExtensionTaskOptions.profileLocation });
-        this.logService.info('Installing extension:', installExtensionTask.identifier.id);
-        allInstallExtensionTasks.push({ task: installExtensionTask, manifest });
-        let installExtensionHasDependents = false;
         try {
-            if (installExtensionTaskOptions.donotIncludePackAndDependencies) {
-                this.logService.info('Installing the extension without checking dependencies and pack', installExtensionTask.identifier.id);
-            }
-            else {
-                try {
-                    const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(installExtensionTask.identifier, manifest, !!installExtensionTaskOptions.installOnlyNewlyAddedFromExtensionPack, !!installExtensionTaskOptions.installPreReleaseVersion, installExtensionTaskOptions.profileLocation);
-                    const installed = await this.getInstalled(undefined, installExtensionTaskOptions.profileLocation);
-                    const options = { ...installExtensionTaskOptions, donotIncludePackAndDependencies: true, context: { ...installExtensionTaskOptions.context, [EXTENSION_INSTALL_DEP_PACK_CONTEXT]: true } };
-                    for (const { gallery, manifest } of distinct(allDepsAndPackExtensionsToInstall, ({ gallery }) => gallery.identifier.id)) {
-                        installExtensionHasDependents = installExtensionHasDependents || !!manifest.extensionDependencies?.some(id => areSameExtensions({ id }, installExtensionTask.identifier));
-                        const key = getInstallExtensionTaskKey(gallery);
-                        const existingInstallingExtension = this.installingExtensions.get(key);
-                        if (existingInstallingExtension) {
-                            if (shouldWait(installExtensionTask, existingInstallingExtension.task)) {
-                                const identifier = existingInstallingExtension.task.identifier;
-                                this.logService.info('Waiting for already requested installing extension', identifier.id, installExtensionTask.identifier.id);
-                                existingInstallingExtension.waitingTasks.push(installExtensionTask);
-                                alreadyRequestedInstallations.push(Event.toPromise(Event.filter(this.onDidInstallExtensions, results => ( results.some(result => areSameExtensions(result.identifier, identifier))))).then(results => {
-                                    this.logService.info('Finished waiting for already requested installing extension', identifier.id, installExtensionTask.identifier.id);
-                                    const result = results.find(result => areSameExtensions(result.identifier, identifier));
-                                    if (!result?.local) {
-                                        throw new Error(`Extension ${identifier.id} is not installed`);
-                                    }
-                                }));
-                            }
-                        }
-                        else if (!( installed.some(({ identifier }) => areSameExtensions(identifier, gallery.identifier)))) {
-                            const task = this.createInstallExtensionTask(manifest, gallery, options);
-                            this.installingExtensions.set(key, { task, waitingTasks: [installExtensionTask] });
-                            this._onInstallExtension.fire({ identifier: task.identifier, source: gallery, profileLocation: installExtensionTaskOptions.profileLocation });
-                            this.logService.info('Installing extension:', task.identifier.id, installExtensionTask.identifier.id);
-                            allInstallExtensionTasks.push({ task, manifest });
-                        }
-                    }
+            for (const { manifest, extension, options } of extensions) {
+                const isApplicationScoped = options.isApplicationScoped || options.isBuiltin || isApplicationScopedExtension(manifest);
+                const installExtensionTaskOptions = {
+                    ...options,
+                    installOnlyNewlyAddedFromExtensionPack: URI.isUri(extension) ? options.installOnlyNewlyAddedFromExtensionPack : true,
+                    isApplicationScoped,
+                    profileLocation: isApplicationScoped ? this.userDataProfilesService.defaultProfile.extensionsResource : options.profileLocation ?? this.getCurrentExtensionsManifestLocation()
+                };
+                const existingInstallExtensionTask = !URI.isUri(extension) ? this.installingExtensions.get(getInstallExtensionTaskKey(extension, installExtensionTaskOptions.profileLocation)) : undefined;
+                if (existingInstallExtensionTask) {
+                    this.logService.info('Extension is already requested to install', existingInstallExtensionTask.task.identifier.id);
+                    alreadyRequestedInstallations.push(existingInstallExtensionTask.task.waitUntilTaskIsFinished());
                 }
-                catch (error) {
-                    if (URI.isUri(installExtensionTask.source)) {
-                        if (isNonEmptyArray(manifest.extensionDependencies)) {
-                            this.logService.warn(`Cannot install dependencies of extension:`, installExtensionTask.identifier.id, error.message);
-                        }
-                        if (isNonEmptyArray(manifest.extensionPack)) {
-                            this.logService.warn(`Cannot install packed extensions of extension:`, installExtensionTask.identifier.id, error.message);
-                        }
-                    }
-                    else {
-                        this.logService.error('Error while preparing to install dependencies and extension packs of the extension:', installExtensionTask.identifier.id);
-                        throw error;
-                    }
+                else {
+                    createInstallExtensionTask(manifest, extension, installExtensionTaskOptions);
                 }
             }
-            const extensionsToInstallMap = allInstallExtensionTasks.reduce((result, { task, manifest }) => {
-                result.set(task.identifier.id.toLowerCase(), { task, manifest });
-                return result;
-            }, ( new Map()));
-            while (extensionsToInstallMap.size) {
-                let extensionsToInstall;
-                const extensionsWithoutDepsToInstall = [...( extensionsToInstallMap.values())].filter(({ manifest }) => !manifest.extensionDependencies?.some(id => ( extensionsToInstallMap.has(id.toLowerCase()))));
-                if (extensionsWithoutDepsToInstall.length) {
-                    extensionsToInstall = extensionsToInstallMap.size === 1 ? extensionsWithoutDepsToInstall
-                        : extensionsWithoutDepsToInstall.filter(({ task }) => !(task === installExtensionTask && !installExtensionHasDependents));
+            await Promise.all(( [...( installingExtensionsMap.values())].map(async ({ task, manifest }) => {
+                if (task.options.donotIncludePackAndDependencies) {
+                    this.logService.info('Installing the extension without checking dependencies and pack', task.identifier.id);
                 }
                 else {
-                    this.logService.info('Found extensions with circular dependencies', ( extensionsWithoutDepsToInstall.map(({ task }) => task.identifier.id)));
-                    extensionsToInstall = [...( extensionsToInstallMap.values())];
-                }
-                await this.joinAllSettled(( extensionsToInstall.map(async ({ task }) => {
-                    const startTime = ( new Date()).getTime();
                     try {
-                        const local = await task.run();
-                        await this.joinAllSettled(( this.participants.map(
-                            participant => participant.postInstall(local, task.source, installExtensionTaskOptions, CancellationToken.None)
-                        )));
-                        if (!URI.isUri(task.source)) {
-                            const isUpdate = task.operation === 3 ;
-                            const durationSinceUpdate = isUpdate ? undefined : (( new Date()).getTime() - task.source.lastUpdated) / 1000;
-                            reportTelemetry(this.telemetryService, isUpdate ? 'extensionGallery:update' : 'extensionGallery:install', {
-                                extensionData: getGalleryExtensionTelemetryData(task.source),
-                                verificationStatus: task.verificationStatus,
-                                duration: ( new Date()).getTime() - startTime,
-                                durationSinceUpdate
-                            });
-                            if (isWeb && task.operation !== 3 ) {
-                                try {
-                                    await this.galleryService.reportStatistic(local.manifest.publisher, local.manifest.name, local.manifest.version, "install" );
+                        const allDepsAndPackExtensionsToInstall = await this.getAllDepsAndPackExtensions(task.identifier, manifest, !!task.options.installOnlyNewlyAddedFromExtensionPack, !!task.options.installPreReleaseVersion, task.options.profileLocation);
+                        const installed = await this.getInstalled(undefined, task.options.profileLocation);
+                        const options = { ...task.options, donotIncludePackAndDependencies: true, context: { ...task.options.context, [EXTENSION_INSTALL_DEP_PACK_CONTEXT]: true } };
+                        for (const { gallery, manifest } of distinct(allDepsAndPackExtensionsToInstall, ({ gallery }) => gallery.identifier.id)) {
+                            if (( installingExtensionsMap.has(`${gallery.identifier.id.toLowerCase()}-${( options.profileLocation.toString())}`))) {
+                                continue;
+                            }
+                            const existingInstallingExtension = this.installingExtensions.get(getInstallExtensionTaskKey(gallery, options.profileLocation));
+                            if (existingInstallingExtension) {
+                                if (this.canWaitForTask(task, existingInstallingExtension.task)) {
+                                    const identifier = existingInstallingExtension.task.identifier;
+                                    this.logService.info('Waiting for already requested installing extension', identifier.id, task.identifier.id);
+                                    existingInstallingExtension.waitingTasks.push(task);
+                                    alreadyRequestedInstallations.push(Event.toPromise(Event.filter(this.onDidInstallExtensions, results => ( results.some(result => areSameExtensions(result.identifier, identifier))))).then(results => {
+                                        this.logService.info('Finished waiting for already requested installing extension', identifier.id, task.identifier.id);
+                                        const result = results.find(result => areSameExtensions(result.identifier, identifier));
+                                        if (!result?.local) {
+                                            throw new Error(`Extension ${identifier.id} is not installed`);
+                                        }
+                                    }));
                                 }
-                                catch (error) {  }
+                            }
+                            else if (!( installed.some(({ identifier }) => areSameExtensions(identifier, gallery.identifier)))) {
+                                createInstallExtensionTask(manifest, gallery, options);
                             }
                         }
-                        installResults.push({ local, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.profileLocation, applicationScoped: local.isApplicationScoped });
                     }
                     catch (error) {
-                        this.logService.error('Error while installing the extension', task.identifier.id, getErrorMessage(error));
-                        throw error;
-                    }
-                    finally {
-                        extensionsToInstallMap.delete(task.identifier.id.toLowerCase());
+                        if (URI.isUri(task.source)) {
+                            if (isNonEmptyArray(manifest.extensionDependencies)) {
+                                this.logService.warn(`Cannot install dependencies of extension:`, task.identifier.id, error.message);
+                            }
+                            if (isNonEmptyArray(manifest.extensionPack)) {
+                                this.logService.warn(`Cannot install packed extensions of extension:`, task.identifier.id, error.message);
+                            }
+                        }
+                        else {
+                            this.logService.error('Error while preparing to install dependencies and extension packs of the extension:', task.identifier.id);
+                            throw error;
+                        }
                     }
-                })));
-            }
-            if (alreadyRequestedInstallations.length) {
-                await this.joinAllSettled(alreadyRequestedInstallations);
-            }
-            installResults.forEach(({ identifier }) => this.logService.info(`Extension installed successfully:`, identifier.id));
-            return installResults;
-        }
-        catch (error) {
-            allInstallExtensionTasks.forEach(({ task }) => task.cancel());
-            if (installResults.length) {
+                }
+            })));
+            await this.joinAllSettled(( [...( installingExtensionsMap.values())].map(async ({ task }) => {
+                const startTime = ( new Date()).getTime();
                 try {
-                    const result = await Promise.allSettled(( installResults.map(
-                        ({ local }) => this.createUninstallExtensionTask(local, { versionOnly: true, profileLocation: installExtensionTaskOptions.profileLocation }).run()
+                    const local = await task.run();
+                    await this.joinAllSettled(( this.participants.map(
+                        participant => participant.postInstall(local, task.source, task.options, CancellationToken.None)
                     )));
-                    for (let index = 0; index < result.length; index++) {
-                        const r = result[index];
-                        const { identifier } = installResults[index];
-                        if (r.status === 'fulfilled') {
-                            this.logService.info('Rollback: Uninstalled extension', identifier.id);
-                        }
-                        else {
-                            this.logService.warn('Rollback: Error while uninstalling extension', identifier.id, getErrorMessage(r.reason));
+                    if (!URI.isUri(task.source)) {
+                        const isUpdate = task.operation === 3 ;
+                        const durationSinceUpdate = isUpdate ? undefined : (( new Date()).getTime() - task.source.lastUpdated) / 1000;
+                        reportTelemetry(this.telemetryService, isUpdate ? 'extensionGallery:update' : 'extensionGallery:install', {
+                            extensionData: getGalleryExtensionTelemetryData(task.source),
+                            verificationStatus: task.verificationStatus,
+                            duration: ( new Date()).getTime() - startTime,
+                            durationSinceUpdate
+                        });
+                        if (isWeb && task.operation !== 3 ) {
+                            try {
+                                await this.galleryService.reportStatistic(local.manifest.publisher, local.manifest.name, local.manifest.version, "install" );
+                            }
+                            catch (error) {  }
                         }
                     }
+                    successResults.push({ local, identifier: task.identifier, operation: task.operation, source: task.source, context: task.options.context, profileLocation: task.profileLocation, applicationScoped: local.isApplicationScoped });
                 }
                 catch (error) {
-                    this.logService.warn('Error while rolling back extensions', getErrorMessage(error), ( installResults.map(({ identifier }) => identifier.id)));
+                    this.logService.error('Error while installing the extension', task.identifier.id, getErrorMessage(error));
+                    throw error;
                 }
+            })));
+            if (alreadyRequestedInstallations.length) {
+                await this.joinAllSettled(alreadyRequestedInstallations);
             }
-            return ( allInstallExtensionTasks.map(
-                ({ task }) => ({ identifier: task.identifier, operation: 2 , source: task.source, context: installExtensionTaskOptions.context, profileLocation: installExtensionTaskOptions.profileLocation, error })
-            ));
+            for (const result of successResults) {
+                this.logService.info(`Extension installed successfully:`, result.identifier.id);
+                results.push(result);
+            }
+            return results;
+        }
+        catch (error) {
+            if (successResults.length) {
+                await Promise.allSettled(( successResults.map(async ({ local, profileLocation }) => {
+                    try {
+                        await this.createUninstallExtensionTask(local, { versionOnly: true, profileLocation }).run();
+                        this.logService.info('Rollback: Uninstalled extension', local.identifier.id);
+                    }
+                    catch (error) {
+                        this.logService.warn('Rollback: Error while uninstalling extension', local.identifier.id, getErrorMessage(error));
+                    }
+                })));
+            }
+            for (const { task } of ( installingExtensionsMap.values())) {
+                task.cancel();
+                results.push({ identifier: task.identifier, operation: 2 , source: task.source, context: task.options.context, profileLocation: task.profileLocation, error });
+            }
+            throw error;
         }
         finally {
-            for (const { task } of allInstallExtensionTasks) {
+            for (const { task } of ( installingExtensionsMap.values())) {
                 if (task.source && !URI.isUri(task.source)) {
-                    this.installingExtensions.delete(getInstallExtensionTaskKey(task.source));
+                    this.installingExtensions.delete(getInstallExtensionTaskKey(task.source, task.profileLocation));
                 }
             }
+            if (results.length) {
+                this._onDidInstallExtensions.fire(results);
+            }
         }
     }
     canWaitForTask(taskToWait, taskToWaitFor) {
@@ -682,13 +644,11 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     }
     async updateControlCache() {
         try {
-            this.logService.trace('ExtensionManagementService.refreshReportedCache');
-            const manifest = await this.galleryService.getExtensionsControlManifest();
-            this.logService.trace(`ExtensionManagementService.refreshControlCache`, manifest);
-            return manifest;
+            this.logService.trace('ExtensionManagementService.updateControlCache');
+            return await this.galleryService.getExtensionsControlManifest();
         }
         catch (err) {
-            this.logService.trace('ExtensionManagementService.refreshControlCache - failed to get extension control manifest');
+            this.logService.trace('ExtensionManagementService.refreshControlCache - failed to get extension control manifest', getErrorMessage(err));
             return { malicious: [], deprecated: {}, search: [] };
         }
     }

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

@@ -269,7 +269,7 @@ function toExtension(galleryExtension, version, allTargetPlatforms, queryContext
         publisherDisplayName: galleryExtension.publisher.displayName,
         publisherDomain: galleryExtension.publisher.domain ? { link: galleryExtension.publisher.domain, verified: !!galleryExtension.publisher.isDomainVerified } : undefined,
         publisherSponsorLink: getSponsorLink(latestVersion),
-        description: galleryExtension.shortDescription || '',
+        description: galleryExtension.shortDescription ?? '',
         installCount: getStatistic(galleryExtension.statistics, 'install'),
         rating: getStatistic(galleryExtension.statistics, 'averagerating'),
         ratingCount: getStatistic(galleryExtension.statistics, 'ratingcount'),

package/vscode/src/vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor.js

@@ -5,11 +5,12 @@ import { renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel
 import { Action, Separator } from 'vscode/vscode/vs/base/common/actions';
 import { isNonEmptyArray } from 'vscode/vscode/vs/base/common/arrays';
 import { RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
+import { fromNow } from 'vscode/vscode/vs/base/common/date';
 import { memoize } from 'vscode/vscode/vs/base/common/decorators';
 import { dispose } from 'vscode/vscode/vs/base/common/lifecycle';
 import { Schemas } from 'vscode/vscode/vs/base/common/network';
 import './media/runtimeExtensionsEditor.css.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { Action2, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IClipboardService } from 'vscode/vscode/vs/platform/clipboard/common/clipboardService';
@@ -19,16 +20,19 @@ import { ExtensionIdentifierMap } from 'vscode/vscode/vs/platform/extensions/com
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from 'vscode/vscode/vs/platform/label/common/label';
 import { WorkbenchList } from 'vscode/vscode/vs/platform/list/browser/listService';
-import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { Severity, INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
 import { ITelemetryService } from 'vscode/vscode/vs/platform/telemetry/common/telemetry';
 import { editorBackground } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
 import { EditorPane } from 'vscode/vscode/vs/workbench/browser/parts/editor/editorPane';
+import { errorIcon, warningIcon } from 'vscode/vscode/vs/workbench/contrib/extensions/browser/extensionsIcons';
 import { IExtensionsWorkbenchService } from 'vscode/vscode/vs/workbench/contrib/extensions/common/extensions';
 import { RuntimeExtensionsInput } from '../common/runtimeExtensionsInput.js';
 import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
 import { IWorkbenchEnvironmentService } from 'vscode/vscode/vs/workbench/services/environment/common/environmentService';
+import { Extensions, IExtensionFeaturesManagementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionFeatures';
 import { getDefaultIconPath } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement';
 import { LocalWebWorkerRunningLocation } from 'vscode/vscode/vs/workbench/services/extensions/common/extensionRunningLocation';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
@@ -37,7 +41,7 @@ var AbstractRuntimeExtensionsEditor_1;
 let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor extends EditorPane {
     static { AbstractRuntimeExtensionsEditor_1 = this; }
     static { this.ID = 'workbench.editor.runtimeExtensions'; }
-    constructor(telemetryService, themeService, contextKeyService, _extensionsWorkbenchService, _extensionService, _notificationService, _contextMenuService, _instantiationService, storageService, _labelService, _environmentService, _clipboardService) {
+    constructor(telemetryService, themeService, contextKeyService, _extensionsWorkbenchService, _extensionService, _notificationService, _contextMenuService, _instantiationService, storageService, _labelService, _environmentService, _clipboardService, _extensionFeaturesManagementService) {
         super(AbstractRuntimeExtensionsEditor_1.ID, telemetryService, themeService, storageService);
         this._extensionsWorkbenchService = _extensionsWorkbenchService;
         this._extensionService = _extensionService;
@@ -47,10 +51,12 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
         this._labelService = _labelService;
         this._environmentService = _environmentService;
         this._clipboardService = _clipboardService;
+        this._extensionFeaturesManagementService = _extensionFeaturesManagementService;
         this._list = null;
         this._elements = null;
         this._updateSoon = this._register(( new RunOnceScheduler(() => this._updateExtensions(), 200)));
         this._register(this._extensionService.onDidChangeExtensionsStatus(() => this._updateSoon.schedule()));
+        this._register(this._extensionFeaturesManagementService.onDidChangeAccessData(() => this._updateSoon.schedule()));
         this._updateExtensions();
     }
     async _updateExtensions() {
@@ -153,7 +159,7 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                 const name = append(header, $('div.name'));
                 const version = append(header, $('span.version'));
                 const msgContainer = append(desc, $('div.msg'));
-                const actionbar = ( new ActionBar(desc, { animated: false }));
+                const actionbar = ( new ActionBar(desc));
                 actionbar.onDidRun(({ error }) => error && this._notificationService.error(error));
                 const timeContainer = append(element, $('.time'));
                 const activationTime = append(timeContainer, $('div.activation-time'));
@@ -364,6 +370,34 @@ let AbstractRuntimeExtensionsEditor = class AbstractRuntimeExtensionsEditor exte
                     const el = $('span', undefined, ...renderLabelWithIcons(extraLabel));
                     data.msgContainer.appendChild(el);
                 }
+                const features = ( Registry.as(Extensions.ExtensionFeaturesRegistry)).getExtensionFeatures();
+                for (const feature of features) {
+                    const accessData = this._extensionFeaturesManagementService.getAccessData(element.description.identifier, feature.id);
+                    if (accessData) {
+                        const status = accessData?.current?.status;
+                        if (status) {
+                            data.msgContainer.appendChild($('span', undefined, `${feature.label}: `));
+                            data.msgContainer.appendChild($('span', undefined, ...renderLabelWithIcons(`$(${status.severity === Severity.Error ? errorIcon.id : warningIcon.id}) ${status.message}`)));
+                        }
+                        if (accessData?.current) {
+                            const element = $('span', undefined, ( localizeWithPath(
+                                'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
+                                'requests count',
+                                "{0} Requests: {1} (Session)",
+                                feature.label,
+                                accessData.current.count
+                            )));
+                            element.title = ( localizeWithPath(
+                                'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
+                                'requests count title',
+                                "Last request was {0}. Overall Requests: {1}",
+                                fromNow(accessData.current.lastAccessed, true, true),
+                                accessData.totalCount
+                            ));
+                            data.msgContainer.appendChild(element);
+                        }
+                    }
+                }
                 if (element.profileInfo) {
                     data.profileTime.textContent = `Profile: ${(element.profileInfo.totalTime / 1000).toFixed(2)}ms`;
                 }
@@ -463,17 +497,18 @@ AbstractRuntimeExtensionsEditor = AbstractRuntimeExtensionsEditor_1 = ( __decora
     ( __param(8, IStorageService)),
     ( __param(9, ILabelService)),
     ( __param(10, IWorkbenchEnvironmentService)),
-    ( __param(11, IClipboardService))
+    ( __param(11, IClipboardService)),
+    ( __param(12, IExtensionFeaturesManagementService))
 ], AbstractRuntimeExtensionsEditor));
 class ShowRuntimeExtensionsAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.showRuntimeExtensions',
-            title: { value: ( localizeWithPath(
+            title: ( localize2WithPath(
                 'vs/workbench/contrib/extensions/browser/abstractRuntimeExtensionsEditor',
                 'showRuntimeExtensions',
                 "Show Running Extensions"
-            )), original: 'Show Running Extensions' },
+            )),
             category: Categories.Developer,
             f1: true,
             menu: {