@hubspot/cli 8.2.0-beta.0 → 8.2.0-experimental.0

package/commands/filemanager/upload.js

@@ -7,14 +7,14 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { validateSrcAndDestPaths } from '@hubspot/local-dev-lib/cms/modules';
 import { shouldIgnoreFile } from '@hubspot/local-dev-lib/ignoreRules';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'upload <src> <dest>';
 const describe = commands.filemanager.subcommands.upload.describe;
 async function handler(args) {
-    const { src, dest, derivedAccountId } = args;
+    const { src, dest, derivedAccountId, addUsageMetadata, exit } = args;
     const absoluteSrcPath = path.resolve(getCwd(), src);
     let stats;
     try {
@@ -33,11 +33,11 @@ async function handler(args) {
         return;
     }
     const normalizedDest = convertToUnixPath(dest);
-    trackCommandUsage('filemanager-upload', { type: stats.isFile() ? 'file' : 'folder' }, derivedAccountId);
+    addUsageMetadata({ type: stats.isFile() ? 'file' : 'folder' });
     const srcDestIssues = await validateSrcAndDestPaths({ isLocal: true, path: src }, { isHubSpot: true, path: dest });
     if (srcDestIssues.length) {
         srcDestIssues.forEach(({ message }) => uiLogger.error(message));
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (stats.isFile()) {
         if (shouldIgnoreFile(absoluteSrcPath)) {
@@ -91,7 +91,7 @@ const builder = makeYargsBuilder(fileManagerUploadBuilder, command, describe, {
 const fileManagerUploadCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('filemanager-upload', handler),
     builder,
 };
 export default fileManagerUploadCommand;

package/commands/getStarted.js

@@ -13,9 +13,9 @@ import { projectNameAndDestPrompt } from '../lib/prompts/projectNameAndDestPromp
 import { promptUser } from '../lib/prompts/promptUtils.js';
 import { uiAccountDescription, uiFeatureHighlight, uiInfoSection, } from '../lib/ui/index.js';
 import { uiLogger } from '../lib/ui/logger.js';
-import { trackCommandMetadataUsage, trackCommandUsage, } from '../lib/usageTracking.js';
+import { trackCommandMetadataUsage } from '../lib/usageTracking.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
-import { isV2Project } from '../lib/projects/platformVersion.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 import { pollProjectBuildAndDeploy } from '../lib/projects/pollProjectBuildAndDeploy.js';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
 import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
@@ -23,12 +23,12 @@ import { getStaticAuthAppInstallUrl } from '../lib/app/urls.js';
 import ProjectValidationError from '../lib/errors/ProjectValidationError.js';
 import { openLink } from '../lib/links.js';
 import { runGetStartedV2 } from '../lib/getStarted/getStartedV2.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 const command = 'get-started';
 const describe = commands.getStarted.describe;
 async function handler(args) {
-    const { derivedAccountId } = args;
+    const { derivedAccountId, exit } = args;
     const env = getConfigAccountEnvironment(derivedAccountId);
-    await trackCommandUsage('get-started', {}, derivedAccountId);
     const accountName = uiAccountDescription(derivedAccountId);
     if (args.v2) {
         try {
@@ -37,13 +37,11 @@ async function handler(args) {
                 name: args.name,
                 dest: args.dest,
             });
-            process.exit(EXIT_CODES.SUCCESS);
-            return;
+            return exit(EXIT_CODES.SUCCESS);
         }
         catch (error) {
             logError(error);
-            process.exit(EXIT_CODES.ERROR);
-            return;
+            return exit(EXIT_CODES.ERROR);
         }
     }
     uiInfoSection(commands.getStarted.startTitle, () => {
@@ -92,7 +90,7 @@ async function handler(args) {
                 openLink(derivedAccountId, 'design-manager');
             }
         }
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     else {
         uiLogger.log(' ');
@@ -110,12 +108,12 @@ async function handler(args) {
             }, derivedAccountId);
             uiLogger.log(' ');
             uiLogger.error(commands.project.create.errors.cannotNestProjects(existingProjectDir));
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         // 4. Clone the project template from GitHub
         try {
             await cloneGithubRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectDest, {
-                sourceDir: '2025.2/private-app-get-started-template',
+                sourceDir: '2026.03/private-app-get-started-template',
                 hideLogs: true,
             });
             await trackCommandMetadataUsage('get-started', {
@@ -131,7 +129,7 @@ async function handler(args) {
             debugError(err);
             uiLogger.log(' ');
             uiLogger.error(commands.project.create.errors.failedToDownloadProject);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const projectConfigPath = path.join(projectDest, PROJECT_CONFIG_FILE);
         const parsedConfigFile = JSON.parse(fs.readFileSync(projectConfigPath).toString());
@@ -177,7 +175,7 @@ async function handler(args) {
                     }, derivedAccountId);
                     uiLogger.log(' ');
                     uiLogger.error(commands.getStarted.errors.configFileNotFound);
-                    process.exit(EXIT_CODES.ERROR);
+                    return exit(EXIT_CODES.ERROR);
                 }
                 try {
                     validateProjectConfig(newProjectConfig, newProjectDir);
@@ -191,7 +189,7 @@ async function handler(args) {
                         }, derivedAccountId);
                         uiLogger.log(' ');
                         uiLogger.error(error.message);
-                        process.exit(EXIT_CODES.ERROR);
+                        return exit(EXIT_CODES.ERROR);
                     }
                     throw error;
                 }
@@ -206,7 +204,7 @@ async function handler(args) {
                     uploadMessage: 'Initial upload from get-started command',
                     forceCreate: true, // Auto-create project on HubSpot
                     isUploadCommand: false,
-                    sendIR: isV2Project(newProjectConfig.platformVersion),
+                    sendIR: !isLegacyProject(newProjectConfig.platformVersion),
                     skipValidation: false,
                 });
                 if (uploadError) {
@@ -268,13 +266,13 @@ async function handler(args) {
                 uiLogger.log(' ');
                 uiLogger.error(commands.getStarted.errors.uploadFailed);
                 debugError(err);
-                process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
         }
         else {
             uiLogger.log(' ');
             uiFeatureHighlight(['projectUploadCommand', 'projectDevCommand']);
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
     }
     // Track successful completion of get-started command
@@ -282,7 +280,7 @@ async function handler(args) {
         successful: true,
         step: 'command-completed',
     }, derivedAccountId);
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function getStartedBuilder(yargs) {
     yargs.options({
@@ -316,7 +314,7 @@ const builder = makeYargsBuilder(getStartedBuilder, command, commands.getStarted
 const getStartedCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('get-started', handler),
     builder,
 };
 export default getStartedCommand;

package/commands/hubdb/clear.js

@@ -1,16 +1,16 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { clearHubDbTableRows } from '@hubspot/local-dev-lib/hubdb';
 import { publishTable } from '@hubspot/local-dev-lib/api/hubdb';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'clear [table-id]';
 const describe = commands.hubdb.subcommands.clear.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
-    trackCommandUsage('hubdb-clear', {}, derivedAccountId);
     try {
         const { tableId } = 'tableId' in args
             ? args
@@ -29,6 +29,9 @@ async function handler(args) {
         }
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
     }
 }
@@ -48,7 +51,7 @@ const builder = makeYargsBuilder(hubdbClearBuilder, command, describe, {
 const hubdbClearCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('hubdb-clear', handler),
     builder,
 };
 export default hubdbClearCommand;

package/commands/hubdb/create.js

@@ -5,9 +5,9 @@ import { getCwd, untildify, isValidPath } from '@hubspot/local-dev-lib/path';
 import { createHubDbTable } from '@hubspot/local-dev-lib/hubdb';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { checkAndConvertToJson } from '../../lib/validation.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'create';
 const describe = commands.hubdb.subcommands.create.describe;
@@ -33,8 +33,7 @@ function selectPathPrompt(options) {
     ]);
 }
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('hubdb-create', {}, derivedAccountId);
+    const { derivedAccountId, exit } = args;
     let filePath;
     try {
         filePath =
@@ -42,7 +41,7 @@ async function handler(args) {
                 ? path.resolve(getCwd(), args.path)
                 : path.resolve(getCwd(), (await selectPathPrompt(args)).path);
         if (!checkAndConvertToJson(filePath)) {
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         const table = await createHubDbTable(derivedAccountId, path.resolve(getCwd(), filePath));
         uiLogger.success(commands.hubdb.subcommands.create.success.create(table.tableId, derivedAccountId, table.rowCount));
@@ -68,7 +67,7 @@ const builder = makeYargsBuilder(hubdbCreateBuilder, command, describe, {
 const hubdbCreateCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('hubdb-create', handler),
     builder,
 };
 export default hubdbCreateCommand;

package/commands/hubdb/delete.js

@@ -1,17 +1,17 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { deleteTable } from '@hubspot/local-dev-lib/api/hubdb';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { commands } from '../../lang/en.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete [table-id]';
 const describe = commands.hubdb.subcommands.delete.describe;
 async function handler(args) {
-    const { force, derivedAccountId } = args;
-    trackCommandUsage('hubdb-delete', {}, derivedAccountId);
+    const { force, derivedAccountId, exit } = args;
     try {
         const { tableId } = 'tableId' in args && args.tableId
             ? args
@@ -26,14 +26,17 @@ async function handler(args) {
                 message: commands.hubdb.subcommands.delete.shouldDeleteTable(tableId),
             });
             if (!shouldDeleteTable) {
-                process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
         }
         await deleteTable(derivedAccountId, tableId);
         uiLogger.success(commands.hubdb.subcommands.delete.success.delete(tableId, derivedAccountId));
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         uiLogger.error(commands.hubdb.subcommands.delete.errors.delete(args.tableId || ''));
         logError(e);
     }
@@ -58,7 +61,7 @@ const builder = makeYargsBuilder(hubdbDeleteBuilder, command, describe, {
 const hubdbDeleteCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('hubdb-delete', handler),
     builder,
 };
 export default hubdbDeleteCommand;

package/commands/hubdb/fetch.js

@@ -1,15 +1,15 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
 import { downloadHubDbTable } from '@hubspot/local-dev-lib/hubdb';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'fetch [table-id] [dest]';
 const describe = commands.hubdb.subcommands.fetch.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
-    trackCommandUsage('hubdb-fetch', {}, derivedAccountId);
     try {
         const promptAnswers = await selectHubDBTablePrompt({
             accountId: derivedAccountId,
@@ -22,6 +22,9 @@ async function handler(args) {
         uiLogger.success(commands.hubdb.subcommands.fetch.success.fetch(tableId, filePath));
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
     }
 }
@@ -45,7 +48,7 @@ const builder = makeYargsBuilder(hubdbFetchBuilder, command, describe, {
 const hubdbFetchCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('hubdb-fetch', handler),
     builder,
 };
 export default hubdbFetchCommand;

package/commands/hubdb/list.js

@@ -1,23 +1,17 @@
 import { fetchTables } from '@hubspot/local-dev-lib/api/hubdb';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { renderTable } from '../../ui/render.js';
 import { getBaseHubSpotUrlForAccount } from '../../lib/projects/urls.js';
 const command = ['list', 'ls'];
 const describe = commands.hubdb.subcommands.list.describe;
 async function getTableData(accountId) {
-    try {
-        const response = await fetchTables(accountId);
-        return response.data;
-    }
-    catch (err) {
-        logError(err);
-        process.exit(EXIT_CODES.ERROR);
-    }
+    const response = await fetchTables(accountId);
+    return response.data;
 }
 // stripping the types and unnecessary fields so this data can be turned into a UI table
 function mapTablesToUI(tables) {
@@ -30,9 +24,17 @@ function mapTablesToUI(tables) {
     ]);
 }
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('hubdb-list', {}, derivedAccountId);
-    const { results: tables, total } = await getTableData(derivedAccountId);
+    const { derivedAccountId, exit } = args;
+    let tableData;
+    try {
+        tableData = await getTableData(derivedAccountId);
+    }
+    catch (err) {
+        logError(err);
+        return exit(EXIT_CODES.ERROR);
+        return;
+    }
+    const { results: tables, total } = tableData;
     const tableUIData = mapTablesToUI(tables);
     const tableHeader = [
         commands.hubdb.subcommands.list.labels.id,
@@ -58,7 +60,7 @@ async function handler(args) {
     else {
         uiLogger.log(commands.hubdb.subcommands.list.noTables(derivedAccountId));
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function hubdbListBuilder(yargs) {
     yargs.example([['$0 hubdb list']]);
@@ -73,7 +75,7 @@ const builder = makeYargsBuilder(hubdbListBuilder, command, describe, {
 const hubdbListCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('hubdb-list', handler),
     builder,
 };
 export default hubdbListCommand;

package/commands/init.js

@@ -12,13 +12,15 @@ import { setCLILogLevel } from '../lib/commonOpts.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { handleExit } from '../lib/process.js';
 import { debugError, logError } from '../lib/errorHandlers/index.js';
-import { trackCommandUsage, trackAuthAction } from '../lib/usageTracking.js';
+import { isPromptExitError } from '../lib/errors/PromptExitError.js';
+import { trackAuthAction } from '../lib/usageTracking.js';
 import { promptUser } from '../lib/prompts/promptUtils.js';
-import { OAUTH_FLOW, personalAccessKeyPrompt, } from '../lib/prompts/personalAccessKeyPrompt.js';
+import { OAUTH_FLOW, legacyPersonalAccessKeyPrompt as personalAccessKeyPrompt, } from '../lib/prompts/personalAccessKeyPrompt.js';
 import { cliAccountNamePrompt } from '../lib/prompts/accountNamePrompt.js';
 import { authenticateWithOauth } from '../lib/oauth.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { uiCommandReference, uiFeatureHighlight } from '../lib/ui/index.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { commands } from '../lang/en.js';
 import { parseStringToNumber } from '../lib/parsing.js';
@@ -61,7 +63,7 @@ async function oauthConfigCreationFlow(env) {
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        throw e;
     }
     return oauthAccount;
 }
@@ -72,7 +74,7 @@ const AUTH_TYPE_NAMES = {
 const command = 'init';
 const describe = commands.init.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, userProvidedAccount, } = args;
+    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, userProvidedAccount, exit, addUsageMetadata, } = args;
     let parsedUserProvidedAccountId;
     try {
         if (userProvidedAccount) {
@@ -81,7 +83,7 @@ async function handler(args) {
     }
     catch (err) {
         uiLogger.error(commands.init.errors.invalidAccountIdProvided);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
@@ -93,22 +95,18 @@ async function handler(args) {
     }
     catch (err) { }
     setCLILogLevel(args);
-    if (!disableTracking) {
-        trackCommandUsage('init', {
-            authType,
-        });
-    }
+    addUsageMetadata({ authType });
     const env = args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
     // Only check for global config if user is not providing a custom config path
     if (!configFlagValue && globalConfigFileExists()) {
         uiLogger.error(commands.init.errors.globalConfigFileExists);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     // Check if the specific config file path already exists
     if (existingConfigPath && existsSync(existingConfigPath)) {
         uiLogger.error(commands.init.errors.configFileExists(existingConfigPath));
         uiLogger.info(commands.init.logs.updateConfig);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
         await trackAuthAction('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
@@ -147,14 +145,17 @@ async function handler(args) {
         if (!disableTracking) {
             await trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
         }
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (err) {
+        if (isPromptExitError(err)) {
+            throw err;
+        }
         logError(err);
         if (!disableTracking) {
             await trackAuthAction('init', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
         }
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function initBuilder(yargs) {
@@ -190,7 +191,7 @@ const builder = makeYargsBuilder(initBuilder, command, commands.init.verboseDesc
 const initCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('init', handler),
     builder,
 };
 export default initCommand;

package/commands/mcp/setup.js

@@ -1,20 +1,19 @@
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { addMcpServerToConfig, supportedTools } from '../../lib/mcp/setup.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 const command = ['setup'];
 const describe = commands.mcp.setup.describe;
 async function handler(args) {
-    const { derivedAccountId } = args;
-    await trackCommandUsage('mcp-setup', {}, derivedAccountId);
+    const { exit } = args;
     try {
         await addMcpServerToConfig(args.client);
     }
     catch (e) {
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function setupBuilder(yargs) {
     yargs.option('client', {
@@ -30,7 +29,7 @@ const builder = makeYargsBuilder(setupBuilder, command, describe, {
 const mcpSetupCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('mcp-setup', handler),
     builder,
 };
 export default mcpSetupCommand;

package/commands/mcp/start.js

@@ -7,14 +7,13 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
 import { handleExit } from '../../lib/process.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { fileURLToPath } from 'url';
 const command = 'start';
 const describe = undefined; // Leave hidden for now
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 async function handler(args) {
-    trackCommandUsage('mcp-start', {}, args.derivedAccountId);
     await startMcpServer(args.aiAgent);
 }
 async function startMcpServer(aiAgent) {
@@ -66,7 +65,7 @@ const builder = makeYargsBuilder(startBuilder, command, describe, {
 const mcpStartCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('mcp-start', handler),
     builder,
 };
 export default mcpStartCommand;

package/commands/open.js

@@ -1,8 +1,8 @@
-import { trackCommandUsage } from '../lib/usageTracking.js';
 import { logSiteLinks, getSiteLinksAsArray, openLink } from '../lib/links.js';
 import { promptUser } from '../lib/prompts/promptUtils.js';
 import { commands } from '../lang/en.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const separator = ' => ';
 async function createListPrompt(accountId) {
@@ -22,8 +22,7 @@ async function createListPrompt(accountId) {
 const command = 'open [shortcut]';
 const describe = commands.open.describe;
 async function handler(args) {
-    const { shortcut, list, derivedAccountId } = args;
-    trackCommandUsage('open', undefined, derivedAccountId);
+    const { shortcut, list, derivedAccountId, exit } = args;
     if (shortcut === undefined && !list) {
         const { open } = await createListPrompt(derivedAccountId);
         openLink(derivedAccountId, open);
@@ -34,7 +33,7 @@ async function handler(args) {
     else if (shortcut) {
         openLink(derivedAccountId, shortcut);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function openBuilder(yargs) {
     yargs.positional('[shortcut]', {
@@ -64,7 +63,7 @@ const builder = makeYargsBuilder(openBuilder, command, describe, {
 const openCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('open', handler),
     builder,
 };
 export default openCommand;

package/commands/project/add.js

@@ -1,9 +1,11 @@
 import { logError } from '../../lib/errorHandlers/index.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { isPromptExitError } from '../../lib/errors/PromptExitError.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
-import { isV2Project } from '../../lib/projects/platformVersion.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { legacyAddComponent } from '../../lib/projects/add/legacyAddComponent.js';
 import { v2AddComponent } from '../../lib/projects/add/v2AddComponent.js';
 import { marketplaceDistribution, oAuth, privateDistribution, staticAuth, } from '../../lib/constants.js';
@@ -11,15 +13,15 @@ import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'add';
 const describe = commands.project.add.describe;
 async function handler(args) {
+    const { derivedAccountId, exit } = args;
     try {
-        const { derivedAccountId } = args;
         const { projectConfig, projectDir } = await getProjectConfig();
         if (!projectDir || !projectConfig) {
             uiLogger.error(commands.project.add.error.locationInProject);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
-        const isV2ProjectCreate = isV2Project(projectConfig.platformVersion);
-        if (isV2ProjectCreate) {
+        const isLegacyProjectCreate = isLegacyProject(projectConfig.platformVersion);
+        if (!isLegacyProjectCreate) {
             await v2AddComponent(args, projectDir, projectConfig, derivedAccountId);
         }
         else {
@@ -27,10 +29,13 @@ async function handler(args) {
         }
     }
     catch (e) {
+        if (isPromptExitError(e)) {
+            throw e;
+        }
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function projectAddBuilder(yargs) {
     yargs.options({
@@ -73,7 +78,7 @@ const builder = makeYargsBuilder(projectAddBuilder, command, describe, {
 const projectAddCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('project-add', handler),
     builder,
 };
 export default projectAddCommand;

package/commands/project/appInstallStatus.d.ts

@@ -0,0 +1,4 @@
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
+type ProjectInstallStatusArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs;
+declare const projectInstallStatusCommand: YargsCommandModule<unknown, ProjectInstallStatusArgs>;
+export default projectInstallStatusCommand;