@hubspot/cli 8.1.0 → 8.1.1-experimental.0

package/commands/project/watch.js

@@ -1,21 +1,22 @@
 import { cancelStagedBuild, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { isV2Project } from '../../lib/projects/platformVersion.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { commands } from '../../lang/en.js';
 import { createWatcher } from '../../lib/projects/watch.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { PROJECT_ERROR_TYPES } from '../../lib/constants.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { logFeedbackMessage } from '../../lib/projects/ui.js';
 import { handleProjectUpload } from '../../lib/projects/upload.js';
 import { pollBuildStatus, pollDeployStatus, } from '../../lib/projects/pollProjectBuildAndDeploy.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { handleKeypress, handleExit } from '../../lib/process.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiDeprecatedTag } from '../../lib/ui/index.js';
 const command = 'watch';
-const describe = commands.project.watch.describe;
+const describe = uiDeprecatedTag(commands.project.watch.describe, false);
 async function handleBuildStatus(accountId, projectName, buildId) {
     const { isAutoDeployEnabled, deployStatusTaskLocator } = await pollBuildStatus(accountId, projectName, buildId, null);
     if (isAutoDeployEnabled && deployStatusTaskLocator) {
@@ -23,28 +24,28 @@ async function handleBuildStatus(accountId, projectName, buildId) {
     }
     logFeedbackMessage(buildId);
 }
-function handleUserInput(accountId, projectName, currentBuildId) {
+function handleUserInput(accountId, projectName, currentBuildId, exit) {
     const onTerminate = async () => {
         uiLogger.log(commands.project.watch.logs.processExited);
         if (currentBuildId) {
             try {
                 await cancelStagedBuild(accountId, projectName);
-                process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
             catch (err) {
                 if (isSpecifiedError(err, {
                     subCategory: PROJECT_ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
                 })) {
-                    process.exit(EXIT_CODES.SUCCESS);
+                    return exit(EXIT_CODES.SUCCESS);
                 }
                 else {
                     logError(err, new ApiErrorContext({ accountId }));
-                    process.exit(EXIT_CODES.ERROR);
+                    return exit(EXIT_CODES.ERROR);
                 }
             }
         }
         else {
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
     };
     handleExit(onTerminate);
@@ -55,39 +56,50 @@ function handleUserInput(accountId, projectName, currentBuildId) {
     });
 }
 async function handler(args) {
-    const { initialUpload, derivedAccountId } = args;
-    trackCommandUsage('project-watch', undefined, derivedAccountId);
+    const { initialUpload, derivedAccountId, exit } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
     if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.watch.errors.projectConfigNotFound);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    if (isV2Project(projectConfig.platformVersion)) {
-        uiLogger.error(projectConfig.platformVersion);
-        return process.exit(EXIT_CODES.ERROR);
+    if (!isLegacyProject(projectConfig.platformVersion)) {
+        uiLogger.error(commands.project.watch.errors.v2ApiError(projectConfig.platformVersion));
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         validateProjectConfig(projectConfig, projectDir);
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     try {
         const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name);
         const hasNoBuilds = !builds || !builds.length;
+        const handleWatchTermination = (error) => {
+            if (error) {
+                logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
+                return exit(EXIT_CODES.ERROR);
+            }
+            else {
+                return exit(EXIT_CODES.SUCCESS);
+            }
+        };
         const startWatching = async () => {
-            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
+            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, (accountId, projectName, buildId) => handleUserInput(accountId, projectName, buildId, exit), handleWatchTermination);
         };
         // Upload all files if no build exists for this project yet
         if (initialUpload || hasNoBuilds) {
-            const { uploadError } = await handleProjectUpload({
+            const { uploadError, projectNotFound } = await handleProjectUpload({
                 accountId: derivedAccountId,
                 projectConfig,
                 projectDir,
                 callbackFunc: startWatching,
                 isUploadCommand: false,
             });
+            if (projectNotFound) {
+                return exit(EXIT_CODES.ERROR);
+            }
             if (uploadError) {
                 if (isSpecifiedError(uploadError, {
                     subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -102,7 +114,7 @@ async function handler(args) {
                         request: 'project upload',
                     }));
                 }
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
         else {
@@ -111,6 +123,7 @@ async function handler(args) {
     }
     catch (e) {
         logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function projectWatchBuilder(yargs) {
@@ -133,7 +146,7 @@ const builder = makeYargsBuilder(projectWatchBuilder, command, describe, {
 const projectWatchCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('project-watch', handler),
     builder,
 };
 export default projectWatchCommand;

package/commands/project.js

@@ -17,9 +17,12 @@ import updateDeps from './project/updateDeps.js';
 import profile from './project/profile.js';
 import projectValidate from './project/validate.js';
 import list from './project/list.js';
+import info from './project/info.js';
+import deleteProject from './project/delete.js';
+import appInstallStatus from './project/appInstallStatus.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { getProjectConfig } from '../lib/projects/config.js';
-import { isUnsupportedPlatformVersion, LATEST_SUPPORTED_PLATFORM_VERSION, } from '../lib/projects/platformVersion.js';
+import { isSupportedPlatformVersion, LATEST_SUPPORTED_PLATFORM_VERSION, } from '@hubspot/project-parsing-lib/projects';
 import { uiLogger } from '../lib/ui/logger.js';
 import { debugError } from '../lib/errorHandlers/index.js';
 const command = ['project', 'projects'];
@@ -29,8 +32,11 @@ const describe = commands.project.describe;
 async function validatePlatformVersion() {
     try {
         const { projectConfig } = await getProjectConfig();
-        if (isUnsupportedPlatformVersion(projectConfig?.platformVersion)) {
-            uiLogger.warn(lib.projects.platformVersion.unsupported(pkg.version, LATEST_SUPPORTED_PLATFORM_VERSION, projectConfig?.platformVersion));
+        // Only warn if a platform version is explicitly set but not supported
+        // Don't warn if the platform version is missing/undefined
+        if (projectConfig?.platformVersion &&
+            !isSupportedPlatformVersion(projectConfig.platformVersion)) {
+            uiLogger.warn(lib.projects.platformVersion.unsupported(pkg.version, LATEST_SUPPORTED_PLATFORM_VERSION, projectConfig.platformVersion));
             uiLogger.log('');
         }
     }
@@ -44,8 +50,10 @@ function projectBuilder(yargs) {
     yargs
         .command(create)
         .command(add)
+        .command(deleteProject)
         .command(watch)
         .command(list)
+        .command(info)
         .command(dev)
         .command(upload)
         .command(deploy)
@@ -59,6 +67,7 @@ function projectBuilder(yargs) {
         .command(updateDeps)
         .command(profile)
         .command(projectValidate)
+        .command(appInstallStatus)
         .demandCommand(1, '');
     return yargs;
 }

package/commands/sandbox/create.js

@@ -6,34 +6,30 @@ import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/l
 import { commands, lib } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiFeatureHighlight, uiBetaTag } from '../../lib/ui/index.js';
-import { SANDBOX_TYPE_MAP, getAvailableSyncTypes, SYNC_TYPES, validateSandboxUsageLimits, } from '../../lib/sandboxes.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { SANDBOX_TYPE_MAP, validateSandboxUsageLimits, } from '../../lib/sandboxes.js';
 import { sandboxTypePrompt } from '../../lib/prompts/sandboxesPrompt.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { syncSandbox } from '../../lib/sandboxSync.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { buildSandbox, buildV2Sandbox } from '../../lib/buildAccount.js';
+import { buildV2Sandbox } from '../../lib/buildAccount.js';
 import { hubspotAccountNamePrompt } from '../../lib/prompts/accountNamePrompt.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { hasFeature } from '../../lib/hasFeature.js';
-import { FEATURES } from '../../lib/constants.js';
 const command = 'create';
 const describe = uiBetaTag(commands.sandbox.subcommands.create.describe, false);
 async function handler(args) {
-    const { name, type, force, derivedAccountId } = args;
+    const { name, type, force, derivedAccountId, exit } = args;
     const accountConfig = getConfigAccountById(derivedAccountId);
     const env = getConfigAccountEnvironment(derivedAccountId);
-    trackCommandUsage('sandbox-create', {}, derivedAccountId);
     // Check if account config exists
     if (!accountConfig) {
         uiLogger.error(commands.sandbox.subcommands.create.failure.noAccountConfig(derivedAccountId));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     // Default account is not a production portal
     if (accountConfig.accountType &&
         accountConfig.accountType !== HUBSPOT_ACCOUNT_TYPES.STANDARD) {
         uiLogger.error(commands.sandbox.subcommands.create.failure.invalidAccountType(HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]], accountConfig.name || ''));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     let typePrompt;
     let namePrompt;
@@ -43,7 +39,7 @@ async function handler(args) {
         }
         else {
             uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.type);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     const sandboxType = type
@@ -67,7 +63,7 @@ async function handler(args) {
         else {
             logError(err);
         }
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!name) {
         if (!force) {
@@ -75,14 +71,15 @@ async function handler(args) {
         }
         else {
             uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.name);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
-    const sandboxName = name || (namePrompt && namePrompt.name);
-    if (!sandboxName) {
+    const maybeSandboxName = name || (namePrompt && namePrompt.name);
+    if (!maybeSandboxName) {
         uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.name);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
+    const sandboxName = maybeSandboxName;
     let contactRecordsSyncPromptResult = false;
     if (!force) {
         const isStandardSandbox = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX;
@@ -98,37 +95,13 @@ async function handler(args) {
             contactRecordsSyncPromptResult = contactRecordsSyncPrompt;
         }
     }
-    // Check if parent portal is ungated for v2 sandboxes
-    const isUngatedForV2Cli = await hasFeature(derivedAccountId, FEATURES.SANDBOXES_V2_CLI);
-    const isUngatedForV2Sandboxes = await hasFeature(derivedAccountId, FEATURES.SANDBOXES_V2);
-    const canCreateV2Sandbox = isUngatedForV2Sandboxes && isUngatedForV2Cli;
     try {
-        let result;
-        if (canCreateV2Sandbox) {
-            result = await buildV2Sandbox(sandboxName, accountConfig, sandboxType, contactRecordsSyncPromptResult, env, force);
-        }
-        else {
-            result = await buildSandbox(sandboxName, accountConfig, sandboxType, env, force);
-        }
+        const result = await buildV2Sandbox(sandboxName, accountConfig, sandboxType, contactRecordsSyncPromptResult, env, force);
         const sandboxAccountConfig = getConfigAccountById(result.sandbox.sandboxHubId);
         // Check if sandbox account config exists
         if (!sandboxAccountConfig) {
             uiLogger.error(commands.sandbox.subcommands.create.failure.noSandboxAccountConfig(result.sandbox.sandboxHubId));
-            process.exit(EXIT_CODES.ERROR);
-        }
-        if (result && !canCreateV2Sandbox) {
-            // For v1 sandboxes, keep sync here. Once we migrate to v2, this will be handled by BE automatically
-            try {
-                let availableSyncTasks = await getAvailableSyncTypes(accountConfig, sandboxAccountConfig);
-                if (!contactRecordsSyncPromptResult) {
-                    availableSyncTasks = availableSyncTasks.filter(t => t.type !== SYNC_TYPES.OBJECT_RECORDS);
-                }
-                await syncSandbox(sandboxAccountConfig, accountConfig, env, availableSyncTasks);
-            }
-            catch (err) {
-                logError(err);
-                throw err;
-            }
+            return exit(EXIT_CODES.ERROR);
         }
         const highlightItems = ['accountsUseCommand', 'projectCreateCommand'];
         if (sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
@@ -138,11 +111,11 @@ async function handler(args) {
             highlightItems.push('projectUploadCommand');
         }
         uiFeatureHighlight(highlightItems);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (error) {
         // Errors are logged in util functions
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function sandboxCreateBuilder(yargs) {
@@ -177,7 +150,7 @@ const builder = makeYargsBuilder(sandboxCreateBuilder, command, describe, {
 const sandboxCreateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('sandbox-create', handler),
     builder,
 };
 export default sandboxCreateCommand;

package/commands/sandbox/delete.js

@@ -4,7 +4,6 @@ import { deleteSandbox } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { getConfigAccountEnvironment, removeAccountFromConfig, setConfigAccountAsDefault, getAllConfigAccounts, getConfigAccountIfExists, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { logError, debugError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
 import { deleteSandboxPrompt } from '../../lib/prompts/sandboxesPrompt.js';
@@ -12,12 +11,12 @@ import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { uiAuthCommandReference, uiBetaTag } from '../../lib/ui/index.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete';
 const describe = uiBetaTag(commands.sandbox.subcommands.delete.describe, false);
 async function handler(args) {
-    const { userProvidedAccount, derivedAccountId, force } = args;
-    trackCommandUsage('sandbox-delete', {}, derivedAccountId);
+    const { userProvidedAccount, force, exit } = args;
     let accountPrompt;
     if (!userProvidedAccount) {
         if (!force) {
@@ -27,19 +26,19 @@ async function handler(args) {
             // Account is required, throw error if force flag is present and no account is specified
             uiLogger.log('');
             uiLogger.error(commands.sandbox.subcommands.delete.failure.noAccount);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         if (!accountPrompt) {
             uiLogger.log('');
             uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccounts);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     const accountIdentifier = userProvidedAccount || accountPrompt.account;
     const sandboxAccount = getConfigAccountIfExists(accountIdentifier);
     if (!sandboxAccount) {
         uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccountId);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const sandboxAccountId = sandboxAccount.accountId;
     const defaultAccount = getConfigDefaultAccountIfExists();
@@ -56,14 +55,14 @@ async function handler(args) {
                 const parentAccountPrompt = await deleteSandboxPrompt(true);
                 if (!parentAccountPrompt) {
                     uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
-                    process.exit(EXIT_CODES.ERROR);
+                    return exit(EXIT_CODES.ERROR);
                 }
                 const parentAccount = getConfigAccountIfExists(parentAccountPrompt.account);
                 parentAccountId = parentAccount?.accountId;
             }
             else {
                 uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
     }
@@ -76,7 +75,7 @@ async function handler(args) {
         uiLogger.log('');
         uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentPortalAvailable(command, url));
         uiLogger.log('');
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.debug(commands.sandbox.subcommands.delete.debug.deleting(sandboxAccountId));
     if (isDefaultAccount) {
@@ -93,7 +92,7 @@ async function handler(args) {
                 },
             ]);
             if (!confirmed) {
-                process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
         }
         await deleteSandbox(parentAccountId, sandboxAccountId);
@@ -111,7 +110,7 @@ async function handler(args) {
             // If force is specified, skip prompt and set the parent account id as the default account
             setConfigAccountAsDefault(parentAccountId);
         }
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (err) {
         debugError(err);
@@ -147,12 +146,12 @@ async function handler(args) {
                 // If force is specified, skip prompt and set the parent account id as the default account
                 setConfigAccountAsDefault(parentAccountId);
             }
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
         else {
             logError(err);
         }
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function sandboxDeleteBuilder(yargs) {
@@ -183,7 +182,7 @@ const builder = makeYargsBuilder(sandboxDeleteBuilder, command, describe, {
 const sandboxDeleteCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('sandbox-delete', handler),
     builder,
 };
 export default sandboxDeleteCommand;

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;