@hubspot/cli 8.6.0-beta.1 → 8.7.0-beta.0

package/api/releases.d.ts

@@ -0,0 +1,36 @@
+import { SUBBUILD_TYPES } from '@hubspot/local-dev-lib/enums/build';
+import { HubSpotPromise, QueryParams } from '@hubspot/local-dev-lib/types/Http';
+import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
+export type Release = {
+    releaseTag: string;
+    buildId: number;
+    createdAt: string;
+    components?: Array<{
+        buildType: ValueOf<typeof SUBBUILD_TYPES>;
+        buildName?: string;
+        rootPath?: string;
+        id?: string;
+    }>;
+};
+export type FetchListReleasesResponse = {
+    results: Array<Release>;
+    paging: {
+        next: {
+            after: string;
+        };
+    };
+};
+export type AutoReleaseResponse = {
+    releaseTag: string;
+    status: string;
+    appId: number;
+};
+export type AutoReleaseStatusResponse = {
+    status: 'PENDING' | 'COMPLETE';
+    currentReleaseTag?: string;
+};
+export declare function createRelease(accountId: number, projectName: string, buildId: number): HubSpotPromise<Release>;
+export declare function listReleases(accountId: number, projectName: string, params?: QueryParams): HubSpotPromise<FetchListReleasesResponse>;
+export declare function getReleaseInfo(accountId: number, projectName: string, releaseTag: string): HubSpotPromise<Release>;
+export declare function triggerAutoRelease(accountId: number, projectId: number, buildId: number, targetPortalId: number): HubSpotPromise<AutoReleaseResponse>;
+export declare function getAutoReleaseStatus(accountId: number, projectId: number, targetPortalId: number, expectedReleaseTag: string, appId: number): HubSpotPromise<AutoReleaseStatusResponse>;

package/api/releases.js

@@ -0,0 +1,41 @@
+import { http } from '@hubspot/local-dev-lib/http';
+const PROJECTS_API_PATH = 'dfs/v1/projects';
+const PROJECTS_DEPLOY_API_PATH = 'dfs/deploy/v1';
+export function createRelease(accountId, projectName, buildId) {
+    return http.post(accountId, {
+        url: `${PROJECTS_API_PATH}/${encodeURIComponent(projectName)}/releases`,
+        data: { buildId },
+    });
+}
+export function listReleases(accountId, projectName, params = {}) {
+    return http.get(accountId, {
+        url: `${PROJECTS_API_PATH}/${encodeURIComponent(projectName)}/releases`,
+        params,
+    });
+}
+export function getReleaseInfo(accountId, projectName, releaseTag) {
+    return http.get(accountId, {
+        url: `${PROJECTS_API_PATH}/${encodeURIComponent(projectName)}/releases/${encodeURIComponent(releaseTag)}`,
+    });
+}
+export function triggerAutoRelease(accountId, projectId, buildId, targetPortalId) {
+    return http.post(accountId, {
+        url: `${PROJECTS_DEPLOY_API_PATH}/auto-release`,
+        data: {
+            projectId,
+            buildId,
+            targetPortalId,
+        },
+    });
+}
+export function getAutoReleaseStatus(accountId, projectId, targetPortalId, expectedReleaseTag, appId) {
+    return http.get(accountId, {
+        url: `${PROJECTS_DEPLOY_API_PATH}/auto-release/status`,
+        params: {
+            projectId,
+            targetPortalId,
+            expectedReleaseTag,
+            appId,
+        },
+    });
+}

package/bin/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import yargs from 'yargs';
-import { logError } from '../lib/errorHandlers/index.js';
+import { logError, debugError } from '../lib/errorHandlers/index.js';
 import { setCLILogLevel, getCommandName } from '../lib/commonOpts.js';
 import { trackHelpUsage, trackConvertFieldsUsage, } from '../lib/usageTracking.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
@@ -132,11 +132,11 @@ const argvWithSuggestions = await parseYargsOrExit(parser, handleFailure);
 if ('help' in argvWithSuggestions && argvWithSuggestions.help !== undefined) {
     (async () => {
         await trackHelpUsage(getCommandName(argvWithSuggestions));
-    })();
+    })().catch(debugError);
 }
 if ('convertFields' in argvWithSuggestions &&
     argvWithSuggestions.convertFields !== undefined) {
     (async () => {
         await trackConvertFieldsUsage(getCommandName(argvWithSuggestions));
-    })();
+    })().catch(debugError);
 }

package/commands/account/auth.js

@@ -6,7 +6,7 @@ import { trackAuthAction } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiFeatureHighlight } from '../../lib/ui/index.js';
 import { parseStringToNumber } from '../../lib/parsing.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -86,7 +86,7 @@ const builder = makeYargsBuilder(accountAuthBuilder, command, commands.account.s
 const accountAuthCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('account-auth', handler),
