@codingame/monaco-vscode-extension-gallery-service-override 22.1.8 → 23.0.0

package/index.js

@@ -11,7 +11,7 @@ import { IExtensionRecommendationNotificationService } from '@codingame/monaco-v
 import { SyncDescriptor } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/descriptors';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
-import { getLocale } from '@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common/vscode/vs/platform/languagePacks/common/languagePacks';
+import { getLocale } from '@codingame/monaco-vscode-2a04f0cd-b806-5886-909e-418183d32279-common/vscode/vs/platform/languagePacks/common/languagePacks';
 import { IgnoredExtensionsManagementService } from './vscode/src/vs/platform/userDataSync/common/ignoredExtensions.js';
 import { IIgnoredExtensionsManagementService } from '@codingame/monaco-vscode-api/vscode/vs/platform/userDataSync/common/ignoredExtensions.service';
 import { ExtensionRecommendationNotificationService } from '@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common/vscode/vs/workbench/contrib/extensions/browser/extensionRecommendationNotificationService';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-extension-gallery-service-override",
-  "version": "22.1.8",
+  "version": "23.0.0",
   "private": false,
   "description": "VSCode public API plugged on the monaco editor - extension-gallery service-override",
   "keywords": [],
@@ -15,15 +15,16 @@
   },
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "22.1.8",
-    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "22.1.8",
-    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "22.1.8",
-    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "22.1.8",
-    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "22.1.8",
-    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "22.1.8",
-    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "22.1.8",
-    "@codingame/monaco-vscode-a654b07e-8806-5425-b124-18f03ba8e11a-common": "22.1.8",
-    "@codingame/monaco-vscode-api": "22.1.8"
+    "@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common": "23.0.0",
+    "@codingame/monaco-vscode-249dc928-1da3-51c1-82d0-45e0ba9d08a1-common": "23.0.0",
+    "@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common": "23.0.0",
+    "@codingame/monaco-vscode-2a04f0cd-b806-5886-909e-418183d32279-common": "23.0.0",
+    "@codingame/monaco-vscode-571c8352-7953-5038-9f09-e03bb6219a0e-common": "23.0.0",
+    "@codingame/monaco-vscode-60014c9d-b815-501d-83a9-4b08725c2ec2-common": "23.0.0",
+    "@codingame/monaco-vscode-7b19b93e-7a49-5c48-81f5-091a64f468d2-common": "23.0.0",
+    "@codingame/monaco-vscode-8c844347-a703-5de1-9eeb-5e0c7f503a58-common": "23.0.0",
+    "@codingame/monaco-vscode-9ed6fe06-a052-57c2-a234-5d9b94d2e7e0-common": "23.0.0",
+    "@codingame/monaco-vscode-api": "23.0.0"
   },
   "main": "index.js",
   "module": "index.js",

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

