test

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>

Author: RomanNikitenko

code/src/vs/platform/extensionManagement/node/extensionManagementService.ts

@@ -259,7 +259,7 @@ export class ExtensionManagementService extends AbstractExtensionManagementServi
 						}
 					}
 
-					installableExtensions.push({ manifest, extension: location, options });
+					installableExtensions.push({ manifest, extension: location, options: { ...options, donotIncludePackAndDependencies: options.donotIncludePackAndDependencies } });
 					cleanups.push(cleanup);
 				} catch (error) {
 					this.logService.error(`Failed to process VSIX: ${vsix.toString()}`, error);

code/src/vs/server/node/che/defaultExtensionsInstaller.ts

@@ -74,8 +74,8 @@ export class DefaultExtensionsInstaller extends Disposable {
 		storageFile: URI,
 		installedPaths: string[]
 	): Promise<void> {
-		// Install all extensions in a single batch operation
-		// This ensures all extensions are installed together before any activation happens, preventing dependency notifications
+		// Install all extensions in parallel (like the old workbench.extensions.command.installFromVSIX command)
+		// Use the same options as the old command to match its behavior exactly
 		const vsixUris = pathsToInstall
 			.filter(p => p.trim())
 			.map(p => URI.file(p.trim()));
@@ -84,53 +84,36 @@ export class DefaultExtensionsInstaller extends Disposable {
 			return;
 		}
 
-		this.logService.info(`DefaultExtensionsInstaller: Installing ${vsixUris.length} extension(s) in batch`);
-
-		try {
-			const installed = await this.extensionManagementService.installVSIXBatch(vsixUris, {
-				isDefault: true // Mark as default extension to bypass policy checks
-			});
-
-			// Map installed extensions back to their paths
-			const successfullyInstalled: string[] = [];
-			for (const vsixUri of vsixUris) {
-				// Check if this extension was successfully installed by checking if any installed extension
-				// matches the path (we'll track by path since we don't have the extension ID easily)
-				// For simplicity, assume all extensions in the batch that didn't throw were installed
-				successfullyInstalled.push(vsixUri.fsPath);
-			}
-
-			this.logService.info(`DefaultExtensionsInstaller: Successfully installed ${installed.length} extension(s) in batch`);
-
-			// Update storage with successfully installed extensions
-			if (successfullyInstalled.length > 0) {
-				const updatedInstalled = [...installedPaths, ...successfullyInstalled];
-				await this.fileService.writeFile(storageFile, VSBuffer.fromString(JSON.stringify(updatedInstalled, null, 2)));
-				this.logService.info(`DefaultExtensionsInstaller: Updated storage with ${successfullyInstalled.length} successfully installed extension(s)`);
-			}
-		} catch (error) {
-			this.logService.error(`DefaultExtensionsInstaller: Failed to install extensions in batch`, error);
-			// Try to install individually as fallback
-			this.logService.info(`DefaultExtensionsInstaller: Falling back to individual installation`);
-			const successfullyInstalled: string[] = [];
-
-			for (const vsixUri of vsixUris) {
-				try {
-					await this.extensionManagementService.install(vsixUri, {
-						isDefault: true
-					});
-					successfullyInstalled.push(vsixUri.fsPath);
-					this.logService.info(`DefaultExtensionsInstaller: Successfully installed extension from ${vsixUri.fsPath}`);
-				} catch (err) {
-					this.logService.error(`DefaultExtensionsInstaller: Failed to install extension from ${vsixUri.fsPath}`, err);
-				}
+		this.logService.info(`DefaultExtensionsInstaller: Installing ${vsixUris.length} extension(s) in parallel`);
+
+		// Install in parallel using Promise.allSettled (same as old command)
+		const results = await Promise.allSettled(
+			vsixUris.map(async (vsixUri) => {
+				this.logService.info(`DefaultExtensionsInstaller: Installing extension from ${vsixUri.fsPath}`);
+				await this.extensionManagementService.install(vsixUri, {
+					isDefault: true, // Mark as default extension to bypass policy checks
+					installGivenVersion: true, // Same as old command
+					donotIncludePackAndDependencies: true // Skip dependency checking during installation (like defaultExtensionsInitializer)
+				});
+				this.logService.info(`DefaultExtensionsInstaller: Successfully installed extension from ${vsixUri.fsPath}`);
+				return vsixUri.fsPath;
+			})
+		);
+
+		const successfullyInstalled: string[] = [];
+		for (const result of results) {
+			if (result.status === 'fulfilled') {
+				successfullyInstalled.push(result.value);
+			} else {
+				this.logService.error(`DefaultExtensionsInstaller: Failed to install extension`, result.reason);
 			}
+		}
 
-			if (successfullyInstalled.length > 0) {
-				const updatedInstalled = [...installedPaths, ...successfullyInstalled];
-				await this.fileService.writeFile(storageFile, VSBuffer.fromString(JSON.stringify(updatedInstalled, null, 2)));
-				this.logService.info(`DefaultExtensionsInstaller: Updated storage with ${successfullyInstalled.length} successfully installed extension(s)`);
-			}
+		// Update storage with successfully installed extensions
+		if (successfullyInstalled.length > 0) {
+			const updatedInstalled = [...installedPaths, ...successfullyInstalled];
+			await this.fileService.writeFile(storageFile, VSBuffer.fromString(JSON.stringify(updatedInstalled, null, 2)));
+			this.logService.info(`DefaultExtensionsInstaller: Updated storage with ${successfullyInstalled.length} successfully installed extension(s)`);
 		}
 	}