+    handler: makeWrappedYargsHandler('account-auth', handler),
     builder,
 };
 export default accountAuthCommand;

package/commands/account/clean.js

@@ -8,7 +8,7 @@ import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 import { uiAccountDescription } from '../../lib/ui/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
@@ -120,7 +120,7 @@ const builder = makeYargsBuilder(accountCleanBuilder, command, describe, {
 const accountCleanCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('accounts-clean', handler),
+    handler: makeWrappedYargsHandler('accounts-clean', handler),
     builder,
 };
 export default accountCleanCommand;

package/commands/account/createOverride.js

@@ -8,7 +8,7 @@ import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -90,7 +90,7 @@ const builder = makeYargsBuilder(accountCreateOverrideBuilder, command, describe
 const accountCreateOverrideCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('account-createOverride', handler),
+    handler: makeWrappedYargsHandler('account-createOverride', handler),
     builder,
 };
 export default accountCreateOverrideCommand;

package/commands/account/info.js

@@ -6,7 +6,7 @@ import { getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { uiAccountDescription } from '../../lib/ui/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { indent } from '../../lib/ui/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { renderList } from '../../ui/render.js';
@@ -88,7 +88,7 @@ const builder = makeYargsBuilder(accountInfoBuilder, command, describe, {
 const accountInfoCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('account-info', handler),
+    handler: makeWrappedYargsHandler('account-info', handler),
     builder,
 };
 export default accountInfoCommand;

package/commands/account/link.js

@@ -13,7 +13,7 @@ import { hasDeprecatedConfigConflict, writeLinkedSettings, } from '../../lib/lin
 import { renderLinkedAccountsTable } from '../../lib/link/renderLinkedAccountsTable.js';
 import { commands } from '../../lang/en.js';
 import { debugError } from '../../lib/errorHandlers/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 const command = 'link';
 // Hide the command until we're done testing and ready to make linking GA
 // const describe = commands.account.subcommands.link.describe;
@@ -83,7 +83,7 @@ const builder = makeYargsBuilder(linkBuilder, command, commands.account.subcomma
 const linkCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('account-link', handler),
+    handler: makeWrappedYargsHandler('account-link', handler),
     builder,
 };
 export default linkCommand;

package/commands/account/list.js

@@ -3,7 +3,7 @@ import { getDefaultAccountOverrideFilePath } from '@hubspot/local-dev-lib/config
 import { getHsSettingsFileIfExists, getHsSettingsFilePath, } from '@hubspot/local-dev-lib/config/hsSettings';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { indent } from '../../lib/ui/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
@@ -57,7 +57,7 @@ const builder = makeYargsBuilder(accountListBuilder, command, describe, {
 const accountListCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('accounts-list', handler),
+    handler: makeWrappedYargsHandler('accounts-list', handler),
     builder,
 };
 export default accountListCommand;

package/commands/account/remove.js

@@ -4,7 +4,7 @@ import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath,
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
@@ -82,7 +82,7 @@ const builder = makeYargsBuilder(accountRemoveBuilder, command, describe, {
 const accountRemoveCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('accounts-remove', handler),
+    handler: makeWrappedYargsHandler('accounts-remove', handler),
     builder,
 };
 export default accountRemoveCommand;

package/commands/account/removeOverride.js

@@ -5,7 +5,7 @@ import { DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME } from '@hubspot/local-dev-lib/const
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
@@ -66,7 +66,7 @@ const builder = makeYargsBuilder(accountRemoveOverrideBuilder, command, describe
 const accountRemoveOverrideCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('account-removeOverride', handler),
+    handler: makeWrappedYargsHandler('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 { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
@@ -44,7 +44,7 @@ const builder = makeYargsBuilder(accountRenameBuilder, command, describe, {
 const accountRenameCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('accounts-rename', handler),
+    handler: makeWrappedYargsHandler('accounts-rename', handler),
     builder,
 };
 export default accountRenameCommand;

package/commands/account/unlink.js

@@ -9,7 +9,7 @@ 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';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.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;
@@ -64,7 +64,7 @@ const builder = makeYargsBuilder(unlinkBuilder, command, commands.account.subcom
 const unlinkCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('account-unlink', handler),
+    handler: makeWrappedYargsHandler('account-unlink', handler),
     builder,
 };
 export default unlinkCommand;

package/commands/account/use.js

@@ -6,7 +6,7 @@ import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 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 { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { authenticateNewAccount } from '../../lib/accountAuth.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
@@ -146,7 +146,7 @@ const builder = makeYargsBuilder(accountUseBuilder, command, describe, {
 const accountUseCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('accounts-use', handler),
+    handler: makeWrappedYargsHandler('accounts-use', handler),
     builder,
 };
 export default accountUseCommand;

package/commands/api.js

@@ -5,7 +5,7 @@ import { logError, debugError, ApiErrorContext, } from '../lib/errorHandlers/ind
 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 { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { uiLogger } from '../lib/ui/logger.js';
 const HTTP_METHODS = ['GET', 'POST', 'PUT', 'PATCH', 'DELETE'];
@@ -159,6 +159,6 @@ const apiCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('api', handler),
+    handler: makeWrappedYargsHandler('api', handler),
 };
 export default apiCommand;

package/commands/app/migrate.js

@@ -1,6 +1,6 @@
 import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { PLATFORM_VERSIONS } from '@hubspot/project-parsing-lib/constants';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { trackCommandMetadataUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -90,7 +90,7 @@ const builder = makeYargsBuilder(appMigrateBuilder, command, commands.project.mi
 const migrateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('app-migrate', handler),
+    handler: makeWrappedYargsHandler('app-migrate', handler),
     builder,
 };
 export default migrateCommand;

package/commands/app/secret/add.js

@@ -4,7 +4,7 @@ import { secretValuePrompt, secretNamePrompt, } from '../../../lib/prompts/secre
 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 { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { uiBetaTag } from '../../../lib/ui/index.js';
@@ -56,7 +56,7 @@ const builder = makeYargsBuilder(addAppSecretBuilder, command, describe, {
 const addAppSecretCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('app-secret-add', handler),
+    handler: makeWrappedYargsHandler('app-secret-add', handler),
     builder,
 };
 export default addAppSecretCommand;

package/commands/app/secret/delete.js

@@ -4,7 +4,7 @@ import { confirmPrompt, listPrompt } from '../../../lib/prompts/promptUtils.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 { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { uiBetaTag } from '../../../lib/ui/index.js';
@@ -79,7 +79,7 @@ const builder = makeYargsBuilder(deleteAppSecretBuilder, command, describe, {
 const deleteAppSecretCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('app-secret-delete', handler),
+    handler: makeWrappedYargsHandler('app-secret-delete', handler),
     builder,
 };
 export default deleteAppSecretCommand;

package/commands/app/secret/list.js

@@ -2,7 +2,7 @@ import { fetchAppSecrets } from '@hubspot/local-dev-lib/api/devSecrets';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
@@ -56,7 +56,7 @@ const builder = makeYargsBuilder(listAppSecretBuilder, command, describe, {
 const listAppSecretCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('app-secret-list', handler),
+    handler: makeWrappedYargsHandler('app-secret-list', handler),
     builder,
 };
 export default listAppSecretCommand;

package/commands/app/secret/update.js

@@ -5,7 +5,7 @@ import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
 import { listPrompt } from '../../../lib/prompts/promptUtils.js';
 import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { uiBetaTag } from '../../../lib/ui/index.js';
@@ -69,7 +69,7 @@ const builder = makeYargsBuilder(updateAppSecretBuilder, command, describe, {
 const updateAppSecretCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('app-secret-update', handler),
+    handler: makeWrappedYargsHandler('app-secret-update', handler),
     builder,
 };
 export default updateAppSecretCommand;

package/commands/auth.js

@@ -17,7 +17,7 @@ import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { uiFeatureHighlight } from '../lib/ui/index.js';
 import { logError } from '../lib/errorHandlers/index.js';
 import { isPromptExitError } from '../lib/errors/PromptExitError.js';
-import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 import { commands } from '../lang/en.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { parseStringToNumber } from '../lib/parsing.js';
@@ -184,7 +184,7 @@ const builder = makeYargsBuilder(authBuilder, command, commands.auth.verboseDesc
 const authCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('auth', handler),
+    handler: makeWrappedYargsHandler('auth', handler),
     builder,
 };
 export default authCommand;

package/commands/cms/app/create.js

@@ -4,7 +4,7 @@ import { resolveLocalPath } from '../../../lib/filesystem.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
 import assets from '../../../lib/cmsAssets/index.js';
@@ -80,6 +80,6 @@ const appCreateCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('create', handler),
+    handler: makeWrappedYargsHandler('create', handler),
 };
 export default appCreateCommand;

package/commands/cms/convertFields.js

@@ -10,7 +10,7 @@ import { FieldsJs, isConvertableFieldJs, } from '@hubspot/local-dev-lib/cms/hand
 import { trackConvertFieldsUsage } from '../../lib/usageTracking.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'convert-fields';
 const describe = commands.convertFields.describe;
@@ -91,7 +91,7 @@ const builder = makeYargsBuilder(convertFieldsBuilder, command, describe);
 const convertFieldsCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('convert-fields', handler),
+    handler: makeWrappedYargsHandler('convert-fields', handler),
     builder,
 };
 export default convertFieldsCommand;

package/commands/cms/delete.js

@@ -1,7 +1,7 @@
 import { deleteFile } from '@hubspot/local-dev-lib/api/fileMapper';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'delete <path>';
@@ -36,7 +36,7 @@ const builder = makeYargsBuilder(cmsDeleteBuilder, command, describe, {
 const cmsDeleteCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('delete', handler),
+    handler: makeWrappedYargsHandler('delete', handler),
     builder,
 };
 export default cmsDeleteCommand;

package/commands/cms/fetch.js

@@ -3,7 +3,7 @@ import { addCmsPublishModeOptions, addOverwriteOptions, getCmsPublishMode, } fro
 import { resolveLocalPath } from '../../lib/filesystem.js';
 import { validateCmsPublishMode } from '../../lib/validation.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
@@ -74,7 +74,7 @@ const builder = makeYargsBuilder(fetchBuilder, command, describe, {
 const fetchCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('fetch', handler),
+    handler: makeWrappedYargsHandler('fetch', handler),
     builder,
 };
 export default fetchCommand;

package/commands/cms/function/create.js

@@ -5,7 +5,7 @@ import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { HTTP_METHODS } from '../../../types/Cms.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
 import assets from '../../../lib/cmsAssets/index.js';
@@ -83,6 +83,6 @@ const functionCreateCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('create', handler),
+    handler: makeWrappedYargsHandler('create', handler),
 };
 export default functionCreateCommand;

package/commands/cms/function/deploy.js

@@ -7,7 +7,7 @@ import { uiAccountDescription } from '../../../lib/ui/index.js';
 import { poll } from '../../../lib/polling.js';
 import { outputBuildLog } from '../../../lib/serverlessLogs.js';
 import { commands } from '../../../lang/en.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 function isFunctionBuildError(e) {
     return (typeof e === 'object' && e !== null && 'status' in e && e.status === 'ERROR');
@@ -82,7 +82,7 @@ const builder = makeYargsBuilder(functionDeployBuilder, command, describe, {
 const functionDeployCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('function-deploy', handler),
+    handler: makeWrappedYargsHandler('function-deploy', handler),
     builder,
 };
 export default functionDeployCommand;

package/commands/cms/function/list.js

@@ -4,7 +4,7 @@ import { uiLogger } from '../../../lib/ui/logger.js';
 import { logError, ApiErrorContext } from '../../../lib/errorHandlers/index.js';
 import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { renderTable } from '../../../ui/render.js';
 const command = ['list', 'ls'];
@@ -57,7 +57,7 @@ const builder = makeYargsBuilder(functionListBuilder, command, describe, {
 const functionListCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('function-list', handler),
+    handler: makeWrappedYargsHandler('function-list', handler),
     builder,
 };
 export default functionListCommand;

package/commands/cms/function/logs.js

@@ -4,7 +4,7 @@ import { tailLogs } from '../../../lib/serverlessLogs.js';
 import { promptUser } from '../../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { commands } from '../../../lang/en.js';
@@ -125,6 +125,6 @@ const logsCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('logs', handler),
+    handler: makeWrappedYargsHandler('logs', handler),
 };
 export default logsCommand;

package/commands/cms/function/server.js

@@ -2,7 +2,7 @@ import { uiLogger } from '../../../lib/ui/logger.js';
 // This package is not typed, so we need to use require
 import { start as startTestServer } from '@hubspot/serverless-dev-runtime';
 import { commands } from '../../../lang/en.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 const command = 'server <path>';
 const describe = undefined;
@@ -62,7 +62,7 @@ const builder = makeYargsBuilder(functionServerBuilder, command, describe, {
 const functionServerCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('functions-server', handler),
+    handler: makeWrappedYargsHandler('functions-server', handler),
     builder,
 };
 export default functionServerCommand;

package/commands/cms/getReactModule.js

@@ -7,7 +7,7 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { listPrompt } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'get-react-module [name] [dest]';
 const describe = commands.cms.subcommands.getReactModule.describe;
@@ -70,7 +70,7 @@ const builder = makeYargsBuilder(cmsGetReactModuleBuilder, command, describe, {
 const cmsGetReactModuleCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('get-react-module', handler),
+    handler: makeWrappedYargsHandler('get-react-module', handler),
     builder,
 };
 export default cmsGetReactModuleCommand;