Adds minimum version checking for cli proxy

Author: d13

src/env/node/gk/cli/integration.ts

@@ -178,10 +178,12 @@ export class GkCliIntegrationProvider implements Disposable {
 		let forceInstall = false;
 		const cliInstall = this.container.storage.getScoped('gk:cli:install');
 		if (cliInstall?.status === 'completed') {
-			let currentCoreVersion = await this.getCliCoreVersion();
-			const minimumVersion = await this.container.productConfig.getCliMinimumVersion();
-			if (!currentCoreVersion || satisfies(fromString(currentCoreVersion), `< ${minimumVersion}`)) {
-				Logger.log(`CLI core version ${currentCoreVersion ?? 'unknown'} is outdated, forcing reinstall`);
+			const { needsUpdate, core, proxy } = await this.checkCliUpdateRequired();
+			let currentCoreVersion = core;
+			if (needsUpdate !== undefined) {
+				Logger.log(
+					`CLI ${needsUpdate} version ${(needsUpdate === 'core' ? currentCoreVersion : proxy) ?? 'unknown'} is outdated, forcing reinstall`,
+				);
 				forceInstall = true;
 			} else {
 				// Only update if GitLens extension version has changed since last check, to avoid unnecessary update checks
@@ -884,20 +886,61 @@ export class GkCliIntegrationProvider implements Disposable {
 	}
 
 	@log()
-	private async getCliCoreVersion(force = false): Promise<string | undefined> {
+	private async checkCliUpdateRequired(): Promise<{
+		needsUpdate: 'core' | 'proxy' | undefined;
+		core: string | undefined;
+		proxy: string | undefined;
+	}> {
 		const scope = getLogScope();
 
-		if (force || this._cliCoreVersion == null) {
-			try {
-				const versions = await getCLIVersions();
-				this._cliCoreVersion = versions?.core;
-			} catch (ex) {
-				Logger.error(ex, scope, 'Failed to get CLI version');
+		try {
+			const currentVersions = await getCLIVersions();
+			if (currentVersions == null) {
 				this._cliCoreVersion = undefined;
+				return {
+					needsUpdate: 'proxy',
+					core: undefined,
+					proxy: undefined,
+				};
 			}
+
+			const { core: currentCoreVersion, proxy: currentProxyVersion } = currentVersions;
+			this._cliCoreVersion = currentCoreVersion;
+
+			const { core: minimumCoreVersion, proxy: minimumProxyVersion } =
+				await this.container.productConfig.getCliMinimumVersions();
+
+			if (satisfies(fromString(currentProxyVersion), `< ${minimumProxyVersion}`)) {
+				return {
+					needsUpdate: 'proxy',
+					core: currentCoreVersion,
+					proxy: currentProxyVersion,
+				};
+			}
+
+			if (satisfies(fromString(currentCoreVersion), `< ${minimumCoreVersion}`)) {
+				return {
+					needsUpdate: 'core',
+					core: currentCoreVersion,
+					proxy: currentProxyVersion,
+				};
+			}
+
+			return {
+				needsUpdate: undefined,
+				core: currentCoreVersion,
+				proxy: currentProxyVersion,
+			};
+		} catch (ex) {
+			Logger.error(ex, scope, 'Failed to get CLI version');
+			this._cliCoreVersion = undefined;
 		}
 
-		return this._cliCoreVersion;
+		return {
+			needsUpdate: 'proxy',
+			core: undefined,
+			proxy: undefined,
+		};
 	}
 }
 

src/plus/gk/productConfigProvider.ts

@@ -14,7 +14,8 @@ import type { ServerConnection } from './serverConnection.js';
 type Config = {
 	promos: Promo[];
 	cli: {
-		minimumVersion: string;
+		minimumCoreVersion: string;
+		minimumProxyVersion: string;
 	};
 };
 
@@ -24,7 +25,8 @@ type ConfigJson = {
 	promos?: PromoJson[];
 	promosV2?: PromoV2Json[];
 	cli?: {
-		minimumVersion: string;
+		minimumCoreVersion: string;
+		minimumProxyVersion: string;
 	};
 };
 type PromoJson = Replace<Promo, 'plan' | 'expiresOn' | 'startsOn', string | undefined> & {
@@ -61,7 +63,8 @@ const fallbackConfig: Config = {
 		} satisfies Promo,
 	],
 	cli: {
-		minimumVersion: '3.1.52',
+		minimumCoreVersion: '3.1.52',
+		minimumProxyVersion: '3.1.53',
 	},
 } as const;
 
@@ -149,8 +152,12 @@ export class ProductConfigProvider {
 		return getApplicablePromo(promos, state, plan, location);
 	}
 
-	async getCliMinimumVersion(): Promise<string> {
-		return (await this.getConfig()).cli.minimumVersion;
+	async getCliMinimumVersions(): Promise<{ core: string; proxy: string }> {
+		const cli = (await this.getConfig()).cli;
+		return {
+			core: cli.minimumCoreVersion,
+			proxy: cli.minimumProxyVersion,
+		};
 	}
 
 	private getConfig(): Promise<Config> {
@@ -242,7 +249,8 @@ function createConfigValidator(): Validator<ConfigJson> {
 	});
 
 	const cliValidator = createValidator({
-		minimumVersion: Is.String,
+		minimumCoreVersion: Is.String,
+		minimumProxyVersion: Is.String,
 	});
 
 	return createValidator<ConfigJson>({