@@ -33,7 +33,7 @@ let CommontExtensionManagementService = class CommontExtensionManagementService
         const allowedToInstall = this.allowedExtensionsService.isAllowed({ id: extension.identifier.id, publisherDisplayName: extension.publisherDisplayName });
         if (allowedToInstall !== true) {
             return (new MarkdownString(localize(
-                1783,
+                1790,
                 "This extension cannot be installed because {0}",
                 allowedToInstall.value
             )));
@@ -41,12 +41,12 @@ let CommontExtensionManagementService = class CommontExtensionManagementService
         if (!(await this.isExtensionPlatformCompatible(extension))) {
             const learnLink = isWeb ? 'https://aka.ms/vscode-web-extensions-guide' : 'https://aka.ms/vscode-platform-specific-extensions';
             return (new MarkdownString(`${( localize(
-                1784,
+                1791,
                 "The '{0}' extension is not available in {1} for the {2}.",
                 extension.displayName ?? extension.identifier.id,
                 this.productService.nameLong,
                 TargetPlatformToString(await this.getTargetPlatform())
-            ))} [${( localize(1785, "Learn Why"))}](${learnLink})`));
+            ))} [${( localize(1792, "Learn Why"))}](${learnLink})`));
         }
         return true;
     }
@@ -111,7 +111,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
     }
     async installGalleryExtensions(extensions) {
         if (!this.galleryService.isEnabled()) {
-            throw ( new ExtensionManagementError(( localize(1786, "Marketplace is not enabled")), ExtensionManagementErrorCode.NotAllowed));
+            throw ( new ExtensionManagementError(( localize(1793, "Marketplace is not enabled")), ExtensionManagementErrorCode.NotAllowed));
         }
         const results = [];
         const installableExtensions = [];
@@ -547,7 +547,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         const extensionsControlManifest = await this.getExtensionsControlManifest();
         if (isMalicious(extension.identifier, extensionsControlManifest.malicious)) {
             throw ( new ExtensionManagementError(( localize(
-                1787,
+                1794,
                 "Can't install '{0}' extension since it was reported to be problematic.",
                 extension.identifier.id
             )), ExtensionManagementErrorCode.Malicious));
@@ -558,7 +558,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             compatibleExtension = (await this.galleryService.getExtensions([{ id: deprecationInfo.extension.id, preRelease: deprecationInfo.extension.preRelease }], { targetPlatform: await this.getTargetPlatform(), compatible: true, productVersion }, CancellationToken.None))[0];
             if (!compatibleExtension) {
                 throw ( new ExtensionManagementError(( localize(
-                    1788,
+                    1795,
                     "Can't install '{0}' extension since it was deprecated and the replacement extension '{1}' can't be found.",
                     extension.identifier.id,
                     deprecationInfo.extension.id
@@ -569,7 +569,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             if ((await this.canInstall(extension)) !== true) {
                 const targetPlatform = await this.getTargetPlatform();
                 throw ( new ExtensionManagementError(( localize(
-                    1784,
+                    1791,
                     "The '{0}' extension is not available in {1} for the {2}.",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -581,7 +581,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 const incompatibleApiProposalsMessages = [];
                 if (!areApiProposalsCompatible(extension.properties.enabledApiProposals ?? [], incompatibleApiProposalsMessages)) {
                     throw ( new ExtensionManagementError(( localize(
-                        1789,
+                        1796,
                         "Can't install '{0}' extension. {1}",
                         extension.displayName ?? extension.identifier.id,
                         incompatibleApiProposalsMessages[0]
@@ -589,13 +589,13 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 }
                 if (!installPreRelease && extension.hasPreReleaseVersion && extension.properties.isPreReleaseVersion && (await this.galleryService.getExtensions([extension.identifier], CancellationToken.None))[0]) {
                     throw ( new ExtensionManagementError(( localize(
-                        1790,
+                        1797,
                         "Can't install release version of '{0}' extension because it has no release version.",
                         extension.displayName ?? extension.identifier.id
                     )), ExtensionManagementErrorCode.ReleaseVersionNotFound));
                 }
                 throw ( new ExtensionManagementError(( localize(
-                    1791,
+                    1798,
                     "Can't install '{0}' extension because it is not compatible with the current version of {1} (version {2}).",
                     extension.identifier.id,
                     this.productService.nameLong,
@@ -820,7 +820,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         if (extensionToUninstall === dependingExtension) {
             if (dependents.length === 1) {
                 return localize(
-                    1792,
+                    1799,
                     "Cannot uninstall '{0}' extension. '{1}' extension depends on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name
@@ -828,7 +828,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             }
             if (dependents.length === 2) {
                 return localize(
-                    1793,
+                    1800,
                     "Cannot uninstall '{0}' extension. '{1}' and '{2}' extensions depend on this.",
                     extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                     dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -836,7 +836,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
                 );
             }
             return localize(
-                1794,
+                1801,
                 "Cannot uninstall '{0}' extension. '{1}', '{2}' and other extension depend on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependents[0].manifest.displayName || dependents[0].manifest.name,
@@ -845,7 +845,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 1) {
             return localize(
-                1795,
+                1802,
                 "Cannot uninstall '{0}' extension . It includes uninstalling '{1}' extension and '{2}' extension depends on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -855,7 +855,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
         }
         if (dependents.length === 2) {
             return localize(
-                1796,
+                1803,
                 "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}' and '{3}' extensions depend on this.",
                 extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
                 dependingExtension.manifest.displayName
@@ -865,7 +865,7 @@ let AbstractExtensionManagementService = class AbstractExtensionManagementServic
             );
         }
         return localize(
-            1797,
+            1804,
             "Cannot uninstall '{0}' extension. It includes uninstalling '{1}' extension and '{2}', '{3}' and other extensions depend on this.",
             extensionToUninstall.manifest.displayName || extensionToUninstall.manifest.name,
             dependingExtension.manifest.displayName

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

@@ -77,14 +77,14 @@ let AllowedExtensionsService = class AllowedExtensionsService extends Disposable
         }
         const settingsCommandLink = ( createCommandUri('workbench.action.openSettings', { query: `@id:${AllowedExtensionsConfigKey}` }).toString());
         const extensionValue = this._allowedExtensionsConfigValue[id];
-        const extensionReason = ( new MarkdownString(( localize(1798, "it is not in the [allowed list]({0})", settingsCommandLink))));
+        const extensionReason = ( new MarkdownString(( localize(1805, "it is not in the [allowed list]({0})", settingsCommandLink))));
         if (!isUndefined(extensionValue)) {
             if (isBoolean(extensionValue)) {
                 return extensionValue ? true : extensionReason;
             }
             if (extensionValue === 'stable' && prerelease) {
                 return (new MarkdownString(localize(
-                    1799,
+                    1806,
                     "the pre-release versions of this extension are not in the [allowed list]({0})",
                     settingsCommandLink
                 )));
@@ -104,7 +104,7 @@ let AllowedExtensionsService = class AllowedExtensionsService extends Disposable
                 return false;
             }))) {
                 return (new MarkdownString(localize(
-                    1800,
+                    1807,
                     "the version {0} of this extension is not in the [allowed list]({1})",
                     version,
                     settingsCommandLink
@@ -117,7 +117,7 @@ let AllowedExtensionsService = class AllowedExtensionsService extends Disposable
         if (!isUndefined(publisherValue)) {
             if (isBoolean(publisherValue)) {
                 return publisherValue ? true : ( new MarkdownString(( localize(
-                    1801,
+                    1808,
                     "the extensions from this publisher are not in the [allowed list]({1})",
                     publisherKey,
                     settingsCommandLink
@@ -125,7 +125,7 @@ let AllowedExtensionsService = class AllowedExtensionsService extends Disposable
             }
             if (publisherValue === 'stable' && prerelease) {
                 return (new MarkdownString(localize(
-                    1802,
+                    1809,
                     "the pre-release versions from this publisher are not in the [allowed list]({1})",
                     publisherKey,
                     settingsCommandLink

package/vscode/src/vs/platform/extensionManagement/common/extensionGalleryService.d.ts

@@ -1,5 +1,5 @@
 import { CancellationToken } from "@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation";
-import { IPager } from "@codingame/monaco-vscode-62190c26-af1c-5f7a-a364-e05a59cfb7c7-common/vscode/vs/base/common/paging";
+import { IPager } from "@codingame/monaco-vscode-2eda793f-4b5b-58e8-83c5-1bfd3bad15f1-common/vscode/vs/base/common/paging";
 import { URI } from "@codingame/monaco-vscode-api/vscode/vs/base/common/uri";
 import { IConfigurationService } from "@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service";
 import { IEnvironmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service";
@@ -13,7 +13,6 @@ import { IProductService } from "@codingame/monaco-vscode-api/vscode/vs/platform
 import { IRequestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/request/common/request.service";
 import { IStorageService } from "@codingame/monaco-vscode-api/vscode/vs/platform/storage/common/storage.service";
 import { ITelemetryService } from "@codingame/monaco-vscode-api/vscode/vs/platform/telemetry/common/telemetry.service";
-import { IAssignmentService } from "@codingame/monaco-vscode-api/vscode/vs/platform/assignment/common/assignment";
 import { IExtensionGalleryManifestService } from "@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionGalleryManifest.service";
 interface IRawGalleryExtensionFile {
     readonly assetType: string;
@@ -33,8 +32,8 @@ export interface IRawGalleryExtensionVersion {
     readonly targetPlatform?: string;
 }
 export declare function sortExtensionVersions(versions: IRawGalleryExtensionVersion[], preferredTargetPlatform: TargetPlatform): IRawGalleryExtensionVersion[];
+export declare function filterLatestExtensionVersionsForTargetPlatform(versions: IRawGalleryExtensionVersion[], targetPlatform: TargetPlatform, allTargetPlatforms: TargetPlatform[]): IRawGalleryExtensionVersion[];
 export declare abstract class AbstractExtensionGalleryService implements IExtensionGalleryService {
-    private readonly assignmentService;
     private readonly requestService;
     private readonly logService;
     private readonly environmentService;
@@ -49,7 +48,7 @@ export declare abstract class AbstractExtensionGalleryService implements IExtens
     private readonly unpkgResourceApi;
     private readonly commonHeadersPromise;
     private readonly extensionsEnabledWithApiProposalVersion;
-    constructor(storageService: IStorageService | undefined, assignmentService: IAssignmentService | undefined, requestService: IRequestService, logService: ILogService, environmentService: IEnvironmentService, telemetryService: ITelemetryService, fileService: IFileService, productService: IProductService, configurationService: IConfigurationService, allowedExtensionsService: IAllowedExtensionsService, extensionGalleryManifestService: IExtensionGalleryManifestService);
+    constructor(storageService: IStorageService | undefined, requestService: IRequestService, logService: ILogService, environmentService: IEnvironmentService, telemetryService: ITelemetryService, fileService: IFileService, productService: IProductService, configurationService: IConfigurationService, allowedExtensionsService: IAllowedExtensionsService, extensionGalleryManifestService: IExtensionGalleryManifestService);
     isEnabled(): boolean;
     getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, token: CancellationToken): Promise<IGalleryExtension[]>;
     getExtensions(extensionInfos: ReadonlyArray<IExtensionInfo>, options: IExtensionQueryOptions, token: CancellationToken): Promise<IGalleryExtension[]>;
@@ -64,10 +63,7 @@ export declare abstract class AbstractExtensionGalleryService implements IExtens
     private isEngineValid;
     query(options: IQueryOptions, token: CancellationToken): Promise<IPager<IGalleryExtension>>;
     private queryGalleryExtensions;
-    private queryGalleryExtensionsWithAllVersionsAsFallback;
-    private queryGalleryExtensionsUsingIncludeLatestPrereleaseAndStableVersionFlag;
-    private getRawGalleryExtensionVersionsToValidate;
-    private getRawGalleryExtensionVersion;
+    private getValidRawGalleryExtensionVersion;
     private queryRawGalleryExtensions;
     private getHeaderValue;
     private getLatestRawGalleryExtensionWithFallback;
@@ -84,6 +80,7 @@ export declare abstract class AbstractExtensionGalleryService implements IExtens
     private getVersions;
     private getAsset;
     getExtensionsControlManifest(): Promise<IExtensionsControlManifest>;
+    private getRequestTimeout;
 }
 export declare class ExtensionGalleryService extends AbstractExtensionGalleryService {
     constructor(storageService: IStorageService, requestService: IRequestService, logService: ILogService, environmentService: IEnvironmentService, telemetryService: ITelemetryService, fileService: IFileService, productService: IProductService, configurationService: IConfigurationService, allowedExtensionsService: IAllowedExtensionsService, extensionGalleryManifestService: IExtensionGalleryManifestService);

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

@@ -6,12 +6,12 @@ import { semverExports } from '@codingame/monaco-vscode-api/_virtual/semver';
 import { getErrorMessage, CancellationError, isCancellationError } from '@codingame/monaco-vscode-api/vscode/vs/base/common/errors';
 import { isWeb, platform } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import { arch } from '@codingame/monaco-vscode-api/vscode/vs/base/common/process';
-import { isString, isBoolean } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
+import { isString, isBoolean, isNumber } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
 import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
 import { isOfflineError } from '@codingame/monaco-vscode-23aade48-f094-5c08-9555-97fc9cca96c9-common/vscode/vs/base/parts/request/common/request';
 import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/configuration/common/configuration.service';
 import { IEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/platform/environment/common/environment.service';
-import { getTargetPlatform, SortOrder, SortBy, FilterType, toTargetPlatform, WEB_EXTENSION_TAG, EXTENSION_IDENTIFIER_REGEX, ExtensionGalleryError, ExtensionGalleryErrorCode, isNotWebExtensionInWebTargetPlatform, isTargetPlatformCompatible, StatisticType, InstallOperation } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
+import { getTargetPlatform, SortOrder, SortBy, FilterType, toTargetPlatform, WEB_EXTENSION_TAG, isTargetPlatformCompatible, EXTENSION_IDENTIFIER_REGEX, ExtensionGalleryError, ExtensionGalleryErrorCode, isNotWebExtensionInWebTargetPlatform, StatisticType, InstallOperation, ExtensionRequestsTimeoutConfigKey } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement';
 import { IAllowedExtensionsService } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
 import { adoptToGalleryExtensionId, getGalleryExtensionId, areSameExtensions, getGalleryExtensionTelemetryData } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensionManagement/common/extensionManagementUtil';
 import { TargetPlatform } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
@@ -35,7 +35,6 @@ const SEARCH_ACTIVITY_HEADER_NAME = 'X-Market-Search-Activity-Id';
 const ACTIVITY_HEADER_NAME = 'Activityid';
 const SERVER_HEADER_NAME = 'Server';
 const END_END_ID_HEADER_NAME = 'X-Vss-E2eid';
-const REQUEST_TIME_OUT = 10_000;
 const AssetType = {
     Icon: 'Microsoft.VisualStudio.Services.Icons.Default',
     Details: 'Microsoft.VisualStudio.Services.Content.Details',
@@ -237,6 +236,32 @@ function sortExtensionVersions(versions, preferredTargetPlatform) {
     }
     return versions;
 }
+function filterLatestExtensionVersionsForTargetPlatform(versions, targetPlatform, allTargetPlatforms) {
+    const latestVersions = [];
+    let preReleaseVersionFoundForTargetPlatform = false;
+    let releaseVersionFoundForTargetPlatform = false;
+    for (const version of versions) {
+        const versionTargetPlatform = getTargetPlatformForExtensionVersion(version);
+        const isCompatibleWithTargetPlatform = isTargetPlatformCompatible(versionTargetPlatform, allTargetPlatforms, targetPlatform);
+        if (!isCompatibleWithTargetPlatform) {
+            latestVersions.push(version);
+            continue;
+        }
+        if (isPreReleaseVersion(version)) {
+            if (!preReleaseVersionFoundForTargetPlatform) {
+                preReleaseVersionFoundForTargetPlatform = true;
+                latestVersions.push(version);
+            }
+        }
+        else {
+            if (!releaseVersionFoundForTargetPlatform) {
+                releaseVersionFoundForTargetPlatform = true;
+                latestVersions.push(version);
+            }
+        }
+    }
+    return latestVersions;
+}
 function setTelemetry(extension, index, querySource) {
     extension.telemetryData = { index, querySource, queryActivityId: extension.queryContext?.[SEARCH_ACTIVITY_HEADER_NAME] };
 }
@@ -304,8 +329,7 @@ function toExtension(galleryExtension, version, allTargetPlatforms, extensionGal
     };
 }
 let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
-    constructor(storageService, assignmentService, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService, extensionGalleryManifestService) {
-        this.assignmentService = assignmentService;
+    constructor(storageService, requestService, logService, environmentService, telemetryService, fileService, productService, configurationService, allowedExtensionsService, extensionGalleryManifestService) {
         this.requestService = requestService;
         this.logService = logService;
         this.environmentService = environmentService;
@@ -426,13 +450,16 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
             let galleryExtension;
             try {
                 galleryExtension = await this.getLatestGalleryExtension(extensionInfo, options, resourceApi, extensionGalleryManifest, token);
-                if (galleryExtension === 'NOT_FOUND') {
-                    if (extensionInfo.uuid) {
-                        toQuery.push(extensionInfo);
-                    }
-                    return;
+                if (isString(galleryExtension)) {
+                    this.telemetryService.publicLog2('galleryService:fallbacktoquery', {
+                        extension: extensionInfo.id,
+                        preRelease: !!extensionInfo.preRelease,
+                        compatible: !!options.compatible,
+                        errorCode: galleryExtension
+                    });
+                    toQuery.push(extensionInfo);
                 }
-                if (galleryExtension) {
+                else {
                     result.push(galleryExtension);
                 }
             }
@@ -466,20 +493,21 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         if (!rawGalleryExtension) {
             return 'NOT_FOUND';
         }
+        const targetPlatform = options.targetPlatform ?? CURRENT_TARGET_PLATFORM;
         const allTargetPlatforms = getAllTargetPlatforms(rawGalleryExtension);
-        const rawGalleryExtensionVersion = await this.getRawGalleryExtensionVersion(rawGalleryExtension, {
-            targetPlatform: options.targetPlatform ?? CURRENT_TARGET_PLATFORM,
+        const rawGalleryExtensionVersion = await this.getValidRawGalleryExtensionVersion(rawGalleryExtension, filterLatestExtensionVersionsForTargetPlatform(rawGalleryExtension.versions, targetPlatform, allTargetPlatforms), {
+            targetPlatform,
             compatible: !!options.compatible,
             productVersion: options.productVersion ?? {
                 version: this.productService.version,
                 date: this.productService.date
             },
             version: extensionInfo.preRelease ? VersionKind.Latest : VersionKind.Release
-        }, allTargetPlatforms, true);
+        }, allTargetPlatforms);
         if (rawGalleryExtensionVersion) {
             return toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, extensionGalleryManifest, this.productService);
         }
-        return null;
+        return 'NOT_COMPATIBLE';
     }
     async getCompatibleExtension(extension, includePreRelease, targetPlatform, productVersion = { version: this.productService.version, date: this.productService.date }) {
         if (isNotWebExtensionInWebTargetPlatform(extension.allTargetPlatforms, targetPlatform)) {
@@ -648,13 +676,6 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         return { firstPage: extensions, total, pageSize: query.pageSize, getPage };
     }
     async queryGalleryExtensions(query, criteria, extensionGalleryManifest, token) {
-        if (this.productService.quality !== 'stable'
-            && (await this.assignmentService?.getTreatment('useLatestPrereleaseAndStableVersionFlag'))) {
-            return this.queryGalleryExtensionsUsingIncludeLatestPrereleaseAndStableVersionFlag(query, criteria, extensionGalleryManifest, token);
-        }
-        return this.queryGalleryExtensionsWithAllVersionsAsFallback(query, criteria, extensionGalleryManifest, token);
-    }
-    async queryGalleryExtensionsWithAllVersionsAsFallback(query, criteria, extensionGalleryManifest, token) {
         const flags = query.flags;
         if (query.flags.includes(Flag.IncludeLatestVersionOnly) && query.flags.includes(Flag.IncludeVersions)) {
             query = query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeVersions));
@@ -674,7 +695,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 const allTargetPlatforms = getAllTargetPlatforms(rawGalleryExtension);
                 const extensionIdentifier = { id: getGalleryExtensionId(rawGalleryExtension.publisher.publisherName, rawGalleryExtension.extensionName), uuid: rawGalleryExtension.extensionId };
                 const includePreRelease = isBoolean(criteria.includePreRelease) ? criteria.includePreRelease : !!criteria.includePreRelease.find(extensionIdentifierWithPreRelease => areSameExtensions(extensionIdentifierWithPreRelease, extensionIdentifier))?.includePreRelease;
-                const rawGalleryExtensionVersion = await this.getRawGalleryExtensionVersion(rawGalleryExtension, {
+                const rawGalleryExtensionVersion = await this.getValidRawGalleryExtensionVersion(rawGalleryExtension, rawGalleryExtension.versions, {
                     compatible: criteria.compatible,
                     targetPlatform: criteria.targetPlatform,
                     productVersion: criteria.productVersion,
@@ -702,7 +723,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                     continue;
                 }
             }
-            const rawGalleryExtensionVersion = await this.getRawGalleryExtensionVersion(rawGalleryExtension, {
+            const rawGalleryExtensionVersion = await this.getValidRawGalleryExtensionVersion(rawGalleryExtension, rawGalleryExtension.versions, {
                 compatible: criteria.compatible,
                 targetPlatform: criteria.targetPlatform,
                 productVersion: criteria.productVersion,
@@ -737,77 +758,9 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         return { extensions: ( result.sort((a, b) => a[0] - b[0]).map(([, extension]) => extension)), total };
     }
-    async queryGalleryExtensionsUsingIncludeLatestPrereleaseAndStableVersionFlag(query, criteria, extensionGalleryManifest, token) {
-        if (criteria.versions?.length) {
-            query = query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeLatestVersionOnly && flag !== Flag.IncludeLatestPrereleaseAndStableVersionOnly), Flag.IncludeVersions);
-        }
-        else if (!query.flags.includes(Flag.IncludeVersions)) {
-            const includeLatest = isBoolean(criteria.includePreRelease) ? criteria.includePreRelease : criteria.includePreRelease.every(({ includePreRelease }) => includePreRelease);
-            query = includeLatest ? query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeLatestPrereleaseAndStableVersionOnly), Flag.IncludeLatestVersionOnly) : query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeLatestVersionOnly), Flag.IncludeLatestPrereleaseAndStableVersionOnly);
-        }
-        if (query.flags.includes(Flag.IncludeVersions) && (query.flags.includes(Flag.IncludeLatestVersionOnly) || query.flags.includes(Flag.IncludeLatestPrereleaseAndStableVersionOnly))) {
-            query = query.withFlags(...query.flags.filter(flag => flag !== Flag.IncludeLatestVersionOnly && flag !== Flag.IncludeLatestPrereleaseAndStableVersionOnly), Flag.IncludeVersions);
-        }
-        query = query.withFlags(...query.flags, Flag.IncludeAssetUri, Flag.IncludeCategoryAndTags, Flag.IncludeFiles, Flag.IncludeStatistics, Flag.IncludeVersionProperties);
-        const { galleryExtensions: rawGalleryExtensions, total, context } = await this.queryRawGalleryExtensions(query, extensionGalleryManifest, token);
-        const extensions = [];
-        for (let index = 0; index < rawGalleryExtensions.length; index++) {
-            const rawGalleryExtension = rawGalleryExtensions[index];
-            const extensionIdentifier = { id: getGalleryExtensionId(rawGalleryExtension.publisher.publisherName, rawGalleryExtension.extensionName), uuid: rawGalleryExtension.extensionId };
-            const allTargetPlatforms = getAllTargetPlatforms(rawGalleryExtension);
-            if (criteria.compatible) {
-                if (isNotWebExtensionInWebTargetPlatform(allTargetPlatforms, criteria.targetPlatform)) {
-                    continue;
-                }
-                if (this.allowedExtensionsService.isAllowed({ id: extensionIdentifier.id, publisherDisplayName: rawGalleryExtension.publisher.displayName }) !== true) {
-                    continue;
-                }
-            }
-            const version = criteria.versions?.find(extensionIdentifierWithVersion => areSameExtensions(extensionIdentifierWithVersion, extensionIdentifier))?.version
-                ?? ((isBoolean(criteria.includePreRelease) ? criteria.includePreRelease : !!criteria.includePreRelease.find(extensionIdentifierWithPreRelease => areSameExtensions(extensionIdentifierWithPreRelease, extensionIdentifier))?.includePreRelease) ? VersionKind.Latest : VersionKind.Release);
-            const rawGalleryExtensionVersion = await this.getRawGalleryExtensionVersion(rawGalleryExtension, {
-                compatible: criteria.compatible,
-                targetPlatform: criteria.targetPlatform,
-                productVersion: criteria.productVersion,
-                version
-            }, allTargetPlatforms);
-            if (rawGalleryExtensionVersion) {
-                extensions.push(toExtension(rawGalleryExtension, rawGalleryExtensionVersion, allTargetPlatforms, extensionGalleryManifest, this.productService, context));
-            }
-        }
-        return { extensions, total };
-    }
-    getRawGalleryExtensionVersionsToValidate(rawGalleryExtensionVersions, targetPlatform, allTargetPlatforms, hasOnlylatestVersions) {
-        const sorted = sortExtensionVersions(rawGalleryExtensionVersions, targetPlatform);
-        if (!hasOnlylatestVersions) {
-            return sorted;
-        }
-        const result = [];
-        let preReleaseVersionForTargetPlatformFound = false;
-        let releaseVersionForTargetPlatformFound = false;
-        for (const rawGalleryExtensionVersion of sorted) {
-            if (!isTargetPlatformCompatible(getTargetPlatformForExtensionVersion(rawGalleryExtensionVersion), allTargetPlatforms, targetPlatform)) {
-                result.push(rawGalleryExtensionVersion);
-                continue;
-            }
-            if (isPreReleaseVersion(rawGalleryExtensionVersion)) {
-                if (!preReleaseVersionForTargetPlatformFound) {
-                    result.push(rawGalleryExtensionVersion);
-                    preReleaseVersionForTargetPlatformFound = true;
-                }
-            }
-            else {
-                if (!releaseVersionForTargetPlatformFound) {
-                    result.push(rawGalleryExtensionVersion);
-                    releaseVersionForTargetPlatformFound = true;
-                }
-            }
-        }
-        return result;
-    }
-    async getRawGalleryExtensionVersion(rawGalleryExtension, criteria, allTargetPlatforms, hasOnlylatestVersions) {
+    async getValidRawGalleryExtensionVersion(rawGalleryExtension, versions, criteria, allTargetPlatforms) {
         const extensionIdentifier = { id: getGalleryExtensionId(rawGalleryExtension.publisher.publisherName, rawGalleryExtension.extensionName)};
-        const rawGalleryExtensionVersions = this.getRawGalleryExtensionVersionsToValidate(rawGalleryExtension.versions, criteria.targetPlatform, allTargetPlatforms, hasOnlylatestVersions);
+        const rawGalleryExtensionVersions = sortExtensionVersions(versions, criteria.targetPlatform);
         if (criteria.compatible && isNotWebExtensionInWebTargetPlatform(allTargetPlatforms, criteria.targetPlatform)) {
             return null;
         }
@@ -1015,7 +968,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 type: 'GET',
                 url: ( uri.toString(true)),
                 headers,
-                timeout: REQUEST_TIME_OUT
+                timeout: this.getRequestTimeout()
             }, token);
             if (context.res.statusCode === 404) {
                 errorCode = 'NotFound';
@@ -1249,7 +1202,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         options = { ...options, ...baseOptions, headers };
         const url = asset.uri;
         const fallbackUrl = asset.fallbackUri;
-        const firstOptions = { ...options, url, timeout: REQUEST_TIME_OUT };
+        const firstOptions = { ...options, url, timeout: this.getRequestTimeout() };
         let context;
         try {
             context = await this.requestService.request(firstOptions, token);
@@ -1273,7 +1226,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
                 activityId: this.getHeaderValue(context?.res.headers, ACTIVITY_HEADER_NAME),
                 endToEndId: this.getHeaderValue(context?.res.headers, END_END_ID_HEADER_NAME),
             });
-            const fallbackOptions = { ...options, url: fallbackUrl, timeout: REQUEST_TIME_OUT };
+            const fallbackOptions = { ...options, url: fallbackUrl, timeout: this.getRequestTimeout() };
             return this.requestService.request(fallbackOptions, token);
         }
     }
@@ -1288,7 +1241,7 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         const context = await this.requestService.request({
             type: 'GET',
             url: this.extensionsControlUrl,
-            timeout: REQUEST_TIME_OUT
+            timeout: this.getRequestTimeout()
         }, CancellationToken.None);
         if (context.res.statusCode !== 200) {
             throw ( new Error('Could not get extensions report.'));
@@ -1336,17 +1289,21 @@ let AbstractExtensionGalleryService = class AbstractExtensionGalleryService {
         }
         return { malicious, deprecated, search, autoUpdate };
     }
+    getRequestTimeout() {
+        const configuredTimeout = this.configurationService.getValue(ExtensionRequestsTimeoutConfigKey);
+        return isNumber(configuredTimeout) && configuredTimeout >= 0 ? configuredTimeout : 60_000;
+    }
 };
 AbstractExtensionGalleryService = ( __decorate([
-    ( __param(2, IRequestService)),
-    ( __param(3, ILogService)),
-    ( __param(4, IEnvironmentService)),
-    ( __param(5, ITelemetryService)),
-    ( __param(6, IFileService)),
-    ( __param(7, IProductService)),
-    ( __param(8, IConfigurationService)),
-    ( __param(9, IAllowedExtensionsService)),
-    ( __param(10, IExtensionGalleryManifestService))
+    ( __param(1, IRequestService)),
+    ( __param(2, ILogService)),
+    ( __param(3, IEnvironmentService)),
+    ( __param(4, ITelemetryService)),
+    ( __param(5, IFileService)),
+    ( __param(6, IProductService)),
+    ( __param(7, IConfigurationService)),
+    ( __param(8, IAllowedExtensionsService)),
+    ( __param(9, IExtensionGalleryManifestService))
 ], AbstractExtensionGalleryService));
 
-export { AbstractExtensionGalleryService, sortExtensionVersions };
+export { AbstractExtensionGalleryService, filterLatestExtensionVersionsForTargetPlatform, sortExtensionVersions };

package/vscode/src/vs/platform/extensionManagement/common/extensionManagementIpc.d.ts

@@ -12,11 +12,11 @@ import { CommontExtensionManagementService } from "./abstractExtensionManagement
 export declare class ExtensionManagementChannel implements IServerChannel {
     private service;
     private getUriTransformer;
-    onInstallExtension: Event<InstallExtensionEvent>;
-    onDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
-    onUninstallExtension: Event<UninstallExtensionEvent>;
-    onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
-    onDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
+    readonly onInstallExtension: Event<InstallExtensionEvent>;
+    readonly onDidInstallExtensions: Event<readonly InstallExtensionResult[]>;
+    readonly onUninstallExtension: Event<UninstallExtensionEvent>;
+    readonly onDidUninstallExtension: Event<DidUninstallExtensionEvent>;
+    readonly onDidUpdateExtensionMetadata: Event<DidUpdateExtensionMetadata>;
     constructor(service: IExtensionManagementService, getUriTransformer: (requestContext: any) => IURITransformer | null);
     listen(context: any, event: string): Event<any>;
     call(context: any, command: string, args?: any): Promise<any>;

package/vscode/src/vs/workbench/contrib/extensions/browser/extensions.web.contribution.js

@@ -7,4 +7,4 @@ import { RuntimeExtensionsEditor } from './browserRuntimeExtensionsEditor.js';
 import { RuntimeExtensionsInput } from '@codingame/monaco-vscode-2673c6e2-17c1-5710-b169-46f3d4a28696-common/vscode/vs/workbench/contrib/extensions/common/runtimeExtensionsInput';
 import { EditorExtensions } from '@codingame/monaco-vscode-api/vscode/vs/workbench/common/editor';
 
-( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(RuntimeExtensionsEditor, RuntimeExtensionsEditor.ID, ( localize(7075, "Running Extensions"))), [( new SyncDescriptor(RuntimeExtensionsInput))]);
+( Registry.as(EditorExtensions.EditorPane)).registerEditorPane(EditorPaneDescriptor.create(RuntimeExtensionsEditor, RuntimeExtensionsEditor.ID, ( localize(7319, "Running Extensions"))), [( new SyncDescriptor(RuntimeExtensionsInput))]);

package/vscode/src/vs/workbench/contrib/extensions/common/reportExtensionIssueAction.js

@@ -8,7 +8,7 @@ var ReportExtensionIssueAction_1;
 let ReportExtensionIssueAction = class ReportExtensionIssueAction extends Action {
     static { ReportExtensionIssueAction_1 = this; }
     static { this._id = 'workbench.extensions.action.reportExtensionIssue'; }
-    static { this._label = ( localize(7441, "Report Issue")); }
+    static { this._label = ( localize(7686, "Report Issue")); }
     constructor(extension, issueService) {
         super(ReportExtensionIssueAction_1._id, ReportExtensionIssueAction_1._label, 'extension-action report-issue');
         this.extension = extension;