@hubspot/cli 8.6.0 → 8.7.0-beta.0

package/commands/cms/lighthouseScore.js

@@ -7,7 +7,7 @@ import { requestLighthouseScore, getLighthouseScoreStatus, getLighthouseScore, }
 import { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } from '../../lib/constants.js';
 import { uiLink } from '../../lib/ui/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';
 import { renderTable } from '../../ui/render.js';
 const DEFAULT_TABLE_HEADER = [
@@ -276,7 +276,7 @@ const builder = makeYargsBuilder(cmslighthouseScoreBuilder, command, describe, {
 const cmslighthouseScoreCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('lighthouse-score', handler),
+    handler: makeWrappedYargsHandler('lighthouse-score', handler),
     builder,
 };
 export default cmslighthouseScoreCommand;

package/commands/cms/lint.js

@@ -3,7 +3,7 @@ import { logError } from '../../lib/errorHandlers/index.js';
 import { commands } from '../../lang/en.js';
 import { resolveLocalPath } from '../../lib/filesystem.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 command = 'lint <path>';
@@ -76,7 +76,7 @@ const builder = makeYargsBuilder(lintBuilder, command, describe, {
 const lintCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('lint', handler),
+    handler: makeWrappedYargsHandler('lint', handler),
     builder,
 };
 export default lintCommand;

package/commands/cms/list.js

@@ -4,7 +4,7 @@ import { logError } from '../../lib/errorHandlers/index.js';
 import { getDirectoryContentsByPath } from '@hubspot/local-dev-lib/api/fileMapper';
 import { HUBSPOT_FOLDER, MARKETPLACE_FOLDER } from '../../lib/constants.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 { commands } from '../../lang/en.js';
@@ -89,7 +89,7 @@ const builder = makeYargsBuilder(cmsListBuilder, command, describe, {
 const cmsListCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('list', handler),
+    handler: makeWrappedYargsHandler('list', handler),
     builder,
 };
 export default cmsListCommand;

package/commands/cms/module/create.js

@@ -5,7 +5,7 @@ import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { CONTENT_TYPES } 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';
@@ -73,6 +73,12 @@ function moduleCreateBuilder(yargs) {
         type: 'boolean',
         default: false,
     });
+    yargs.option('available-for-new-content', {
+        describe: commands.cms.subcommands.module.subcommands.create.options
+            .availableForNewContent,
+        type: 'boolean',
+        default: true,
+    });
     return yargs;
 }
 const builder = makeYargsBuilder(moduleCreateBuilder, command, describe, {
@@ -83,6 +89,6 @@ const moduleCreateCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('create', handler),
+    handler: makeWrappedYargsHandler('create', handler),
 };
 export default moduleCreateCommand;

package/commands/cms/module/marketplace-validate.js

@@ -1,7 +1,7 @@
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
 import { kickOffValidation, pollForValidationFinish, fetchValidationResults, hasProcessValidationErrors, displayValidationResults, } from '../../../lib/marketplaceValidate.js';
 import { commands } from '../../../lang/en.js';
-import { makeYargsHandlerWithUsageTracking } from '../../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
@@ -55,7 +55,7 @@ const builder = makeYargsBuilder(marketplaceValidateBuilder, command, describe,
 const marketplaceValidateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('validate', handler),
+    handler: makeWrappedYargsHandler('validate', handler),
     builder,
 };
 export default marketplaceValidateCommand;

package/commands/cms/mv.js

@@ -2,7 +2,7 @@ import { moveFile } from '@hubspot/local-dev-lib/api/fileMapper';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { isPathFolder } from '../../lib/filesystem.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';
@@ -53,7 +53,7 @@ const builder = makeYargsBuilder(cmsMvBuilder, command, describe, {
 const cmsMvCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('mv', handler),
+    handler: makeWrappedYargsHandler('mv', handler),
     builder,
 };
 export default cmsMvCommand;

package/commands/cms/template/create.js

@@ -5,7 +5,7 @@ import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { TEMPLATE_TYPES } 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';
@@ -71,6 +71,6 @@ const templateCreateCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('create', handler),
+    handler: makeWrappedYargsHandler('create', handler),
 };
 export default templateCreateCommand;

package/commands/cms/theme/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 assets from '../../../lib/cmsAssets/index.js';
 const command = 'create [dest]';
@@ -53,6 +53,6 @@ const themeCreateCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('create', handler),
+    handler: makeWrappedYargsHandler('create', handler),
 };
 export default themeCreateCommand;

package/commands/cms/theme/generate-selectors.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import { commands } from '../../../lang/en.js';
 import { findFieldsJsonPath, combineThemeCss, setPreviewSelectors, generateInheritedSelectors, generateSelectorsMap, getMaxFieldsDepth, } from '../../../lib/generateSelectors.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 HUBL_EXPRESSION_REGEX = new RegExp(/{%\s*(.*)\s*%}/, 'g');
@@ -166,7 +166,7 @@ const builder = makeYargsBuilder(themeSelectorBuilder, command, describe, {
 const themeSelectorsCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('generate-selectors', handler),
+    handler: makeWrappedYargsHandler('generate-selectors', handler),
     builder,
 };
 export default themeSelectorsCommand;

package/commands/cms/theme/marketplace-validate.js

@@ -2,7 +2,7 @@ import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
 import { kickOffValidation, pollForValidationFinish, fetchValidationResults, hasProcessValidationErrors, displayValidationResults, } from '../../../lib/marketplaceValidate.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 { logError } from '../../../lib/errorHandlers/index.js';
 const command = 'marketplace-validate <path>';
@@ -57,7 +57,7 @@ const builder = makeYargsBuilder(themeValidateBuilder, command, describe, {
 const themeValidateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('validate', handler),
+    handler: makeWrappedYargsHandler('validate', handler),
     builder,
 };
 export default themeValidateCommand;

package/commands/cms/theme/preview.js

@@ -10,7 +10,7 @@ import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
 import { findProjectComponents } from '../../../lib/projects/structure.js';
 import { ComponentTypes } from '../../../types/Projects.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 = 'preview [--src] [--dest]';
@@ -128,7 +128,7 @@ const builder = makeYargsBuilder(themePreviewBuilder, command, describe, {
 const themePreviewCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('preview', handler),
+    handler: makeWrappedYargsHandler('preview', handler),
     builder,
 };
 export default themePreviewCommand;

package/commands/cms/upload.js

@@ -16,7 +16,7 @@ import { validateCmsPublishMode } from '../../lib/validation.js';
 import { getUploadableFileList } from '../../lib/upload.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';
 const command = 'upload [src] [dest]';
@@ -209,7 +209,7 @@ const builder = makeYargsBuilder(uploadBuilder, command, describe, {
 const uploadCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('upload', handler),
+    handler: makeWrappedYargsHandler('upload', handler),
     builder,
 };
 export default uploadCommand;

package/commands/cms/watch.js

@@ -10,7 +10,7 @@ import { getUploadableFileList } from '../../lib/upload.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'watch [src] [dest]';
 const describe = commands.cms.subcommands.watch.describe;
@@ -126,7 +126,7 @@ const builder = makeYargsBuilder(watchBuilder, command, describe, {
 const watchCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('watch', handler),
+    handler: makeWrappedYargsHandler('watch', handler),
     builder,
 };
 export default watchCommand;

package/commands/cms/webpack/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 assets from '../../../lib/cmsAssets/index.js';
 const command = 'create [dest]';
@@ -53,6 +53,6 @@ const webpackCreateCommand = {
     command,
     describe,
     builder,
-    handler: makeYargsHandlerWithUsageTracking('create', handler),
+    handler: makeWrappedYargsHandler('create', handler),
 };
 export default webpackCreateCommand;

package/commands/completion.js

@@ -1,7 +1,7 @@
 import yargsParser from 'yargs-parser';
 import { commands } from '../lang/en.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
-import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 const command = 'completion';
 const describe = commands.completion.describe;
 async function handler() { }
@@ -19,7 +19,7 @@ const builder = makeYargsBuilder(completionBuilder, command, describe);
 const completionCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('completion', handler),
+    handler: makeWrappedYargsHandler('completion', handler),
     builder,
 };
 export default completionCommand;

package/commands/config/migrate.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import { localConfigFileExists, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
 import { handleMigration, handleMerge } from '../../lib/configMigrate.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';
@@ -63,7 +63,7 @@ const builder = makeYargsBuilder(configMigrateBuilder, command, commands.config.
 const configMigrateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('config-migrate', handler),
+    handler: makeWrappedYargsHandler('config-migrate', handler),
     builder,
 };
 export default configMigrateCommand;

package/commands/config/set.js

@@ -1,7 +1,7 @@
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { setDefaultCmsPublishMode, setHttpTimeout, setAllowUsageTracking, setAllowAutoUpdates, setAutoOpenBrowser, } from '../../lib/configOptions.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { commands } from '../../lang/en.js';
 import { makeYargsBuilder, strictEnforceBoolean, } from '../../lib/yargsUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -134,7 +134,7 @@ const builder = makeYargsBuilder(configSetBuilder, command, describe, {
 const configSetCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('config-set', handler),
+    handler: makeWrappedYargsHandler('config-set', handler),
     builder,
 };
 export default configSetCommand;

package/commands/customObject/create.js

@@ -7,7 +7,7 @@ import { checkAndConvertToJson } from '../../lib/validation.js';
 import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { isObjectDefinition } from '../../lib/customObject.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'create [name]';
 const describe = commands.customObject.subcommands.create.describe;
@@ -57,7 +57,7 @@ const builder = makeYargsBuilder(customObjectCreateBuilder, command, describe, {
 const customObjectCreateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('custom-object-batch-create', handler),
+    handler: makeWrappedYargsHandler('custom-object-batch-create', handler),
     builder,
 };
 export default customObjectCreateCommand;

package/commands/customObject/createSchema.js

@@ -8,7 +8,7 @@ import { checkAndConvertToJson } from '../../lib/validation.js';
 import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { isSchemaDefinition } from '../../lib/customObject.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'create-schema';
 const describe = commands.customObject.subcommands.createSchema.describe;
@@ -48,7 +48,7 @@ const builder = makeYargsBuilder(schemaCreateBuilder, command, describe, {
 const createSchemaCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-create', handler),
+    handler: makeWrappedYargsHandler('custom-object-schema-create', handler),
     builder,
 };
 export default createSchemaCommand;

package/commands/customObject/deleteSchema.js

@@ -4,7 +4,7 @@ import { confirmPrompt, listPrompt } from '../../lib/prompts/promptUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.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';
 const command = 'delete-schema [name]';
 const describe = commands.customObject.subcommands.deleteSchema.describe;
@@ -62,7 +62,7 @@ const builder = makeYargsBuilder(schemaDeleteBuilder, command, describe, {
 const deleteSchemaCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-delete', handler),
+    handler: makeWrappedYargsHandler('custom-object-schema-delete', handler),
     builder,
 };
 export default deleteSchemaCommand;

package/commands/customObject/fetchAllSchemas.js

@@ -4,7 +4,7 @@ import { inputPrompt } from '../../lib/prompts/promptUtils.js';
 import { commands } from '../../lang/en.js';
 import { logSchemas } from '../../lib/schema.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';
 const command = 'fetch-all-schemas [dest]';
 const describe = commands.customObject.subcommands.fetchAllSchemas.describe;
@@ -50,7 +50,7 @@ const builder = makeYargsBuilder(schemaFetchAllBuilder, command, describe, {
 const fetchAllSchemasCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-fetch-all', handler),
+    handler: makeWrappedYargsHandler('custom-object-schema-fetch-all', handler),
     builder,
 };
 export default fetchAllSchemasCommand;

package/commands/customObject/fetchSchema.js

@@ -4,7 +4,7 @@ import { downloadSchema, getResolvedPath, } from '@hubspot/local-dev-lib/customO
 import { inputPrompt, listPrompt } from '../../lib/prompts/promptUtils.js';
 import { commands } from '../../lang/en.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';
 const command = 'fetch-schema [name] [dest]';
 const describe = commands.customObject.subcommands.fetchSchema.describe;
@@ -60,7 +60,7 @@ const builder = makeYargsBuilder(schemaFetchBuilder, command, describe, {
 const fetchSchemaCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-fetch', handler),
+    handler: makeWrappedYargsHandler('custom-object-schema-fetch', handler),
     builder,
 };
 export default fetchSchemaCommand;

package/commands/customObject/listSchemas.js

@@ -2,7 +2,7 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { listSchemas } from '../../lib/schema.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';
 const command = 'list-schemas';
 const describe = commands.customObject.subcommands.listSchemas.describe;
@@ -28,7 +28,7 @@ const builder = makeYargsBuilder(schemaListBuilder, command, describe, {
 const listSchemasCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-list', handler),
+    handler: makeWrappedYargsHandler('custom-object-schema-list', handler),
     builder,
 };
 export default listSchemasCommand;

package/commands/customObject/updateSchema.js

@@ -9,7 +9,7 @@ import { checkAndConvertToJson } from '../../lib/validation.js';
 import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { isSchemaDefinition } from '../../lib/customObject.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'update-schema [name]';
 const describe = commands.customObject.subcommands.updateSchema.describe;
@@ -63,7 +63,7 @@ const builder = makeYargsBuilder(schemaUpdateBuilder, command, describe, {
 const updateSchemaCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('custom-object-schema-update', handler),
+    handler: makeWrappedYargsHandler('custom-object-schema-update', handler),
     builder,
 };
 export default updateSchemaCommand;

package/commands/doctor.js

@@ -4,7 +4,7 @@ import { trackCommandMetadataUsage } from '../lib/usageTracking.js';
 import { Doctor } from '../lib/doctor/Doctor.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { getCwd } from '@hubspot/local-dev-lib/path';
-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 { removeAnsiCodes } from '../lib/ui/removeAnsiCodes.js';
@@ -64,7 +64,7 @@ const builder = makeYargsBuilder(doctorBuilder, command, describe, {
 const doctorCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('doctor', handler),
+    handler: makeWrappedYargsHandler('doctor', handler),
     builder,
 };
 export default doctorCommand;

package/commands/feedback.js

@@ -1,6 +1,6 @@
 import open from 'open';
 import { confirmPrompt } from '../lib/prompts/promptUtils.js';
-import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { commands } from '../lang/en.js';
@@ -28,7 +28,7 @@ const builder = makeYargsBuilder(feedbackBuilder, command, describe, {
 const feedbackCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('feedback', handler),
+    handler: makeWrappedYargsHandler('feedback', handler),
     builder,
 };
 export default feedbackCommand;

package/commands/filemanager/fetch.js

@@ -5,7 +5,7 @@ import { commands } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { addOverwriteOptions } from '../../lib/commonOpts.js';
-import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'fetch <src> [dest]';
 const describe = commands.filemanager.subcommands.fetch.describe;
@@ -51,7 +51,7 @@ const builder = makeYargsBuilder(fileManagerFetchBuilder, command, describe, {
 const fileManagerFetchCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('filemanager-fetch', handler),
+    handler: makeWrappedYargsHandler('filemanager-fetch', handler),
     builder,
 };
 export default fileManagerFetchCommand;

package/commands/filemanager/upload.js

@@ -9,7 +9,7 @@ import { shouldIgnoreFile } from '@hubspot/local-dev-lib/ignoreRules';
 import { ApiErrorContext, 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';
 const command = 'upload <src> <dest>';
 const describe = commands.filemanager.subcommands.upload.describe;
@@ -91,7 +91,7 @@ const builder = makeYargsBuilder(fileManagerUploadBuilder, command, describe, {
 const fileManagerUploadCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('filemanager-upload', handler),
+    handler: makeWrappedYargsHandler('filemanager-upload', handler),
     builder,
 };
 export default fileManagerUploadCommand;

package/commands/getStarted.js

@@ -15,7 +15,7 @@ import { uiAccountDescription, uiFeatureHighlight, uiInfoSection, } from '../lib
 import { uiLogger } from '../lib/ui/logger.js';
 import { trackCommandMetadataUsage } from '../lib/usageTracking.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
-import { makeYargsHandlerWithUsageTracking } from '../lib/yargs/makeYargsHandlerWithUsageTracking.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';
@@ -314,7 +314,7 @@ const builder = makeYargsBuilder(getStartedBuilder, command, commands.getStarted
 const getStartedCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('get-started', handler),
+    handler: makeWrappedYargsHandler('get-started', handler),
     builder,
 };
 export default getStartedCommand;

package/commands/hubdb/clear.js

@@ -5,7 +5,7 @@ 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 { 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 = 'clear [table-id]';
 const describe = commands.hubdb.subcommands.clear.describe;
@@ -51,7 +51,7 @@ const builder = makeYargsBuilder(hubdbClearBuilder, command, describe, {
 const hubdbClearCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('hubdb-clear', handler),
+    handler: makeWrappedYargsHandler('hubdb-clear', handler),
     builder,
 };
 export default hubdbClearCommand;

package/commands/hubdb/create.js

@@ -7,7 +7,7 @@ import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { checkAndConvertToJson } from '../../lib/validation.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';
 const command = 'create';
 const describe = commands.hubdb.subcommands.create.describe;
@@ -67,7 +67,7 @@ const builder = makeYargsBuilder(hubdbCreateBuilder, command, describe, {
 const hubdbCreateCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('hubdb-create', handler),
+    handler: makeWrappedYargsHandler('hubdb-create', handler),
     builder,
 };
 export default hubdbCreateCommand;

package/commands/hubdb/delete.js

@@ -6,7 +6,7 @@ import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.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';
 const command = 'delete [table-id]';
 const describe = commands.hubdb.subcommands.delete.describe;
@@ -61,7 +61,7 @@ const builder = makeYargsBuilder(hubdbDeleteBuilder, command, describe, {
 const hubdbDeleteCommand = {
     command,
     describe,
-    handler: makeYargsHandlerWithUsageTracking('hubdb-delete', handler),
+    handler: makeWrappedYargsHandler('hubdb-delete', handler),
     builder,
 };
 export default hubdbDeleteCommand;