@hubspot/cli 8.0.11-experimental.0 → 8.0.11-experimental.2

package/commands/secret/addSecret.js

@@ -1,17 +1,16 @@
 import { addSecret, fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { secretValuePrompt, secretNamePrompt, } from '../../lib/prompts/secretPrompt.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'add [name]';
 const describe = commands.secret.subcommands.add.describe;
 async function handler(args) {
-    const { name, derivedAccountId } = args;
+    const { name, derivedAccountId, exit } = args;
     let secretName = name;
-    trackCommandUsage('secrets-add', {}, derivedAccountId);
     try {
         if (!secretName) {
             const { secretName: name } = await secretNamePrompt();
@@ -20,7 +19,7 @@ async function handler(args) {
         const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
         if (secrets.includes(secretName)) {
             uiLogger.error(commands.secret.subcommands.add.errors.alreadyExists(secretName));
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const { secretValue } = await secretValuePrompt();
         await addSecret(derivedAccountId, secretName, secretValue);
@@ -32,9 +31,9 @@ async function handler(args) {
             request: 'add secret',
             accountId: derivedAccountId,
         }));
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function addSecretBuilder(yargs) {
     yargs.positional('name', {
@@ -52,7 +51,7 @@ const builder = makeYargsBuilder(addSecretBuilder, command, describe, {
 const addSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('secrets-add', handler),
     builder,
 };
 export default addSecretCommand;

package/commands/secret/deleteSecret.js

@@ -3,21 +3,20 @@ import { secretListPrompt } from '../../lib/prompts/secretPrompt.js';
 import { confirmPrompt } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from './../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete [name]';
 const describe = commands.secret.subcommands.delete.describe;
 async function handler(args) {
-    const { name, derivedAccountId, force } = args;
+    const { name, derivedAccountId, force, exit } = args;
     let secretName = name;
-    trackCommandUsage('secrets-delete', {}, derivedAccountId);
     try {
         const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
             uiLogger.error(commands.secret.subcommands.delete.errors.noSecret(secretName));
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (!secretName) {
             const { secretToModify } = await secretListPrompt(secrets, commands.secret.subcommands.delete.selectSecret);
@@ -29,7 +28,7 @@ async function handler(args) {
             }));
         if (!confirmDelete) {
             uiLogger.success(commands.secret.subcommands.delete.deleteCanceled);
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
         await deleteSecret(derivedAccountId, secretName);
         uiLogger.success(commands.secret.subcommands.delete.success.delete(secretName, derivedAccountId));
@@ -65,7 +64,7 @@ const builder = makeYargsBuilder(deleteSecretBuilder, command, describe, {
 const deleteSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('secrets-delete', handler),
     builder,
 };
 export default deleteSecretCommand;

package/commands/secret/listSecret.js

@@ -1,15 +1,14 @@
 import { fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { uiAccountDescription } from '../../lib/ui/index.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'list';
 const describe = commands.secret.subcommands.list.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
-    trackCommandUsage('secrets-list', {}, derivedAccountId);
     try {
         const { data: { results }, } = await fetchSecrets(derivedAccountId);
         const groupLabel = commands.secret.subcommands.list.groupLabel(uiAccountDescription(derivedAccountId));
@@ -37,7 +36,7 @@ const builder = makeYargsBuilder(listSecretBuilder, command, describe, {
 const listSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('secrets-list', handler),
     builder,
 };
 export default listSecretCommand;

package/commands/secret/updateSecret.js

@@ -1,22 +1,21 @@
 import { updateSecret, fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { secretValuePrompt, secretListPrompt, } from '../../lib/prompts/secretPrompt.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'update [name]';
 const describe = commands.secret.subcommands.update.describe;
 async function handler(args) {
-    const { name, derivedAccountId } = args;
+    const { name, derivedAccountId, exit } = args;
     let secretName = name;
-    trackCommandUsage('secrets-update', {}, derivedAccountId);
     try {
         const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
             uiLogger.error(commands.secret.subcommands.update.errors.noSecret(secretName));
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (!secretName) {
             const { secretToModify } = await secretListPrompt(secrets, commands.secret.subcommands.update.selectSecret);
@@ -51,7 +50,7 @@ const builder = makeYargsBuilder(updateSecretBuilder, command, describe, {
 const updateSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('secrets-update', handler),
     builder,
 };
 export default updateSecretCommand;

package/commands/testAccount/create.d.ts

@@ -1,5 +1,5 @@
 import { AccountLevel } from '@hubspot/local-dev-lib/types/developerTestAccounts.js';
-import { CommonArgs, ConfigArgs, AccountArgs, TestingArgs, YargsCommandModule, EnvironmentArgs, JSONOutputArgs } from '../../types/Yargs.js';
+import { CommonArgs, ConfigArgs, AccountArgs, TestingArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
 type CreateTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & JSONOutputArgs & {
     configPath?: string;
     name?: string;

package/commands/testAccount/create.js

@@ -3,16 +3,16 @@ import path from 'path';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getCwd } from '@hubspot/local-dev-lib/path';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser, listPrompt } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { fileExists } from '../../lib/validation.js';
 import { commands } from '../../lang/en.js';
 import { createDeveloperTestAccountConfigPrompt } from '../../lib/prompts/createDeveloperTestAccountConfigPrompt.js';
 import { debugError, logError } from '../../lib/errorHandlers/index.js';
-import { PromptExitError } from '../../lib/errors/PromptExitError.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 import { createDeveloperTestAccountV2, saveAccountToConfig, } from '../../lib/buildAccount.js';
 import { ACCOUNT_LEVEL_CHOICES, ACCOUNT_LEVELS } from '../../lib/constants.js';
@@ -29,31 +29,29 @@ function hasAnyFlags(args) {
         contentLevel ||
         commerceLevel);
 }
-async function readConfigFile(configPath) {
+function readConfigFile(configPath) {
     const absoluteConfigPath = path.resolve(getCwd(), configPath);
     if (!fileExists(absoluteConfigPath)) {
-        uiLogger.error(commands.testAccount.create.errors.configFileNotFound(absoluteConfigPath));
-        process.exit(EXIT_CODES.ERROR);
+        throw new Error(commands.testAccount.create.errors.configFileNotFound(absoluteConfigPath));
     }
     try {
         return JSON.parse(fs.readFileSync(absoluteConfigPath, 'utf8'));
     }
     catch (err) {
-        uiLogger.error(commands.testAccount.create.errors.configFileParseFailed(absoluteConfigPath));
-        process.exit(EXIT_CODES.ERROR);
+        throw new Error(commands.testAccount.create.errors.configFileParseFailed(absoluteConfigPath));
     }
 }
 async function promptForConfigPath() {
     const createTestAccountFromConfig = await listPrompt(commands.testAccount.create.createTestAccountFromConfigPrompt, {
         choices: [
-            {
-                name: commands.testAccount.create.createFromConfigOption,
-                value: true,
-            },
             {
                 name: commands.testAccount.create.createFromScratchOption,
                 value: false,
             },
+            {
+                name: commands.testAccount.create.createFromConfigOption,
+                value: true,
+            },
         ],
     });
     if (createTestAccountFromConfig) {
@@ -90,10 +88,16 @@ async function buildTestAccountConfig(args) {
     });
 }
 async function handler(args) {
-    const { derivedAccountId, formatOutputAsJson } = args;
-    trackCommandUsage('test-account-create', {}, derivedAccountId);
+    const { derivedAccountId, formatOutputAsJson, exit } = args;
     const env = getValidEnv(getConfigAccountEnvironment(derivedAccountId));
-    const testAccountConfig = await buildTestAccountConfig(args);
+    let testAccountConfig;
+    try {
+        testAccountConfig = await buildTestAccountConfig(args);
+    }
+    catch (error) {
+        logError(error);
+        return exit(EXIT_CODES.ERROR);
+    }
     const resultJson = {};
     SpinniesManager.init({
         succeedColor: 'white',
@@ -112,7 +116,7 @@ async function handler(args) {
         SpinniesManager.fail('createTestAccount', {
             text: commands.testAccount.create.polling.createFailure,
         });
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     SpinniesManager.succeed('createTestAccount', {
         text: commands.testAccount.create.polling.success(testAccountConfig.accountName, resultJson.accountId, derivedAccountId),
@@ -131,15 +135,15 @@ async function handler(args) {
             }
         }
         catch (e) {
-            if (e instanceof PromptExitError) {
-                process.exit(e.exitCode);
+            if (isPromptExitError(e)) {
+                throw e;
             }
             debugError(e);
             uiLogger.error(commands.testAccount.create.errors.saveAccountToConfigFailure(testAccountConfig.accountName));
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function createTestAccountBuilder(yargs) {
     yargs.option('config-path', {
@@ -226,7 +230,7 @@ const builder = makeYargsBuilder(createTestAccountBuilder, command, describe, {
 const createTestAccountCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('test-account-create', handler),
     builder,
 };
 export default createTestAccountCommand;

package/commands/testAccount/createConfig.js

@@ -1,19 +1,18 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { getCwd } from '@hubspot/local-dev-lib/path';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { createDeveloperTestAccountConfigPrompt } from '../../lib/prompts/createDeveloperTestAccountConfigPrompt.js';
 import { fileExists } from '../../lib/validation.js';
 const command = 'create-config';
 const describe = commands.testAccount.createConfig.describe;
 async function handler(args) {
-    const { derivedAccountId, name, description, path: configPath } = args;
-    trackCommandUsage('test-account-create-config', {}, derivedAccountId);
+    const { name, description, path: configPath, exit } = args;
     let accountConfigPath = configPath;
     const testAccountConfig = await createDeveloperTestAccountConfigPrompt({
         name,
@@ -43,21 +42,21 @@ async function handler(args) {
     }
     if (!accountConfigPath) {
         uiLogger.error(commands.testAccount.createConfig.errors.pathError);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (fileExists(accountConfigPath)) {
         uiLogger.error(commands.testAccount.createConfig.errors.pathExistsError);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         fs.writeFileSync(path.resolve(getCwd(), accountConfigPath), JSON.stringify(testAccountConfig, null, 2), 'utf8');
     }
     catch (err) {
         uiLogger.error(commands.testAccount.createConfig.errors.failedToCreate);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.success(commands.testAccount.createConfig.success.configFileCreated(accountConfigPath));
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function createTestAccountConfigBuilder(yargs) {
     yargs.option('name', {
@@ -86,7 +85,7 @@ const builder = makeYargsBuilder(createTestAccountConfigBuilder, command, descri
 const createTestAccountConfigCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('test-account-create-config', handler),
     builder,
 };
 export default createTestAccountConfigCommand;

package/commands/testAccount/delete.js

@@ -1,12 +1,12 @@
 import { fetchDeveloperTestAccounts, deleteDeveloperTestAccount, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { removeAccountFromConfig, getConfigAccountById, getConfigAccountIfExists, setConfigAccountAsDefault, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { debugError } from '../../lib/errorHandlers/index.js';
+import { debugError, logError } from '../../lib/errorHandlers/index.js';
 const command = 'delete [test-account]';
 const describe = commands.testAccount.delete.describe;
 async function getAccountPromptOptions(derivedAccountId) {
@@ -25,8 +25,7 @@ async function getAccountPromptOptions(derivedAccountId) {
 async function accountToDeleteSelectionPrompt(derivedAccountId) {
     const accountData = await getAccountPromptOptions(derivedAccountId);
     if (accountData.length === 0) {
-        uiLogger.error(commands.testAccount.delete.errors.noAccountsToDelete(derivedAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        throw new Error(commands.testAccount.delete.errors.noAccountsToDelete(derivedAccountId));
     }
     const { testAccountToDelete } = await promptUser([
         {
@@ -79,33 +78,35 @@ async function deleteTestAccountFromConfig(testAccountId, parentAccountName, acc
         uiLogger.error(commands.testAccount.delete.errors.failedToDeleteFromConfig(testAccountId));
     }
 }
-async function validateTestAccountConfigs(testAccountId) {
+function validateTestAccountConfigs(testAccountId) {
     if (!testAccountId) {
-        uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        throw new Error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
     }
     const testAccountConfig = getConfigAccountById(testAccountId);
     if (!testAccountConfig) {
-        uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        throw new Error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
     }
     const parentAccountConfig = getConfigAccountById(testAccountConfig.parentAccountId);
     if (!parentAccountConfig) {
-        uiLogger.error(commands.testAccount.delete.errors.parentAccountNotFound(testAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        throw new Error(commands.testAccount.delete.errors.parentAccountNotFound(testAccountId));
     }
     const parentAccountName = parentAccountConfig.name;
     return { testAccountConfig, parentAccountName };
 }
 async function handler(args) {
-    const { derivedAccountId, testAccount, force } = args;
-    trackCommandUsage('test-account-delete', {}, derivedAccountId);
+    const { derivedAccountId, testAccount, force, exit } = args;
     let testAccountIdToDelete = 0;
     // See if the account exists
     if (testAccount) {
         const account = getConfigAccountIfExists(testAccount);
         const accountId = account?.accountId || null;
-        await validateTestAccountConfigs(accountId);
+        try {
+            validateTestAccountConfigs(accountId);
+        }
+        catch (error) {
+            logError(error);
+            return exit(EXIT_CODES.ERROR);
+        }
         if (accountId) {
             testAccountIdToDelete = accountId;
         }
@@ -119,10 +120,18 @@ async function handler(args) {
         catch (err) {
             debugError(err);
             uiLogger.error(commands.testAccount.delete.errors.failedToSelectAccount);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
-    const { testAccountConfig, parentAccountName } = await validateTestAccountConfigs(testAccountIdToDelete);
+    let testAccountConfig;
+    let parentAccountName;
+    try {
+        ({ testAccountConfig, parentAccountName } = validateTestAccountConfigs(testAccountIdToDelete));
+    }
+    catch (error) {
+        logError(error);
+        return exit(EXIT_CODES.ERROR);
+    }
     // If --force, don't prompt user; else confirm deletion
     let shouldDeleteAccount;
     if (force) {
@@ -139,7 +148,7 @@ async function handler(args) {
     else {
         uiLogger.info(commands.testAccount.delete.info.deletionCanceled);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function deleteTestAccountBuilder(yargs) {
     yargs.positional('test-account', {
@@ -182,7 +191,7 @@ const builder = makeYargsBuilder(deleteTestAccountBuilder, command, describe, {
 const deleteTestAccountCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('test-account-delete', handler),
     builder,
 };
 export default deleteTestAccountCommand;

package/commands/testAccount/importData.js

@@ -1,7 +1,7 @@
 import { getImportDataRequest } from '@hubspot/local-dev-lib/crm';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { importDataFilePathPrompt } from '../../lib/prompts/importDataFilePathPrompt.js';
 import { handleImportData, handleTargetTestAccountSelectionFlow, } from '../../lib/importData.js';
@@ -10,8 +10,7 @@ import { commands } from '../../lang/en.js';
 export const command = 'import-data';
 export const describe = commands.testAccount.subcommands.importData.describe;
 async function handler(args) {
-    const { derivedAccountId, userProvidedAccount, filePath: providedFilePath, skipConfirm, } = args;
-    trackCommandUsage('crm-import-data', {}, derivedAccountId);
+    const { derivedAccountId, userProvidedAccount, filePath: providedFilePath, skipConfirm, exit, } = args;
     let targetAccountId;
     try {
         targetAccountId = await handleTargetTestAccountSelectionFlow(derivedAccountId, userProvidedAccount);
@@ -20,15 +19,15 @@ async function handler(args) {
         const confirmImportData = skipConfirm ||
             (await confirmImportDataPrompt(targetAccountId, dataFileNames));
         if (!confirmImportData) {
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
         await handleImportData(targetAccountId, dataFileNames, importRequest);
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function crmImportDataBuilder(yargs) {
     yargs.example([['$0 test-account import-data']]);
@@ -56,6 +55,6 @@ const crmImportDataCommand = {
     command,
     describe,
     builder,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('crm-import-data', handler),
 };
 export default crmImportDataCommand;

package/commands/upgrade.js

@@ -1,7 +1,7 @@
 import { isConfigFlagEnabled } from '@hubspot/local-dev-lib/config';
 import { CONFIG_FLAGS } from '@hubspot/local-dev-lib/constants/config';
-import { trackCommandUsage } from '../lib/usageTracking.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { commands } from '../lang/en.js';
@@ -14,8 +14,7 @@ import { debugError } from '../lib/errorHandlers/index.js';
 const command = ['upgrade [version]', 'update [version]'];
 const describe = commands.upgrade.describe;
 const handler = async (args) => {
-    const { version, force, beta, derivedAccountId } = args;
-    trackCommandUsage('upgrade', {}, derivedAccountId);
+    const { version, force, beta, exit } = args;
     SpinniesManager.init({
         succeedColor: 'white',
     });
@@ -27,7 +26,7 @@ const handler = async (args) => {
             const latestVersion = beta ? nextCliVersion : latestCliVersion;
             if (!latestVersion) {
                 uiLogger.error(commands.upgrade.errors.unableToDetermineLatestVersion);
-                return process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
             targetVersion = latestVersion;
         }
@@ -40,20 +39,20 @@ const handler = async (args) => {
             else {
                 uiLogger.log(commands.upgrade.alreadyLatest(currentVersion, beta));
             }
-            return process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
         // Check if globally installed
         const isGlobal = await canCliBeAutoUpgraded();
         if (!isGlobal) {
             uiLogger.log(commands.upgrade.autoUpgradeNotAvailable(targetVersion));
-            return process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
         // Prompt for confirmation unless --force is used
         if (!force) {
             const shouldUpgrade = await confirmPrompt(commands.upgrade.confirmPrompt(currentVersion, targetVersion), { defaultAnswer: true });
             if (!shouldUpgrade) {
                 uiLogger.log(commands.upgrade.cancelled);
-                return process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
         }
         SpinniesManager.add('upgrade', {
@@ -68,7 +67,7 @@ const handler = async (args) => {
         });
         uiLogger.log('');
         uiLogger.error(commands.upgrade.errors.generic);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     SpinniesManager.succeed('upgrade', {
         text: commands.upgrade.success(targetVersion),
@@ -85,7 +84,7 @@ const handler = async (args) => {
         uiLogger.log('');
         uiLogger.log(commands.upgrade.autoUpgradeMessage);
     }
-    return process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 };
 function upgradeBuilder(yargs) {
     yargs
@@ -113,7 +112,7 @@ const builder = makeYargsBuilder(upgradeBuilder, command, describe, {
 const upgradeCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('upgrade', handler),
     builder,
 };
 export default upgradeCommand;