@hubspot/cli 8.1.0 → 8.1.1-experimental.0

package/commands/project/migrate.js

@@ -1,6 +1,7 @@
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { migrateApp } from '../../lib/app/migrate.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
-import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
+import { PLATFORM_VERSIONS } from '@hubspot/project-parsing-lib/constants';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
@@ -9,25 +10,24 @@ import { commands, lib } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { renderInline } from '../../ui/render.js';
 import { getWarningBox } from '../../ui/components/StatusMessageBoxes.js';
-import { getHasMigratableThemes, migrateThemes2025_2, } from '../../lib/theme/migrate.js';
+import { getHasMigratableThemes, migrateThemesV2, } from '../../lib/theme/migrate.js';
 import { hasFeature } from '../../lib/hasFeature.js';
 import { FEATURES } from '../../lib/constants.js';
-import { trackCommandMetadataUsage, trackCommandUsage, } from '../../lib/usageTracking.js';
-const { v2025_2 } = PLATFORM_VERSIONS;
+import { trackCommandMetadataUsage } from '../../lib/usageTracking.js';
+const { v2025_2, v2026_03_BETA, v2026_03 } = PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = commands.project.migrate.describe;
 async function handler(args) {
-    const { platformVersion, unstable, derivedAccountId } = args;
-    await trackCommandUsage('project-migrate', {}, derivedAccountId);
+    const { platformVersion, unstable, derivedAccountId, exit } = args;
     const projectConfig = await getProjectConfig();
     if (!projectConfig.projectConfig) {
         uiLogger.error(commands.project.migrate.errors.noProjectConfig(uiCommandReference('hs app migrate')));
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (projectConfig?.projectConfig) {
         await renderInline(getWarningBox({
-            title: lib.migrate.projectMigrationWarningTitle,
-            message: lib.migrate.projectMigrationWarning,
+            title: lib.migrate.projectMigrationWarningTitle(platformVersion),
+            message: lib.migrate.projectMigrationWarning(platformVersion),
         }));
     }
     try {
@@ -36,12 +36,12 @@ async function handler(args) {
             const hasThemeMigrationAccess = await hasFeature(derivedAccountId, FEATURES.THEME_MIGRATION_2025_2);
             if (!hasThemeMigrationAccess) {
                 uiLogger.error(commands.project.migrate.errors.noThemeMigrationAccess(derivedAccountId));
-                return process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
-            await migrateThemes2025_2(derivedAccountId, {
+            await migrateThemesV2(derivedAccountId, {
                 ...args,
                 platformVersion: unstable
-                    ? PLATFORM_VERSIONS.unstable
+                    ? PLATFORM_VERSIONS.UNSTABLE
                     : platformVersion,
             }, migratableThemesCount, projectConfig);
         }
@@ -50,7 +50,7 @@ async function handler(args) {
                 ...args,
                 name: projectConfig?.projectConfig?.name,
                 platformVersion: unstable
-                    ? PLATFORM_VERSIONS.unstable
+                    ? PLATFORM_VERSIONS.UNSTABLE
                     : platformVersion,
             }, projectConfig);
         }
@@ -58,17 +58,17 @@ async function handler(args) {
     catch (error) {
         await trackCommandMetadataUsage('project-migrate', { successful: false }, derivedAccountId);
         logError(error);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     await trackCommandMetadataUsage('project-migrate', { successful: true }, derivedAccountId);
-    return process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectMigrateBuilder(yargs) {
     yargs
         .option('platform-version', {
         type: 'string',
-        choices: [v2025_2],
-        default: v2025_2,
+        choices: [v2025_2, v2026_03_BETA, v2026_03],
+        default: v2026_03,
     })
         .option('unstable', {
         type: 'boolean',
@@ -85,7 +85,7 @@ const builder = makeYargsBuilder(projectMigrateBuilder, command, commands.projec
 const migrateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-migrate', handler),
     builder,
 };
 export default migrateCommand;

package/commands/project/open.js

@@ -1,5 +1,4 @@
 import open from 'open';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
@@ -7,12 +6,12 @@ import { ensureProjectExists } from '../../lib/projects/ensureProjectExists.js';
 import { getProjectDetailUrl } from '../../lib/projects/urls.js';
 import { projectNamePrompt } from '../../lib/prompts/projectNamePrompt.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'open';
 const describe = commands.project.open.describe;
 async function handler(args) {
-    const { project, derivedAccountId } = args;
-    trackCommandUsage('project-open', undefined, derivedAccountId);
+    const { project, derivedAccountId, exit } = args;
     const { projectConfig } = await getProjectConfig();
     let projectName = project;
     if (projectName) {
@@ -20,7 +19,7 @@ async function handler(args) {
             allowCreate: false,
         });
         if (!projectExists) {
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     else if (!projectName && projectConfig) {
@@ -33,7 +32,7 @@ async function handler(args) {
     const url = getProjectDetailUrl(projectName, derivedAccountId);
     open(url, { url: true });
     uiLogger.success(commands.project.open.success(projectName));
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectOpenBuilder(yargs) {
     yargs.options({
@@ -55,7 +54,7 @@ const builder = makeYargsBuilder(projectOpenBuilder, command, describe, {
 const projectOpenCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-open', handler),
     builder,
 };
 export default projectOpenCommand;

package/commands/project/profile/add.js

@@ -2,11 +2,12 @@ import path from 'path';
 import fs from 'fs';
 import { getConfigAccountIfExists, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
 import { getAllHsProfiles, getHsProfileFilename, loadHsProfileFile, } from '@hubspot/project-parsing-lib/profiles';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { uiAccountDescription } from '../../../lib/ui/index.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';
 import { commands } from '../../../lang/en.js';
 import { promptUser, listPrompt, confirmPrompt, } from '../../../lib/prompts/promptUtils.js';
@@ -50,12 +51,15 @@ async function selectProfileToCopyVariablesFrom(existingProfiles) {
     return profileToCopyVariablesFrom;
 }
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('project-profile-add', undefined, derivedAccountId);
+    const { exit } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
     if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.profile.add.errors.noProjectConfig);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.profile.add.errors.unsupportedPlatformVersion);
+        return exit(EXIT_CODES.ERROR);
     }
     const projectSourceDir = path.join(projectDir, projectConfig.srcDir);
     let profileName = args.name;
@@ -115,7 +119,7 @@ async function handler(args) {
         const configuredAccounts = getAllConfigAccounts();
         if (!configuredAccounts || !configuredAccounts.length) {
             uiLogger.error(commands.project.profile.add.errors.noAccountsConfigured);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const promptResponse = await listPrompt(commands.project.profile.add.prompts.targetAccountPrompt, {
             choices: configuredAccounts.map(account => {
@@ -171,11 +175,11 @@ async function handler(args) {
     }
     catch (err) {
         uiLogger.error(commands.project.profile.add.errors.failedToCreateProfile);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.log('');
     uiLogger.log(commands.project.profile.add.logs.profileAdded(profileFilename));
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectProfileAddBuilder(yargs) {
     yargs.positional('name', {
@@ -197,7 +201,7 @@ const builder = makeYargsBuilder(projectProfileAddBuilder, command, verboseDescr
 const projectProfileAddCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-profile-add', handler),
     builder,
 };
 export default projectProfileAddCommand;

package/commands/project/profile/delete.js

@@ -3,10 +3,11 @@ import path from 'path';
 import { getAllHsProfiles, getHsProfileFilename, loadHsProfileFile, } from '@hubspot/project-parsing-lib/profiles';
 import { fetchProject, deleteProject, } from '@hubspot/local-dev-lib/api/projects';
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 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';
 import { commands } from '../../../lang/en.js';
 import { confirmPrompt, listPrompt } from '../../../lib/prompts/promptUtils.js';
@@ -16,12 +17,15 @@ import { isDeveloperTestAccount, isSandbox, } from '../../../lib/accountTypes.js
 const command = 'delete [name]';
 const describe = commands.project.profile.delete.describe;
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('project-profile-delete', undefined, derivedAccountId);
+    const { exit } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
     if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.profile.delete.errors.noProjectConfig);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.profile.delete.errors.unsupportedPlatformVersion);
+        return exit(EXIT_CODES.ERROR);
     }
     const projectSourceDir = path.join(projectDir, projectConfig.srcDir);
     let profileName = undefined;
@@ -30,14 +34,14 @@ async function handler(args) {
         const profileFilename = getHsProfileFilename(profileName);
         if (!fileExists(path.join(projectSourceDir, profileFilename))) {
             uiLogger.error(commands.project.profile.delete.errors.noProfileFound(profileFilename));
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     else {
         const existingProfiles = await getAllHsProfiles(projectSourceDir);
         if (existingProfiles.length === 0) {
             uiLogger.error(commands.project.profile.delete.errors.noProfilesFound);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const promptResponse = await listPrompt(commands.project.profile.delete.prompts.deleteProfilePrompt, {
             choices: existingProfiles.map(profile => ({
@@ -52,7 +56,7 @@ async function handler(args) {
     }
     // This should never happen
     if (!profileName) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let targetAccountId;
     try {
@@ -68,7 +72,7 @@ async function handler(args) {
     }
     catch (err) {
         uiLogger.error(commands.project.profile.delete.errors.failedToDeleteProfile(profileFilename));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.log(commands.project.profile.delete.logs.profileDeleted(profileFilename));
     if (targetAccountId) {
@@ -96,7 +100,7 @@ async function handler(args) {
                 catch (err) {
                     debugError(err);
                     uiLogger.error(commands.project.profile.delete.errors.failedToDeleteProject(targetAccountId));
-                    process.exit(EXIT_CODES.ERROR);
+                    return exit(EXIT_CODES.ERROR);
                 }
                 uiLogger.log(commands.project.profile.delete.logs.deletedProject(targetAccountId));
             }
@@ -105,7 +109,7 @@ async function handler(args) {
             }
         }
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectProfileDeleteBuilder(yargs) {
     yargs.positional('name', {
@@ -123,7 +127,7 @@ const builder = makeYargsBuilder(projectProfileDeleteBuilder, command, describe,
 const projectProfileDeleteCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-profile-delete', handler),
     builder,
 };
 export default projectProfileDeleteCommand;

package/commands/project/updateDeps.js

@@ -1,23 +1,23 @@
 import { updatePackages, getProjectPackageJsonLocations, } from '../../lib/dependencyManagement.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import path from 'path';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'update-deps [packages..]';
 const describe = commands.project.updateDeps.help.describe;
 async function handler(args) {
-    const { derivedAccountId, packages } = args;
+    const { packages, exit } = args;
     try {
-        trackCommandUsage('project-update-deps', undefined, derivedAccountId);
         const projectConfig = await getProjectConfig();
         if (!projectConfig || !projectConfig.projectDir) {
             uiLogger.error(commands.project.updateDeps.noProjectConfig);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const { projectDir } = projectConfig;
         let installLocations = await getProjectPackageJsonLocations();
@@ -50,8 +50,11 @@ async function handler(args) {
         });
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectUpdateDepsBuilder(yargs) {
@@ -74,7 +77,7 @@ const builder = makeYargsBuilder(projectUpdateDepsBuilder, command, describe, {
 const projectUpdateDepsCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-update-deps', handler),
     builder,
 };
 export default projectUpdateDepsCommand;

package/commands/project/upload.d.ts

@@ -4,6 +4,7 @@ export type ProjectUploadArgs = CommonArgs & JSONOutputArgs & {
     message: string;
     m: string;
     skipValidation: boolean;
+    skipNpmAudit: boolean;
     profile?: string;
 };
 declare const projectUploadCommand: YargsCommandModule<unknown, ProjectUploadArgs>;

package/commands/project/upload.js

@@ -2,8 +2,7 @@ import chalk from 'chalk';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { isV2Project } from '../../lib/projects/platformVersion.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { logFeedbackMessage } from '../../lib/projects/ui.js';
 import { handleProjectUpload } from '../../lib/projects/upload.js';
@@ -13,11 +12,13 @@ import { commands } from '../../lang/en.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { projectProfilePrompt } from '../../lib/prompts/projectProfilePrompt.js';
 const command = 'upload';
 const describe = commands.project.upload.describe;
 async function handler(args) {
-    const { forceCreate, message, derivedAccountId, skipValidation, formatOutputAsJson, profile, } = args;
+    const { forceCreate, message, derivedAccountId, skipValidation, skipNpmAudit, formatOutputAsJson, profile: profileOption, useEnv: useEnvOption, exit, addUsageMetadata, } = args;
     const jsonOutput = {};
     const { projectConfig, projectDir } = await getProjectConfig();
     try {
@@ -25,34 +26,48 @@ async function handler(args) {
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (!projectDir) {
+        uiLogger.error(commands.project.upload.errors.noProjectConfig);
+        return exit(EXIT_CODES.ERROR);
     }
     let targetAccountId;
-    try {
-        if (isV2Project(projectConfig.platformVersion)) {
-            targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile);
+    let profileName = args.profile;
+    if (!isLegacyProject(projectConfig?.platformVersion)) {
+        try {
+            const profileNamePromptResult = await projectProfilePrompt(projectDir, projectConfig, profileOption, !!useEnvOption);
+            if (profileNamePromptResult) {
+                profileName = profileNamePromptResult;
+                const profile = await loadAndValidateProfile(projectConfig, projectDir, profileName);
+                targetAccountId = profile.accountId;
+            }
+        }
+        catch (error) {
+            logError(error);
+            return exit(EXIT_CODES.ERROR);
         }
-    }
-    catch (err) {
-        logError(err);
-        process.exit(EXIT_CODES.ERROR);
     }
     targetAccountId = targetAccountId || derivedAccountId;
     const accountConfig = getConfigAccountById(targetAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-upload', { type: accountType, assetType: projectConfig.platformVersion }, targetAccountId);
+    addUsageMetadata({
+        type: accountType,
+        assetType: projectConfig.platformVersion,
+    });
     try {
         const { result, uploadError } = await handleProjectUpload({
             accountId: targetAccountId,
             projectConfig,
-            projectDir: projectDir,
+            projectDir,
             callbackFunc: pollProjectBuildAndDeploy,
             uploadMessage: message,
             forceCreate,
             isUploadCommand: true,
-            sendIR: isV2Project(projectConfig.platformVersion),
+            sendIR: !isLegacyProject(projectConfig.platformVersion),
             skipValidation,
-            profile: args.profile,
+            skipNpmAudit,
+            profile: profileName,
         });
         if (uploadError) {
             if (isSpecifiedError(uploadError, {
@@ -68,7 +83,7 @@ async function handler(args) {
                     request: 'project upload',
                 }));
             }
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (result && result.succeeded && !result.buildResult.isAutoDeployEnabled) {
             uiLogger.log(chalk.bold(commands.project.upload.logs.buildSucceeded(result.buildId)));
@@ -88,12 +103,12 @@ async function handler(args) {
             accountId: targetAccountId,
             request: 'project upload',
         }));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (formatOutputAsJson) {
         uiLogger.json(jsonOutput);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectUploadBuilder(yargs) {
     yargs.options({
@@ -113,6 +128,11 @@ function projectUploadBuilder(yargs) {
             hidden: true,
             default: false,
         },
+        'skip-npm-audit': {
+            describe: commands.project.upload.options.skipNpmAudit.describe,
+            type: 'boolean',
+            default: false,
+        },
         profile: {
             type: 'string',
             alias: 'p',
@@ -139,7 +159,7 @@ const builder = makeYargsBuilder(projectUploadBuilder, command, describe, {
 const projectUploadCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-upload', handler),
     builder,
 };
 export default projectUploadCommand;

package/commands/project/validate.js

@@ -1,10 +1,10 @@
 import path from 'path';
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
-import { isV2Project } from '../../lib/projects/platformVersion.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { validateSourceDirectory, handleTranslate, } from '../../lib/projects/upload.js';
 import { commands } from '../../lang/en.js';
@@ -15,25 +15,25 @@ import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 const command = 'validate';
 const describe = commands.project.validate.describe;
 async function handler(args) {
-    const { derivedAccountId, profile } = args;
+    const { derivedAccountId, profile, exit, addUsageMetadata } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
     const accountConfig = getConfigAccountById(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    trackCommandUsage('project-validate', { type: accountType }, derivedAccountId);
+    addUsageMetadata({ type: accountType });
     if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.validate.mustBeRanWithinAProject);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    if (!isV2Project(projectConfig?.platformVersion)) {
+    if (isLegacyProject(projectConfig.platformVersion)) {
         uiLogger.error(commands.project.validate.badVersion);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         validateProjectConfig(projectConfig, projectDir);
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let validationSucceeded = true;
     const srcDir = path.resolve(projectDir, projectConfig.srcDir);
@@ -100,17 +100,17 @@ async function handler(args) {
         }
     }
     if (!validationSucceeded) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         await validateSourceDirectory(srcDir, projectConfig, projectDir);
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.success(commands.project.validate.success(projectConfig.name));
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectValidateBuilder(yargs) {
     yargs.options({
@@ -150,7 +150,7 @@ const builder = makeYargsBuilder(projectValidateBuilder, command, describe, {
 const projectValidateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-validate', handler),
     builder,
 };
 export default projectValidateCommand;