fix

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

Author: RomanNikitenko

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

@@ -16,7 +16,7 @@ import { URI } from '../../../base/common/uri.js';
 import { IFileService } from '../../../platform/files/common/files.js';
 import { INativeServerExtensionManagementService } from '../../../platform/extensionManagement/node/extensionManagementService.js';
 import { IExtensionGalleryService } from '../../../platform/extensionManagement/common/extensionManagement.js';
-import { IExtensionGalleryManifestService } from '../../../platform/extensionManagement/common/extensionGalleryManifest.js';
+import { IExtensionGalleryManifestService, ExtensionGalleryManifestStatus } from '../../../platform/extensionManagement/common/extensionGalleryManifest.js';
 import { ILogService } from '../../../platform/log/common/log.js';
 import { IUserDataProfilesService } from '../../../platform/userDataProfile/common/userDataProfile.js';
 import { IRemoteExtensionsScannerService } from '../../../platform/remote/common/remoteExtensionsScanner.js';
@@ -47,25 +47,53 @@ export class DefaultExtensionsInstaller extends Disposable {
 		}
 
 		this.logService.info('DefaultExtensionsInstaller: Waiting for gallery service to be enabled');
+		this.logService.info(`DefaultExtensionsInstaller: Current gallery manifest status: ${this.extensionGalleryManifestService.extensionGalleryManifestStatus}`);
 
-		// Wait for the manifest to be available (uses barrier internally)
-		// This is the proper way to wait - the barrier opens when manifest is set from client
-		try {
-			const manifest = await Promise.race([
-				this.extensionGalleryManifestService.getExtensionGalleryManifest(),
-				new Promise<null>((resolve) => setTimeout(() => resolve(null), 10000)) // 10 second timeout
-			]);
+		// Use event-based waiting - wait for the status to become Available
+		// The gallery manifest is set by the client via IPC, so we need to wait for client connection
+		return new Promise<boolean>((resolve) => {
+			const maxWaitTime = 60000; // 60 seconds - client needs time to connect and set manifest
+			const startTime = Date.now();
 
-			if (manifest && this.extensionGalleryService.isEnabled()) {
-				this.logService.info('DefaultExtensionsInstaller: Gallery service is now enabled');
-				return true;
+			const timeout = setTimeout(() => {
+				disposable.dispose();
+				const elapsed = Date.now() - startTime;
+				this.logService.warn(`DefaultExtensionsInstaller: Gallery service is not enabled after waiting ${elapsed}ms`);
+				this.logService.info(`DefaultExtensionsInstaller: Current status: ${this.extensionGalleryManifestService.extensionGalleryManifestStatus}, isEnabled: ${this.extensionGalleryService.isEnabled()}`);
+				resolve(false);
+			}, maxWaitTime);
+
+			const disposable = this.extensionGalleryManifestService.onDidChangeExtensionGalleryManifestStatus((status) => {
+				this.logService.info(`DefaultExtensionsInstaller: Gallery manifest status changed to: ${status}`);
+				if (status === ExtensionGalleryManifestStatus.Available && this.extensionGalleryService.isEnabled()) {
+					clearTimeout(timeout);
+					disposable.dispose();
+					this.logService.info('DefaultExtensionsInstaller: Gallery service is now enabled');
+					resolve(true);
+				}
+			});
+
+			// Check immediately in case it's already available
+			if (this.extensionGalleryManifestService.extensionGalleryManifestStatus === ExtensionGalleryManifestStatus.Available && this.extensionGalleryService.isEnabled()) {
+				clearTimeout(timeout);
+				disposable.dispose();
+				this.logService.info('DefaultExtensionsInstaller: Gallery service is already enabled (checked after listener setup)');
+				resolve(true);
 			}
-		} catch (error) {
-			this.logService.warn('DefaultExtensionsInstaller: Error waiting for gallery manifest', error);
-		}
-		
-		this.logService.warn('DefaultExtensionsInstaller: Gallery service is not enabled after waiting');
-		return false;
+
+			// Also try the barrier approach as a fallback (waits for client to set manifest via IPC)
+			this.extensionGalleryManifestService.getExtensionGalleryManifest().then(manifest => {
+				if (manifest && this.extensionGalleryService.isEnabled()) {
+					clearTimeout(timeout);
+					disposable.dispose();
+					this.logService.info('DefaultExtensionsInstaller: Gallery service is enabled (via manifest barrier)');
+					resolve(true);
+				}
+			}).catch((error) => {
+				this.logService.debug('DefaultExtensionsInstaller: Error waiting for manifest barrier', error);
+				// Ignore errors, rely on event or timeout
+			});
+		});
 	}
 
 	private async initialize(): Promise<void> {
@@ -80,10 +108,16 @@ export class DefaultExtensionsInstaller extends Disposable {
 			return;
 		}
 
+		// Add a small delay to allow client to connect and set gallery manifest
+		// The gallery manifest is set by the client via IPC, so we need to wait for client connection
+		this.logService.info('DefaultExtensionsInstaller: Waiting briefly for client connection');
+		await new Promise(resolve => setTimeout(resolve, 2000)); // 2 second delay
+
 		// Wait for gallery service to be enabled so dependencies can be installed from the gallery
+		// This is critical - without gallery service, dependencies won't be installed
 		const galleryEnabled = await this.waitForGalleryService();
 		if (!galleryEnabled) {
-			this.logService.warn('DefaultExtensionsInstaller: Proceeding without gallery service - dependencies may not be installed');
+			this.logService.warn('DefaultExtensionsInstaller: Gallery service is not enabled - dependencies may not be installed');
 		}
 		const defaultExtensionsEnv = typeof process !== 'undefined' && process.env ? process.env['DEFAULT_EXTENSIONS_NEW'] : undefined;
 		if (!defaultExtensionsEnv) {