fix: upgrade command should always check when manually ran (#897)

Been bugging me, so we deprecate the force `flag`

Author: vladfrangu

docs/reference.md

@@ -37,8 +37,8 @@ USAGE
   $ apify upgrade [-f] [--version <value>]
 
 FLAGS
-  -f, --force            Whether to skip checking the locally cached latest version of the CLI and fetch it from the internet
-                         instead.
+  -f, --force            [DEPRECATED] This flag is now ignored, as running the command manually will always check for the latest
+                         version.
       --version=<value>  The version of the CLI to upgrade to. If not provided, the latest version will be used.
 ```
 

src/commands/cli-management/upgrade.ts

@@ -27,7 +27,7 @@ const UPDATE_COMMANDS: Record<InstallMethod, (version: string, entrypoint: strin
 };
 
 // TODO: update this once we bump the CLI version and release it with this command available
-const MINIMUM_VERSION_FOR_UPGRADE_COMMAND = '0.21.8';
+const MINIMUM_VERSION_FOR_UPGRADE_COMMAND = '1.0.1';
 
 /**
  * The link to the upgrade script needed for windows when upgrading CLI bundles (as a fallback for when the script is missing)
@@ -48,7 +48,7 @@ export class UpgradeCommand extends ApifyCommand<typeof UpgradeCommand> {
 	static override flags = {
 		force: Flags.boolean({
 			description:
-				'Whether to skip checking the locally cached latest version of the CLI and fetch it from the internet instead.',
+				'[DEPRECATED] This flag is now ignored, as running the command manually will always check for the latest version.',
 			required: false,
 			char: 'f',
 		}),
@@ -73,7 +73,7 @@ export class UpgradeCommand extends ApifyCommand<typeof UpgradeCommand> {
 			return;
 		}
 
-		const result = await useCLIVersionCheck(this.flags.force);
+		const result = await useCLIVersionCheck(!this.flags.internalAutomaticCall);
 		const { installMethod } = useCLIMetadata();
 
 		if (!result.shouldUpdate || result.currentVersion === DEVELOPMENT_VERSION_MARKER) {

src/entrypoints/_shared.ts

@@ -193,6 +193,8 @@ export async function runCLI(entrypoint: string) {
 	const instance = new FinalCommand(
 		entrypoint,
 		hasSubcommand ? `${baseCommand.name} ${maybeSubcommandName}` : baseCommand.name,
+		commandName,
+		hasSubcommand ? maybeSubcommandName : undefined,
 	);
 
 	// eslint-disable-next-line dot-notation

src/lib/command-framework/apify-command.ts

@@ -198,12 +198,19 @@ export abstract class ApifyCommand<T extends typeof BuiltApifyCommand = typeof B
 
 	protected commandString: string;
 
+	protected aliasUsed: string;
+
+	protected subcommandAliasUsed?: string;
+
 	protected skipTelemetry = false;
 
-	public constructor(entrypoint: string, commandString: string) {
+	public constructor(entrypoint: string, commandString: string, aliasUsed: string, subcommandAliasUsed?: string) {
 		this.entrypoint = entrypoint;
 		this.commandString = commandString;
 
+		this.aliasUsed = aliasUsed;
+		this.subcommandAliasUsed = subcommandAliasUsed;
+
 		const metadata = useCLIMetadata();
 
 		this.telemetryData.installMethod = metadata.installMethod;
@@ -866,7 +873,7 @@ export async function internalRunCommand<Cmd extends typeof BuiltApifyCommand>(
 		}
 	}
 
-	const instance = new (command as typeof BuiltApifyCommand)(entrypoint, command.name);
+	const instance = new (command as typeof BuiltApifyCommand)(entrypoint, command.name, command.name);
 
 	// eslint-disable-next-line dot-notation
 	instance['skipTelemetry'] = true;

website/versioned_docs/version-1.1.0/reference.md

@@ -37,8 +37,8 @@ USAGE
   $ apify upgrade [-f] [--version <value>]
 
 FLAGS
-  -f, --force            Whether to skip checking the locally cached latest version of the CLI and fetch it from the internet
-                         instead.
+  -f, --force            [DEPRECATED] This flag is now ignored, as running the command manually will always check for the latest
+                         version.
       --version=<value>  The version of the CLI to upgrade to. If not provided, the latest version will be used.
 ```