@hubspot/cli 8.1.0 → 8.1.1-experimental.0

package/commands/account/removeOverride.js

@@ -3,27 +3,28 @@ import { globalConfigFileExists, getAllConfigAccounts, } from '@hubspot/local-de
 import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { logError } from '../../lib/errorHandlers/index.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';
+import { warnIfLinkedDirectory } from '../../lib/link/warnIfLinkedDirectory.js';
 const command = 'remove-override';
 const describe = commands.account.subcommands.removeOverride.describe(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
 async function handler(args) {
-    const { force } = args;
+    const { force, exit } = args;
+    // TODO: Block this command when linked directory exists (next breaking change)
+    warnIfLinkedDirectory(args._);
     const globalConfigExists = globalConfigFileExists();
     if (!globalConfigExists) {
         uiLogger.error(commands.account.subcommands.removeOverride.errors.globalConfigNotFound);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const accounts = getAllConfigAccounts();
     const accountOverride = getDefaultAccountOverrideAccountId(accounts);
     const overrideFilePath = getDefaultAccountOverrideFilePath();
     if (accountOverride && overrideFilePath) {
-        const accountId = accountOverride;
-        trackCommandUsage('account-removeOverride', undefined, accountId);
         if (!force) {
             uiLogger.log(commands.account.subcommands.removeOverride.accountOverride(overrideFilePath, accountOverride.toString()));
             const { deleteOverrideFile } = await promptUser({
@@ -34,22 +35,22 @@ async function handler(args) {
             });
             uiLogger.log('');
             if (!deleteOverrideFile) {
-                process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
         }
         try {
             fs.unlinkSync(overrideFilePath);
             uiLogger.success(commands.account.subcommands.removeOverride.success);
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
         catch (error) {
             logError(error);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     else {
         uiLogger.log(commands.account.subcommands.removeOverride.noOverrideFile);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
 }
 function accountRemoveOverrideBuilder(yargs) {
@@ -65,7 +66,7 @@ const builder = makeYargsBuilder(accountRemoveOverrideBuilder, command, describe
 const accountRemoveOverrideCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('account-removeOverride', handler),
     builder,
 };
 export default accountRemoveOverrideCommand;

package/commands/account/rename.js

@@ -1,7 +1,7 @@
 import { renameConfigAccount } from '@hubspot/local-dev-lib/config';
-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 { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
@@ -9,8 +9,7 @@ import { toKebabCase } from '@hubspot/local-dev-lib/text';
 const command = 'rename <account-name> <new-name>';
 const describe = commands.account.subcommands.rename.describe;
 async function handler(args) {
-    const { accountName, newName, derivedAccountId } = args;
-    trackCommandUsage('accounts-rename', undefined, derivedAccountId);
+    const { accountName, newName, exit } = args;
     const newNameKebabCase = toKebabCase(newName);
     const nameWasSanitized = newNameKebabCase !== newName;
     try {
@@ -18,10 +17,10 @@ async function handler(args) {
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.success(commands.account.subcommands.rename.success.renamed(accountName, newNameKebabCase, nameWasSanitized));
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function accountRenameBuilder(yargs) {
     yargs.positional('account-name', {
@@ -45,7 +44,7 @@ const builder = makeYargsBuilder(accountRenameBuilder, command, describe, {
 const accountRenameCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('accounts-rename', handler),
     builder,
 };
 export default accountRenameCommand;

package/commands/account/unlink.d.ts

@@ -0,0 +1,4 @@
+import { YargsCommandModule } from '../../types/Yargs.js';
+import { LinkArgs } from '../../types/Link.js';
+declare const unlinkCommand: YargsCommandModule<unknown, LinkArgs>;
+export default unlinkCommand;

package/commands/account/unlink.js

@@ -0,0 +1,70 @@
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { getAllConfigAccounts } from '@hubspot/local-dev-lib/config';
+import { getCwd } from '@hubspot/local-dev-lib/path';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { getHsSettingsFileIfExists, getHsSettingsFilePath, } from '@hubspot/local-dev-lib/config/hsSettings';
+import { ACTION_RESULT_STATUS } from '../../types/Link.js';
+import { ActionHandlers } from '../../lib/link/index.js';
+import { hasDeprecatedConfigConflict, isDirectoryLinked, writeLinkedSettings, } from '../../lib/link/linkUtils.js';
+import { commands } from '../../lang/en.js';
+import { DEFAULT_HS_SETTINGS_PATH } from '@hubspot/local-dev-lib/constants/config';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+const command = 'unlink';
+// Hide the command until we're done testing and ready to make linking GA
+// const describe = commands.account.subcommands.link.describe;
+const describe = undefined;
+async function handler(args) {
+    const { exit } = args;
+    if (hasDeprecatedConfigConflict(args._)) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const existingSettings = getHsSettingsFileIfExists();
+    if (!isDirectoryLinked(existingSettings)) {
+        const globalAccounts = getAllConfigAccounts();
+        uiLogger.log(commands.account.subcommands.link.shared.noLinkedAccounts);
+        uiLogger.log(commands.account.subcommands.link.shared.globalAccountsAvailable(globalAccounts.length));
+        uiLogger.log('');
+        uiLogger.log(commands.account.subcommands.link.shared.configurePrompt);
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    uiLogger.log(commands.account.subcommands.link.managingLinkedAccounts(getCwd()));
+    uiLogger.log('');
+    const result = await ActionHandlers.unlink({
+        state: existingSettings,
+        context: {
+            globalAccountsList: getAllConfigAccounts(),
+            globalDefaultAccount: undefined,
+            accountOverrideId: null,
+        },
+        args,
+    });
+    if (result.status === ACTION_RESULT_STATUS.ERROR) {
+        uiLogger.error(result.reason);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (result.status === ACTION_RESULT_STATUS.NOOP) {
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    const settingsPath = getHsSettingsFilePath() || DEFAULT_HS_SETTINGS_PATH;
+    if (!writeLinkedSettings(result.settings, settingsPath)) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    uiLogger.success(commands.account.subcommands.link.shared.savedToSettings(settingsPath));
+    return exit(EXIT_CODES.SUCCESS);
+}
+function unlinkBuilder(yargs) {
+    yargs.example([['$0 account unlink']]);
+    return yargs;
+}
+const builder = makeYargsBuilder(unlinkBuilder, command, commands.account.subcommands.unlink.verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const unlinkCommand = {
+    command,
+    describe,
+    handler: makeYargsHandlerWithUsageTracking('account-unlink', handler),
+    builder,
+};
+export default unlinkCommand;

package/commands/account/use.js

@@ -1,16 +1,79 @@
 import { getConfigFilePath, setConfigAccountAsDefault, getConfigAccountIfExists, getConfigAccountByName, getConfigAccountById, globalConfigFileExists, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
 import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
+import { getHsSettingsFileIfExists, getHsSettingsFilePath, writeHsSettingsFile, } from '@hubspot/local-dev-lib/config/hsSettings';
+import { getCwd } from '@hubspot/local-dev-lib/path';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { selectAccountFromConfig, AUTHENTICATE_NEW_ACCOUNT_VALUE, } from '../../lib/prompts/accountsPrompt.js';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { authenticateNewAccount } from '../../lib/accountAuth.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { confirmPrompt } from '../../lib/prompts/promptUtils.js';
+import { handleLinkedUseAction } from '../../lib/link/index.js';
+import { isDirectoryLinked } from '../../lib/link/linkUtils.js';
+import { ACTION_RESULT_STATUS } from '../../types/Link.js';
+import { DEFAULT_HS_SETTINGS_PATH } from '@hubspot/local-dev-lib/constants/config';
 const command = 'use [account]';
 const describe = commands.account.subcommands.use.describe;
-async function handler(args) {
+async function handleLinkedUse(args, hsSettings) {
+    const { exit } = args;
+    uiLogger.log(commands.account.subcommands.use.linked.editingLinkedDefault(getCwd()));
+    uiLogger.log('');
+    if (!args.account && hsSettings.accounts.length === 1) {
+        uiLogger.log(commands.account.subcommands.use.linked.alreadyDefault(hsSettings.accounts[0]));
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    let targetAccountId;
+    if (args.account) {
+        const account = getConfigAccountIfExists(args.account);
+        if (!account) {
+            uiLogger.error(commands.account.subcommands.use.errors.accountNotFound(args.account, getConfigFilePath()));
+            return exit(EXIT_CODES.ERROR);
+        }
+        if (!hsSettings.accounts.includes(account.accountId)) {
+            if (!process.stdin.isTTY) {
+                uiLogger.log(commands.account.subcommands.use.linked.nonInteractiveNotLinked(account.name));
+                setConfigAccountAsDefault(String(args.account));
+                uiLogger.success(commands.account.subcommands.use.success.defaultAccountUpdated(account.name));
+                return exit(EXIT_CODES.SUCCESS);
+            }
+            uiLogger.log(commands.account.subcommands.use.linked.accountNotLinked(account.name));
+            const shouldLink = await confirmPrompt(commands.account.subcommands.use.linked.promptToLink(account.name));
+            if (!shouldLink) {
+                uiLogger.log(commands.account.subcommands.use.linked.settingGlobalDefault);
+                setConfigAccountAsDefault(String(args.account));
+                uiLogger.success(commands.account.subcommands.use.success.defaultAccountUpdated(account.name));
+                return exit(EXIT_CODES.SUCCESS);
+            }
+        }
+        targetAccountId = account.accountId;
+    }
+    const result = await handleLinkedUseAction({
+        state: hsSettings,
+        targetAccountId,
+    });
+    if (result.status === ACTION_RESULT_STATUS.ERROR) {
+        uiLogger.error(result.reason);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (result.status === ACTION_RESULT_STATUS.NOOP) {
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    const settingsPath = getHsSettingsFilePath() || DEFAULT_HS_SETTINGS_PATH;
+    try {
+        writeHsSettingsFile(result.settings);
+    }
+    catch (err) {
+        uiLogger.error(commands.account.subcommands.link.shared.writeSettingsFailed(settingsPath, err));
+        return exit(EXIT_CODES.ERROR);
+    }
+    uiLogger.success(commands.account.subcommands.link.shared.savedToSettings(settingsPath));
+    return exit(EXIT_CODES.SUCCESS);
+}
+async function handleGlobalUse(args) {
+    const { exit } = args;
     let newDefaultAccount = args.account;
     const usingGlobalConfig = globalConfigFileExists();
     if (!newDefaultAccount) {
@@ -29,9 +92,8 @@ async function handler(args) {
             setAsDefaultAccount: true,
         });
         if (!updatedConfig) {
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
-        trackCommandUsage('accounts-use', undefined, updatedConfig.accountId);
         return;
     }
     let account;
@@ -41,7 +103,6 @@ async function handler(args) {
     else {
         account = getConfigAccountByName(String(newDefaultAccount));
     }
-    trackCommandUsage('accounts-use', undefined, account?.accountId);
     const accounts = getAllConfigAccounts();
     const accountOverride = getDefaultAccountOverrideAccountId(accounts);
     const overrideFilePath = getDefaultAccountOverrideFilePath();
@@ -53,6 +114,14 @@ async function handler(args) {
     setConfigAccountAsDefault(String(newDefaultAccount));
     return uiLogger.success(commands.account.subcommands.use.success.defaultAccountUpdated(account.name));
 }
+async function handler(args) {
+    const hsSettings = getHsSettingsFileIfExists();
+    const isLinked = isDirectoryLinked(hsSettings);
+    if (isLinked) {
+        return handleLinkedUse(args, hsSettings);
+    }
+    return handleGlobalUse(args);
+}
 function accountUseBuilder(yargs) {
     yargs.positional('account', {
         describe: commands.account.subcommands.use.options.account.describe,
@@ -77,7 +146,7 @@ const builder = makeYargsBuilder(accountUseBuilder, command, describe, {
 const accountUseCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('accounts-use', handler),
     builder,
 };
 export default accountUseCommand;

package/commands/account.js

@@ -8,12 +8,16 @@ import remove from './account/remove.js';
 import clean from './account/clean.js';
 import createOverride from './account/createOverride.js';
 import removeOverride from './account/removeOverride.js';
+import link from './account/link.js';
+import unlink from './account/unlink.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['account', 'accounts'];
 const describe = commands.account.describe;
 function accountBuilder(yargs) {
     yargs
         .command(auth)
+        .command(link)
+        .command(unlink)
         .command(list)
         .command(rename)
         .command(use)

package/commands/api.d.ts

@@ -0,0 +1,10 @@
+import { CommonArgs, ConfigArgs, EnvironmentArgs, AccountArgs, JSONOutputArgs, YargsCommandModule } from '../types/Yargs.js';
+declare const HTTP_METHODS: readonly ["GET", "POST", "PUT", "PATCH", "DELETE"];
+type HttpMethod = (typeof HTTP_METHODS)[number];
+export type ApiArgs = CommonArgs & ConfigArgs & EnvironmentArgs & AccountArgs & JSONOutputArgs & {
+    endpoint: string;
+    method?: HttpMethod;
+    data?: string;
+};
+declare const apiCommand: YargsCommandModule<unknown, ApiArgs>;
+export default apiCommand;

package/commands/api.js

@@ -0,0 +1,164 @@
+import { http } from '@hubspot/local-dev-lib/http';
+import { getHubSpotApiOrigin } from '@hubspot/local-dev-lib/urls';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
+import { logError, debugError, ApiErrorContext, } from '../lib/errorHandlers/index.js';
+import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
+import { commands } from '../lang/en.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';
+const HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'];
+const command = 'api <endpoint>';
+const describe = commands.api.describe;
+function parseRequestData(data) {
+    try {
+        return JSON.parse(data);
+    }
+    catch {
+        return undefined;
+    }
+}
+function resolveMethod(args) {
+    if (args.method) {
+        return args.method;
+    }
+    return args.data ? 'POST' : 'GET';
+}
+function normalizeEndpoint(endpoint) {
+    return endpoint.startsWith('/') ? endpoint.slice(1) : endpoint;
+}
+async function handler(args) {
+    const { endpoint, data, derivedAccountId, json: formatOutputAsJson, exit, addUsageMetadata, } = args;
+    const method = resolveMethod(args);
+    addUsageMetadata({ action: method });
+    let parsedData;
+    if (data) {
+        parsedData = parseRequestData(data);
+        if (parsedData === undefined) {
+            uiLogger.error(commands.api.errors.invalidJson);
+            return exit(EXIT_CODES.ERROR);
+        }
+    }
+    const normalizedEndpoint = normalizeEndpoint(endpoint);
+    const env = getConfigAccountEnvironment(derivedAccountId);
+    const baseUrl = getHubSpotApiOrigin(env);
+    const fullUrl = `${baseUrl}/${normalizedEndpoint}`;
+    if (!formatOutputAsJson) {
+        uiLogger.log(commands.api.requestLog(method, fullUrl));
+        if (parsedData) {
+            uiLogger.log(commands.api.requestBodyLog(JSON.stringify(parsedData)));
+        }
+        uiLogger.log('');
+    }
+    try {
+        const requestOptions = {
+            url: normalizedEndpoint,
+        };
+        if (parsedData) {
+            requestOptions.data = parsedData;
+            requestOptions.headers = { 'Content-Type': 'application/json' };
+        }
+        let response;
+        switch (method) {
+            case 'GET':
+                response = await http.get(derivedAccountId, requestOptions);
+                break;
+            case 'POST':
+                response = await http.post(derivedAccountId, requestOptions);
+                break;
+            case 'PUT':
+                response = await http.put(derivedAccountId, requestOptions);
+                break;
+            case 'PATCH':
+                response = await http.patch(derivedAccountId, requestOptions);
+                break;
+            case 'DELETE':
+                response = await http.delete(derivedAccountId, requestOptions);
+                break;
+        }
+        if (response !== undefined) {
+            const responseData = response.data;
+            if (formatOutputAsJson) {
+                uiLogger.json(responseData);
+            }
+            else {
+                uiLogger.log(commands.api.responseLog);
+                uiLogger.log(JSON.stringify(responseData, null, 2));
+            }
+        }
+    }
+    catch (error) {
+        const errorContext = new ApiErrorContext({
+            accountId: derivedAccountId,
+            request: `api ${method} ${endpoint}`,
+        });
+        if (!isHubSpotHttpError(error)) {
+            logError(error, errorContext);
+            return exit(EXIT_CODES.ERROR);
+        }
+        debugError(error, errorContext);
+        const errorData = error.data;
+        if (formatOutputAsJson && errorData) {
+            uiLogger.json(errorData);
+        }
+        else if (errorData) {
+            if (error.status && error.statusText) {
+                uiLogger.error(commands.api.errors.statusLine(error.status, error.statusText));
+            }
+            uiLogger.log(JSON.stringify(errorData, null, 2));
+        }
+        else {
+            if (error.status && error.statusText) {
+                uiLogger.error(commands.api.errors.statusLine(error.status, error.statusText));
+            }
+            uiLogger.error(error.message);
+        }
+        return exit(EXIT_CODES.ERROR);
+    }
+    return exit(EXIT_CODES.SUCCESS);
+}
+function apiBuilder(yargs) {
+    yargs.positional('endpoint', {
+        describe: commands.api.positionals.endpoint.describe,
+        type: 'string',
+    });
+    yargs.option('method', {
+        alias: 'X',
+        describe: commands.api.options.method.describe,
+        type: 'string',
+        choices: [...HTTP_METHODS, ...HTTP_METHODS.map(m => m.toLowerCase())],
+        coerce: (value) => value.toUpperCase(),
+    });
+    yargs.option('data', {
+        describe: commands.api.options.data.describe,
+        type: 'string',
+    });
+    yargs.example([
+        ['$0 api /crm/v3/objects/contacts', 'Fetch contacts using GET'],
+        [
+            '$0 api /crm/v3/objects/contacts -X POST --data \'{"properties":{"email":"test@example.com"}}\'',
+            'Create a contact',
+        ],
+        ['$0 api /crm/v3/objects/deals/123', 'Fetch a specific deal'],
+        [
+            '$0 api /crm/v3/objects/contacts -a my-sandbox',
+            'Fetch contacts from a specific account',
+        ],
+    ]);
+    return yargs;
+}
+const builder = makeYargsBuilder(apiBuilder, command, commands.api.verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
+});
+const apiCommand = {
+    command,
+    describe,
+    builder,
+    handler: makeYargsHandlerWithUsageTracking('api', handler),
+};
+export default apiCommand;

package/commands/app/migrate.js

@@ -1,6 +1,7 @@
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
-import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
-import { trackCommandMetadataUsage, trackCommandUsage, } from '../../lib/usageTracking.js';
+import { PLATFORM_VERSIONS } from '@hubspot/project-parsing-lib/constants';
+import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { trackCommandMetadataUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
@@ -8,17 +9,16 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { migrateApp } from '../../lib/app/migrate.js';
 import { getIsInProject } from '../../lib/projects/config.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-const { v2025_2 } = PLATFORM_VERSIONS;
+const { v2025_2, v2026_03_BETA, v2026_03 } = PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = commands.project.migrateApp.describe;
 export function handlerGenerator(commandTrackingName) {
     return async function handler(args) {
-        const { derivedAccountId, platformVersion, unstable } = args;
-        await trackCommandUsage(commandTrackingName, {}, derivedAccountId);
+        const { derivedAccountId, platformVersion, unstable, exit } = args;
         const accountConfig = getConfigAccountById(derivedAccountId);
         if (!accountConfig) {
             uiLogger.error(commands.project.migrateApp.errors.noAccountConfig);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         uiLogger.log('');
         uiLogger.log(commands.project.migrateApp.header);
@@ -26,10 +26,10 @@ export function handlerGenerator(commandTrackingName) {
         try {
             if (getIsInProject()) {
                 uiLogger.error(commands.project.migrateApp.errors.notAllowedWithinProject);
-                return process.exit(EXIT_CODES.ERROR);
+                return exit(EXIT_CODES.ERROR);
             }
             args.platformVersion = unstable
-                ? PLATFORM_VERSIONS.unstable
+                ? PLATFORM_VERSIONS.UNSTABLE
                 : platformVersion;
             await migrateApp(derivedAccountId, args);
         }
@@ -44,10 +44,10 @@ export function handlerGenerator(commandTrackingName) {
                 logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
             }
             await trackCommandMetadataUsage(commandTrackingName, { successful: false }, derivedAccountId);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         await trackCommandMetadataUsage(commandTrackingName, { successful: true }, derivedAccountId);
-        return process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     };
 }
 const handler = handlerGenerator('app-migrate');
@@ -67,8 +67,8 @@ function appMigrateBuilder(yargs) {
         },
         'platform-version': {
             type: 'string',
-            choices: [v2025_2],
-            default: v2025_2,
+            choices: [v2025_2, v2026_03_BETA, v2026_03],
+            default: v2026_03,
         },
         unstable: {
             type: 'boolean',
@@ -90,7 +90,7 @@ const builder = makeYargsBuilder(appMigrateBuilder, command, commands.project.mi
 const migrateCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('app-migrate', handler),
     builder,
 };
 export default migrateCommand;

package/commands/app/secret/add.js

@@ -1,24 +1,23 @@
 import { addAppSecret } from '@hubspot/local-dev-lib/api/devSecrets';
 import { logError } from '../../../lib/errorHandlers/index.js';
-import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { secretValuePrompt, secretNamePrompt, } from '../../../lib/prompts/secretPrompt.js';
 import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { commands } from '../../../lang/en.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 { uiBetaTag } from '../../../lib/ui/index.js';
 const command = 'add [name]';
 const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.add.describe, false);
 async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('app-secret-add', {}, derivedAccountId);
+    const { derivedAccountId, exit } = args;
     try {
         const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
         if (!appSecretApp) {
             uiLogger.log('');
             uiLogger.log(commands.app.subcommands.secret.subcommands.add.errors.noApps);
-            return process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
         let appSecretName = args.name;
         if (!appSecretName) {
@@ -32,9 +31,9 @@ async function handler(args) {
     }
     catch (err) {
         logError(err);
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function addAppSecretBuilder(yargs) {
     yargs.positional('name', {
@@ -57,7 +56,7 @@ const builder = makeYargsBuilder(addAppSecretBuilder, command, describe, {
 const addAppSecretCommand = {
     command,
     describe,
-    handler,
+    handler: makeYargsHandlerWithUsageTracking('app-secret-add', handler),
     builder,
 };
 export default addAppSecretCommand;