@hubspot/cli 7.7.0-experimental.2 → 7.7.0

package/lang/en.js

@@ -1,14 +1,14 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.lib = exports.commands = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const ui_1 = require("../lib/ui");
-const urls_1 = require("../lib/projects/urls");
-const ui_2 = require("../lib/ui");
-exports.commands = {
+import chalk from 'chalk';
+import { mapToUserFriendlyName } from '@hubspot/project-parsing-lib';
+import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
+import { PERSONAL_ACCESS_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
+import { ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME, GLOBAL_CONFIG_PATH, DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, } from '@hubspot/local-dev-lib/constants/config';
+import { uiAccountDescription, uiBetaTag, uiCommandReference, uiLink, UI_COLORS, } from '../lib/ui/index.js';
+import { getProjectDetailUrl, getProjectSettingsUrl, getLocalDevUiUrl, getAppAllowlistUrl, } from '../lib/projects/urls.js';
+import { getProductUpdatesUrl } from '../lib/links.js';
+import { APP_DISTRIBUTION_TYPES, APP_AUTH_TYPES, PROJECT_CONFIG_FILE, PROJECT_WITH_APP, LEGACY_PUBLIC_APP_FILE, } from '../lib/constants.js';
+import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+export const commands = {
     generalErrors: {
         srcIsProject: (src, command) => `"${src}" is in a project folder. Did you mean "hs project ${command}"?`,
         handleDeprecatedEnvVariables: {
@@ -18,6 +18,55 @@ exports.commands = {
             configFileExists: (configPath) => `A configuration file already exists at ${configPath}. To specify a new configuration file, delete the existing one and try again.`,
         },
     },
+    getStarted: {
+        describe: 'A step-by-step command to get you started with a HubSpot project.',
+        options: {
+            dest: {
+                describe: 'Directory where the project should be created',
+            },
+            name: {
+                describe: 'Project name (cannot be changed)',
+            },
+            templateSource: {
+                describe: 'Path to custom GitHub repository from which to create project template',
+            },
+        },
+        startTitle: 'Welcome to HubSpot Development!',
+        verboseDescribe: 'A step-by-step command to get you started with a HubSpot project.',
+        startDescription: 'You can use the HubSpot CLI to build apps, CMS themes, and more.\n',
+        guideOverview: (accountName) => `This guide will walk you through deploying your first project to ${chalk.bold(accountName)}.\nTo target a different account, exit this guide ${chalk.bold('(ctrl + c)')} and run ${uiCommandReference('hs account use')} before trying again.`,
+        designManager: 'To onboard with CMS, please visit the HubSpot Design Manager in your account and follow the checklist items.',
+        openDesignManager: 'Click here to go to the HubSpot Design Manager',
+        openDesignManagerPrompt: 'Open Design Manager in your browser?',
+        openedDesignManager: 'Redirected to Design Manager!',
+        developerOverviewBrowserOpenPrep: "We'll take you to your HubSpot account and walk you through installing and previewing your new app.",
+        openInstallUrl: 'Open HubSpot to install your app in your account?',
+        openedDeveloperOverview: 'HubSpot opened!',
+        prompts: {
+            selectOption: 'Are you looking to build apps or CMS assets?',
+            options: {
+                app: 'App',
+                cms: 'CMS assets',
+            },
+            uploadProject: (accountName) => `Would you like to upload this project to account "${accountName}" now?`,
+            projectCreated: {
+                title: chalk.bold('Next steps:'),
+                description: `Let's prepare and upload your project to HubSpot.\nYou can use ${uiCommandReference('hs project install-deps')} to ${chalk.bold('install dependencies')} and ${uiCommandReference('hs project upload')} to ${chalk.bold('upload')} your project.`,
+            },
+        },
+        logs: {
+            appSelected: `We'll create a new project with a sample app for you.\nProjects are what you can use to create apps with HubSpot.\nUsually you'll use the ${uiCommandReference('hs project create')} command, but we'll go ahead and make one now.`,
+            dependenciesInstalled: 'Dependencies installed successfully.',
+            uploadingProject: 'Uploading your project to HubSpot...',
+            uploadSuccess: 'Project uploaded successfully!',
+            developerOverviewLink: 'Open this link to navigate to your HubSpot developer portal',
+        },
+        errors: {
+            uploadFailed: 'Failed to upload project to HubSpot.',
+            configFileNotFound: 'Could not find project configuration for upload.',
+            installDepsFailed: 'Failed to install dependencies.',
+        },
+    },
     completion: {
         describe: 'Enable bash completion shortcuts for commands. Concat the generated script to your .bashrc, .bash_profile, or .zshrc file.',
         examples: {
@@ -27,11 +76,29 @@ exports.commands = {
     account: {
         describe: 'Commands for managing configured accounts.',
         subcommands: {
+            auth: {
+                describe: 'Configure authentication for your HubSpot account.',
+                verboseDescribe: `Configure authentication for a HubSpot account. This will create or update the global config file at ${GLOBAL_CONFIG_PATH} that stores your account information.\n\nThe authentication method is ${chalk.bold(PERSONAL_ACCESS_KEY_AUTH_METHOD.value)}, which is an access token tied to a specific user account.\n\nGlobal configuration replaces ${DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}, and you will be prompted to migrate your existing config if one exists.`,
+                options: {
+                    account: 'HubSpot account to authenticate',
+                    personalAccessKey: 'Enter existing personal access key',
+                },
+                errors: {
+                    invalidAccountIdProvided: `--account must be a number.`,
+                    failedToUpdateConfig: 'Failed to update the configuration file. Please try again.',
+                    migrationNotConfirmed: `Did not migrate your configuration file. Run ${uiCommandReference('hs auth')} to update your existing config, or use ${uiCommandReference('hs config migrate')} to switch to the new global configuration.`,
+                    mergeNotConfirmed: `Did not merge configuration files. When you are ready to merge the deprecated config file with the global config file, run ${uiCommandReference('hs config migrate')}.`,
+                },
+                success: {
+                    configFileCreated: (configPath) => `Created config file "${configPath}"`,
+                    configFileUpdated: (accountId) => `Connected account ${uiAccountDescription(accountId)} and set it as the default account`,
+                },
+            },
             list: {
-                accounts: `${chalk_1.default.bold('Accounts')}:`,
-                defaultAccount: (account) => `${chalk_1.default.bold('Default account')}: ${account}`,
+                accounts: `${chalk.bold('Accounts')}:`,
+                defaultAccount: (account) => `${chalk.bold('Default account')}: ${account}`,
                 describe: 'List names of accounts defined in config.',
-                configPath: (configPath) => `${chalk_1.default.bold('Config path')}: ${configPath}`,
+                configPath: (configPath) => `${chalk.bold('Config path')}: ${configPath}`,
                 labels: {
                     accountId: 'Account ID',
                     authType: 'Auth Type',
@@ -98,7 +165,7 @@ exports.commands = {
                 },
             },
             info: {
-                accountId: (accountId) => `${chalk_1.default.bold('Account ID')}: ${accountId}`,
+                accountId: (accountId) => `${chalk.bold('Account ID')}: ${accountId}`,
                 describe: 'Print information about the default account, or about the account specified with the "account" option.',
                 errors: {
                     notUsingPersonalAccessKey: 'This command currently only supports fetching scopes for the personal access key auth type.',
@@ -108,8 +175,8 @@ exports.commands = {
                     idBased: 'Print information for the account with accountId equal to "1234567"',
                     nameBased: 'Print information for the account in the config with name equal to "MyAccount"',
                 },
-                name: (name) => `${chalk_1.default.bold('Account name')}: ${name}`,
-                scopeGroups: `${chalk_1.default.bold('Scopes available')}:`,
+                name: (name) => `${chalk.bold('Account name')}: ${name}`,
+                scopeGroups: `${chalk.bold('Scopes available')}:`,
             },
             clean: {
                 describe: 'Check for inactive accounts and removes them from the CLI config.',
@@ -130,8 +197,11 @@ exports.commands = {
         },
     },
     auth: {
-        describe: (configName) => `Configure authentication for your HubSpot account. This will update the ${configName} file that stores your account information.`,
+        describe: 'Configure authentication for your HubSpot account.',
+        verboseDescribe: (configName, authMethod) => `Configure authentication for a HubSpot account. This will update the ${configName} file that stores your account information.\n\nThe recommended authentication method is ${chalk.bold(authMethod)}, which uses an access token tied to a specific user account.`,
         errors: {
+            invalidAccountIdProvided: `--account must be a number.`,
+            globalConfigFileExists: (accountAuthCommand) => `You are using our new global configuration for account management, which is not compatible with this command. Please use ${uiCommandReference(accountAuthCommand)} instead.`,
             noConfigFileFound: 'No config file was found. To create a new config file, use the "hs init" command.',
             unsupportedAuthType: (type, supportedProtocols) => `Unsupported auth type: ${type}. The only supported authentication protocols are ${supportedProtocols}.`,
         },
@@ -143,6 +213,9 @@ exports.commands = {
             account: {
                 describe: 'HubSpot account to authenticate',
             },
+            personalAccessKey: {
+                describe: 'Enter existing personal access key',
+            },
         },
         success: {
             configFileUpdated: (accountName, configFilename, authType) => `Account "${accountName}" updated in ${configFilename} using "${authType}"`,
@@ -151,6 +224,21 @@ exports.commands = {
     config: {
         describe: 'Commands for managing the CLI config file.',
         subcommands: {
+            migrate: {
+                describe: `Migrate from the deprecated ${DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME} file to the new global config file at ${GLOBAL_CONFIG_PATH}.`,
+                verboseDescribe: `This command will create or update the global configuration file in your root directory. It will archive the current config as ${ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME}.`,
+                errors: {
+                    noConfigToMigrate: `No ${DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME} was found. There is nothing to migrate.`,
+                    configNotFound: (configPath) => `A configuration file at ${configPath} could not be found. Please try again with a valid file path.`,
+                },
+                options: {
+                    force: 'Bypass prompts and overwrite any conflicting values in the global config with the deprecated config values.',
+                },
+                examples: {
+                    default: `Migrate from the deprecated ${DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME} file to the new global config file at ${GLOBAL_CONFIG_PATH}`,
+                    configFlag: `Migrate a specific config file (specified with the config flag) to the new global config file at ${GLOBAL_CONFIG_PATH}`,
+                },
+            },
             set: {
                 describe: 'Set various configuration options within the hubspot CLI config file.',
                 promptMessage: 'Select a config option to update',
@@ -170,6 +258,13 @@ exports.commands = {
                     allowAutoUpdates: {
                         describe: 'Enable or disable auto updates',
                     },
+                    autoOpenBrowser: {
+                        describe: 'Enable or disable automatic opening of the browser',
+                    },
+                },
+                errors: {
+                    invalidBoolean: (commandName, value) => `Invalid boolean value "${value}" for --${commandName}. Valid values are: true, false`,
+                    invalidHTTPTimeout: `Invalid HTTP timeout value. Must be a number greater than 3000.`,
                 },
             },
         },
@@ -235,7 +330,7 @@ exports.commands = {
     create: {
         describe: (supportedAssetTypes) => `Create HubSpot sample apps and CMS assets. Supported assets are ${supportedAssetTypes}.`,
         errors: {
-            deprecatedAssetType: (assetType, newCommand, type) => `The CLI command for asset type ${assetType} has been deprecated in an effort to make it easier to know what asset types can be created. Run the ${(0, ui_1.uiCommandReference)(newCommand)}" command instead. Then when prompted select "${type}".`,
+            deprecatedAssetType: (assetType, newCommand, type) => `The CLI command for asset type ${assetType} has been deprecated in an effort to make it easier to know what asset types can be created. Run the ${uiCommandReference(newCommand)}" command instead. Then when prompted select "${type}".`,
             unsupportedAssetType: (assetType, supportedAssetTypes) => `The asset type ${assetType} is not supported. Supported asset types are ${supportedAssetTypes}.`,
             unusablePath: (path) => `The "${path}" is not a usable path to a directory.`,
         },
@@ -250,6 +345,38 @@ exports.commands = {
                 describe: 'Type of asset',
             },
         },
+        flags: {
+            templateType: {
+                describe: 'Template type for template creation - only used when type is template',
+            },
+            moduleLabel: {
+                describe: 'Label for module creation - only used when type is module',
+            },
+            reactType: {
+                describe: 'Whether to create a React module - only used when type is module',
+            },
+            contentTypes: {
+                describe: (contentTypes) => `Content types where the module can be used (comma-separated list: ${contentTypes.join(', ')}) - only used when type is module`,
+            },
+            global: {
+                describe: 'Whether to create a global module - only used when type is module',
+            },
+            availableForNewContent: {
+                describe: 'Whether the template is available for new content - only used when type is template',
+            },
+            functionsFolder: {
+                describe: 'Folder to create functions in - only used when type is function',
+            },
+            filename: {
+                describe: 'Filename for the function - only used when type is function',
+            },
+            endpointMethod: {
+                describe: 'HTTP method for the function endpoint - only used when type is function',
+            },
+            endpointPath: {
+                describe: 'API endpoint path for the function - only used when type is function',
+            },
+        },
         subcommands: {
             apiSample: {
                 folderOverwritePrompt: (folderName) => `The folder with name "${folderName}" already exists. Overwrite?`,
@@ -277,7 +404,7 @@ exports.commands = {
         },
     },
     customObject: {
-        betaMessage: `${chalk_1.default.bold('[BETA]')} The Custom Object CLI is currently in beta and is subject to change.`,
+        betaMessage: `${chalk.bold('[BETA]')} The Custom Object CLI is currently in beta and is subject to change.`,
         describe: 'Commands for managing custom objects.',
         seeMoreLink: 'View our docs to find out more.',
         subcommands: {
@@ -429,9 +556,9 @@ exports.commands = {
         },
         errors: {
             generatingDiagnosis: 'Error generating diagnosis',
-            unableToWriteOutputFile: (file, errorMessage) => `Unable to write output to ${chalk_1.default.bold(file)}, ${errorMessage}`,
+            unableToWriteOutputFile: (file, errorMessage) => `Unable to write output to ${chalk.bold(file)}, ${errorMessage}`,
         },
-        outputWritten: (filename) => `Output written to ${chalk_1.default.bold(filename)}`,
+        outputWritten: (filename) => `Output written to ${chalk.bold(filename)}`,
     },
     fetch: {
         describe: 'Fetch a file, directory or module from HubSpot and write to a path on your computer.',
@@ -640,10 +767,28 @@ exports.commands = {
                     fetch: (tableId, path) => `Downloaded HubDB table ${tableId} to ${path}`,
                 },
             },
+            list: {
+                tables: `${chalk.bold('Tables')}:`,
+                describe: 'List HubDB tables.',
+                labels: {
+                    label: 'Label',
+                    id: 'ID',
+                    name: 'Name',
+                    columns: 'Columns',
+                    rows: 'Rows',
+                },
+                success: (accountId) => `Showing tables for account ${accountId}:`,
+                noTables: (accountId) => `No tables found for account ${accountId}.`,
+                tablesDisplayed: (displayed, total, truncated) => `Displaying ${displayed} of ${total} tables${truncated
+                    ? `, the remaining ${truncated} tables were not displayed.`
+                    : '.'}`,
+                viewTablesLink: (baseUrl, accountId) => uiLink('Manage tables in HubSpot', `${baseUrl}/hubdb/${accountId}`),
+            },
         },
     },
     init: {
-        describe: (configName) => `Configure authentication for your HubSpot account. This will create a ${configName} file to store your account information.`,
+        describe: 'Create a CLI config file and configure authentication for your HubSpot account.',
+        verboseDescribe: (configName, command, authMethod) => `Configure authentication for a HubSpot account. This will create a ${configName} file to store your account information. To configure authentication for additional accounts, run ${command}.\n\nThe recommended authentication method is ${chalk.bold(authMethod)}, which uses an access token tied to a specific user account.`,
         options: {
             authType: {
                 describe: 'Authentication mechanism',
@@ -658,14 +803,16 @@ exports.commands = {
         },
         success: {
             configFileCreated: (configPath) => `Created config file "${configPath}"`,
-            configFileUpdated: (account, authType) => `Connected account "${account}" using "${authType}" and set it as the default account`,
+            configFileUpdated: (authType, account) => `Connected account "${account}" using "${authType}" and set it as the default account`,
         },
         logs: {
             updateConfig: 'To update an existing config file, use the "hs auth" command.',
         },
         errors: {
+            invalidAccountIdProvided: `--account must be a number.`,
             configFileExists: (configPath) => `The config file ${configPath} already exists.`,
             bothConfigFilesNotAllowed: (path) => `Unable to create config file, because there is an existing one at "${path}". To create a new config file, delete the existing one and try again.`,
+            globalConfigFileExists: `You are using our new global configuration for account management, which is not compatible with this command. Please use ${uiCommandReference('hs account auth')} instead.`,
         },
     },
     lint: {
@@ -720,6 +867,65 @@ exports.commands = {
         },
         tailLogs: (functionPath, accountId) => `Waiting for log entries for "${functionPath}" on account "${accountId}".\n`,
     },
+    mcp: {
+        describe: 'Commands for managing HubSpot MCP servers.',
+        setup: {
+            describe: 'Setup the HubSpot development MCP servers.',
+            installingDocSearch: 'Adding the docs-search mcp server',
+            claudeCode: 'Claude Code',
+            cursor: 'Cursor',
+            windsurf: 'Windsurf',
+            vsCode: 'VSCode',
+            args: {
+                client: 'Target applications to configure',
+                docsSearch: 'Should the docs search mcp server be installed',
+            },
+            success: (derivedTargets) => `You can now use the HubSpot CLI MCP Server in ${derivedTargets.join(', ')}.  ${chalk.bold('You may need to restart these tools to apply the changes')}.`,
+            errors: {
+                needsMcpAccess: (accountId) => `You must opt in to the developer MCP beta to use this feature on ${uiAccountDescription(accountId)}. Try again with a different account or ${uiLink('join the beta now', getProductUpdatesUrl('239890', accountId))}`,
+                needsNode20: `This feature requires node >=20`,
+                errorParsingJsonFIle: (filename, errorMessage) => `Unable to update ${chalk.bold(filename)} due to invalid JSON: ${errorMessage}`,
+            },
+            spinners: {
+                failedToConfigure: 'Failed to configure the HubSpot mcp server.',
+                // Claude
+                configuringClaudeCode: 'Configuring Claude Code...',
+                configuredClaudeCode: 'Configured Claude Code',
+                claudeCodeNotFound: 'Claude Code not found - skipping configuration',
+                claudeCodeInstallFailed: 'Claude Code CLI not working - skipping configuration',
+                failedToConfigureClaudeDesktop: 'Failed to configure Claude Desktop',
+                // Cursor
+                configuringCursor: 'Configuring Cursor...',
+                failedToConfigureCursor: 'Failed to configure Cursor',
+                configuredCursor: 'Configured Cursor',
+                alreadyInstalled: 'HubSpot CLI mcp server already installed, reinstalling',
+                // Windsurf
+                configuringWindsurf: 'Configuring Windsurf...',
+                failedToConfigureWindsurf: 'Failed to configure Windsurf',
+                configuredWindsurf: 'Configured Windsurf',
+                // VS Code
+                configuringVsCode: 'Configuring VSCode...',
+                failedToConfigureVsCode: 'Failed to configure VSCode',
+                configuredVsCode: 'Configured VSCode',
+                vsCodeNotFound: 'VSCode not found - skipping configuration',
+            },
+            prompts: {
+                targets: '[--client] Which tools would you like to add the HubSpot CLI MCP server to?',
+                targetsRequired: 'Must choose at least one application to configure.',
+            },
+        },
+        start: {
+            errors: {
+                needsNode20: `This feature requires node >=20`,
+                serverFileNotFound: (serverPath) => `MCP server file not found at ${serverPath}`,
+                failedToStart: 'Failed to start MCP server',
+            },
+            startingServer: 'Starting HubSpot CLI MCP server...',
+            stopInstructions: 'Press Ctrl+C to stop the server',
+            stoppedSuccessfully: 'Stopped successfully.',
+            shuttingDown: 'Shutting down MCP server...',
+        },
+    },
     mv: {
         describe: 'Move a remote file or folder in HubSpot. This feature is currently in beta and the CLI contract is subject to change.',
         errors: {
@@ -745,15 +951,15 @@ exports.commands = {
     project: {
         profile: {
             describe: 'Commands for managing project profiles',
-            verboseDescribe: `Commands for managing project profiles\n\nProfiles are stored at the root of your project's source directory and they make configuration dynamic. Use them to couple specialized configurations of your project to specific HubSpot accounts.\n\nRun ${(0, ui_1.uiCommandReference)('hs project profile add')} to get started!`,
+            verboseDescribe: `Commands for managing project profiles\n\nProfiles are stored at the root of your project's source directory and they make configuration dynamic. Use them to couple specialized configurations of your project to specific HubSpot accounts.\n\nRun ${uiCommandReference('hs project profile add')} to get started!`,
             add: {
                 describe: 'Add a new project profile',
-                verboseDescribe: `Add a new project profile\n\nProfiles enable you to reference variables in your component configuration files. Use the syntax ${chalk_1.default.bold('\${VARIABLE_NAME}')} to reference profile variables in your component configuration files. Then target the profile using the ${(0, ui_1.uiCommandReference)('--profile')} flag when you upload your project.`,
+                verboseDescribe: `Add a new project profile\n\nProfiles enable you to reference variables in your component configuration files. Use the syntax ${chalk.bold('\${VARIABLE_NAME}')} to reference profile variables in your component configuration files. Then target the profile using the ${uiCommandReference('--profile')} flag when you upload your project.`,
                 example: 'Add a new project profile named hsprofile.qa.json',
                 logs: {
-                    copyExistingProfile: (profileName) => `Found an existing profile. We can copy the variables from ${chalk_1.default.bold(profileName)} into your new profile.`,
+                    copyExistingProfile: (profileName) => `Found an existing profile. We can copy the variables from ${chalk.bold(profileName)} into your new profile.`,
                     copyExistingProfiles: 'We can copy the variables from one of your existing profiles into your new profile.',
-                    profileAdded: (profileName) => `Project profile ${chalk_1.default.bold(profileName)} was successfully added`,
+                    profileAdded: (profileName) => `Project profile ${chalk.bold(profileName)} was successfully added`,
                 },
                 prompts: {
                     namePrompt: 'Enter a name for the new project profile: ',
@@ -764,14 +970,14 @@ exports.commands = {
                     invalidProfileName: 'Profile name cannot contain special characters or spaces',
                 },
                 warnings: {
-                    duplicateTargetAccount: (targetAccountId) => `The account ${(0, ui_1.uiAccountDescription)(targetAccountId)} is being used in an existing profile. Make sure to edit your project's name between uploads if you do not want to overwrite the existing project in this account.`,
+                    duplicateTargetAccount: (targetAccountId) => `The account ${uiAccountDescription(targetAccountId)} is being used in an existing profile. Make sure to edit your project's name between uploads if you do not want to overwrite the existing project in this account.`,
                 },
                 errors: {
                     noProjectConfig: 'No project config found. Please run this command from a project directory.',
-                    profileExists: (profileName) => `Profile ${chalk_1.default.bold(profileName)} already exists. Please choose a different name.`,
+                    profileExists: (profileName) => `Profile ${chalk.bold(profileName)} already exists. Please choose a different name.`,
                     invalidTargetAccount: 'Target account is not configured in the CLI',
                     noAccountsConfigured: 'No accounts configured in the CLI',
-                    failedToLoadProfile: (profileName) => `Unable to copy variables. Failed to load profile ${chalk_1.default.bold(profileName)}`,
+                    failedToLoadProfile: (profileName) => `Unable to copy variables. Failed to load profile ${chalk.bold(profileName)}`,
                     failedToCreateProfile: 'Failed to create profile',
                 },
                 positionals: {
@@ -785,22 +991,23 @@ exports.commands = {
                 describe: 'Delete an existing project profile',
                 example: 'Delete a project profile named hsprofile.qa.json',
                 logs: {
-                    profileDeleted: (profileName) => `Project profile ${chalk_1.default.bold(profileName)} was successfully deleted`,
-                    deletedProject: (accountId) => `Successfully deleted the project from ${(0, ui_1.uiAccountDescription)(accountId)}`,
-                    didNotDeleteProject: (accountId) => `Did not delete the project from ${(0, ui_1.uiAccountDescription)(accountId)}`,
+                    profileDeleted: (profileName) => `Project profile ${chalk.bold(profileName)} was successfully deleted`,
+                    deletedProject: (accountId) => `Successfully deleted the project from ${uiAccountDescription(accountId)}`,
+                    didNotDeleteProject: (accountId) => `Did not delete the project from ${uiAccountDescription(accountId)}`,
                 },
                 debug: {
-                    failedToLoadProfile: (profileName) => `Failed to load profile ${chalk_1.default.bold(profileName)}`,
+                    failedToLoadProfile: (profileName) => `Failed to load profile ${chalk.bold(profileName)}`,
                 },
                 prompts: {
                     deleteProfilePrompt: 'Select a profile to delete from your project',
-                    deleteProjectPrompt: (accountId) => `Would you like to delete this project from ${(0, ui_1.uiAccountDescription)(accountId)}?`,
+                    deleteProjectPrompt: (accountId) => `Would you like to delete this project from ${uiAccountDescription(accountId)}?`,
                 },
                 errors: {
                     noProjectConfig: 'No project config found. Please run this command from a project directory.',
-                    noProfileFound: (profileName) => `No profile with filename ${chalk_1.default.bold(profileName)} found in your project.`,
+                    noProfileFound: (profileName) => `No profile with filename ${chalk.bold(profileName)} found in your project.`,
                     noProfilesFound: 'No profiles found in your project.',
-                    failedToDeleteProfile: (profileName) => `Unable to delete profile ${chalk_1.default.bold(profileName)}. Please try again.`,
+                    failedToDeleteProfile: (profileName) => `Unable to delete profile ${chalk.bold(profileName)}. Please try again.`,
+                    failedToDeleteProject: (accountId) => `Failed to delete the project from ${uiAccountDescription(accountId)}`,
                 },
                 positionals: {
                     name: 'The name of the project profile',
@@ -810,22 +1017,36 @@ exports.commands = {
         dev: {
             describe: 'Start local dev for the current project.',
             logs: {
-                betaMessage: 'HubSpot projects local development',
+                header: 'HubSpot projects local development',
                 placeholderAccountSelection: 'Using default account as target account (for now)',
-                learnMoreLocalDevServer: 'Learn more about the projects local dev server',
                 accountTypeInformation: 'Testing in a developer test account is strongly recommended, but you can use a sandbox account if your plan allows you to create one.',
-                learnMoreMessage: `Visit our ${(0, ui_1.uiLink)('docs on Developer Test and Sandbox accounts', 'https://developers.hubspot.com/docs/getting-started/account-types')} to learn more.`,
+                learnMoreMessageV3: `Learn more about ${uiLink('HubSpot projects local dev', 'https://developers.hubspot.com/docs/developer-tooling/local-development/hubspot-cli/project-commands#start-a-local-development-server')} | ${uiLink('HubSpot account types', 'https://developers.hubspot.com/docs/getting-started/account-types')}`,
+                learnMoreMessageLegacy: uiLink('Learn more about the projects local dev server', 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'),
+                profileProjectAccountExplanation: (accountId, profileName) => `Using account ${uiAccountDescription(accountId)} from profile ${chalk.bold(profileName)} for project upload`,
+                defaultProjectAccountExplanation: (accountId) => `Using default account ${uiAccountDescription(accountId)} for project upload`,
+                projectAccountFlagExplanation: (accountId) => `Using account ${uiAccountDescription(accountId)} provided by the --project-account flag for project upload`,
+                accountFlagExplanation: (accountId) => `Using account ${uiAccountDescription(accountId)} provided by the --account flag for project upload`,
+                defaultSandboxOrDevTestTestingAccountExplanation: (accountId) => `Using default account ${uiAccountDescription(accountId)} for testing`,
+                testingAccountFlagExplanation: (accountId) => `Using account ${uiAccountDescription(accountId)} provided by the --testing-account flag for testing`,
             },
             errors: {
                 noProjectConfig: 'No project detected. Please run this command again from a project directory.',
-                noAccount: (accountId, authCommand) => `An error occurred while reading account ${accountId} from your config. Run ${chalk_1.default.bold(authCommand)} to re-auth this account.`,
-                noAccountsInConfig: (authCommand) => `No accounts found in your config. Run ${chalk_1.default.bold(authCommand)} to configure a HubSpot account with the CLI.`,
+                noAccount: (accountId) => `An error occurred while reading account ${uiAccountDescription(accountId)} from your config. Run ${uiCommandReference('hs auth')} to re-auth this account.`,
+                noAccountsInConfig: (authCommand) => `No accounts found in your config. Run ${chalk.bold(authCommand)} to configure a HubSpot account with the CLI.`,
                 invalidProjectComponents: 'Projects cannot contain both private and public apps. Move your apps to separate projects before attempting local development.',
-                noRunnableComponents: (command) => `No supported components were found in this project. Run ${chalk_1.default.bold(command)} to see a list of available components and add one to your project.`,
+                noRunnableComponents: `No supported components were found in this project. Run ${uiCommandReference('hs project add')} to see a list of available components and add one to your project.`,
+                accountNotCombined: `\nLocal development of unified apps is currently only compatible with accounts that are opted into the unified apps beta. Make sure that this account is opted in or switch accounts using ${uiCommandReference('hs account use')}.`,
+                unsupportedAccountFlagLegacy: 'The --project-account and --testing-account flags are not supported for projects with platform versions earlier than 2025.2.',
+                unsupportedAccountFlagV3: 'The --account flag is is not supported supported for projects with platform versions 2025.2 and newer. Use --testing-account and --project-account flags to specify accounts to use for local dev',
             },
             examples: {
                 default: 'Start local dev for the current project',
             },
+            options: {
+                profile: 'The profile to target during local dev',
+                projectAccount: 'The id of the account to upload your project to. Only compatible with platform versions 2025.2 and above.',
+                testingAccount: 'The id of the account to install apps and test on. Only compatible with platform versions 2025.2 and above.',
+            },
         },
         create: {
             describe: 'Create a new project.',
@@ -836,8 +1057,13 @@ exports.commands = {
                 cannotNestProjects: (projectDir) => `A project already exists at ${projectDir}. Projects cannot be nested within other projects. Please choose a different destination and try again.`,
             },
             logs: {
-                success: (projectName, projectDest) => `Project ${chalk_1.default.bold(projectName)} was successfully created in ${projectDest}`,
-                welcomeMessage: 'Welcome to HubSpot Developer Projects!',
+                success: (projectName, projectDest) => `Project ${chalk.bold(projectName)} was successfully created in ${projectDest}`,
+                welcomeMessage: `\n${chalk.bold('Welcome to HubSpot Developer Projects!')}`,
+            },
+            prompts: {
+                parentComponents: '[--project-base] What would you like in your project?',
+                emptyProject: 'Empty Project',
+                app: 'App',
             },
             examples: {
                 default: 'Create a new project',
@@ -851,11 +1077,26 @@ exports.commands = {
                     describe: 'Project name (cannot be changed)',
                 },
                 template: {
-                    describe: 'The starting template',
+                    describe: 'The starting template.  Only applies when platform version is less than 2025.2.',
                 },
                 templateSource: {
                     describe: 'Path to custom GitHub repository from which to create project template',
                 },
+                platformVersion: {
+                    describe: 'The target platform version for the new project.',
+                },
+                projectBase: {
+                    describe: 'The top level component to include in the project.',
+                },
+                distribution: {
+                    describe: 'How the app will be distributed.',
+                },
+                auth: {
+                    describe: 'Authentication model for the application.',
+                },
+                features: {
+                    describe: `Features to include in the project. Only valid if project-base is ${PROJECT_WITH_APP}`,
+                },
             },
         },
         migrateApp: {
@@ -880,17 +1121,17 @@ exports.commands = {
             },
             deprecationWarning: (oldCommand, newCommand) => `The ${oldCommand} command is deprecated and will be removed. Use ${newCommand} going forward.`,
             migrationStatus: {
-                inProgress: () => `Converting app configuration to ${chalk_1.default.bold('public-app.json')} component definition ...`,
-                success: () => `${chalk_1.default.bold('Your app was converted and build #1 is deployed')}`,
-                done: () => 'Converting app configuration to public-app.json component definition ... DONE',
-                failure: () => 'Converting app configuration to public-app.json component definition ... FAILED',
+                inProgress: () => `Converting app configuration to ${chalk.bold(LEGACY_PUBLIC_APP_FILE)} component definition ...`,
+                success: () => `${chalk.bold('Your app was converted and build #1 is deployed')}`,
+                done: () => `Converting app configuration to ${LEGACY_PUBLIC_APP_FILE} component definition ... DONE`,
+                failure: () => `Converting app configuration to ${LEGACY_PUBLIC_APP_FILE} component definition ... FAILED`,
             },
             warning: {
-                title: () => `${chalk_1.default.bold('You are about to migrate an app to the projects framework')}`,
-                projectConversion: () => `${chalk_1.default.bold('The selected app will be converted to a project component.')}`,
-                appConfig: () => `All supported app configuration will be moved to the ${chalk_1.default.bold('public-app.json')} component definition file. Future updates to those features must be made through the project build and deploy pipeline, not the developer account UI.`,
+                title: () => `${chalk.bold('You are about to migrate an app to the projects framework')}`,
+                projectConversion: () => `${chalk.bold('The selected app will be converted to a project component.')}`,
+                appConfig: () => `All supported app configuration will be moved to the ${chalk.bold(LEGACY_PUBLIC_APP_FILE)} component definition file. Future updates to those features must be made through the project build and deploy pipeline, not the developer account UI.`,
                 buildAndDeploy: 'This will create a new project with a single app component and immediately build and deploy it to your developer account (build #1).',
-                existingApps: () => `${chalk_1.default.bold('This will not affect existing app users or installs.')}`,
+                existingApps: () => `${chalk.bold('This will not affect existing app users or installs.')}`,
                 copyApp: 'We strongly recommend making a copy of your app to test this process in a development app before replacing production.',
             },
             migrationInterrupted: '\nThe command is terminated, but app migration is still in progress. Please check your account to ensure that the project and associated app have been created successfully.',
@@ -902,6 +1143,7 @@ exports.commands = {
             describe: 'Migrate an existing project to the new version of the projects framework.',
             errors: {
                 noProjectConfig: (command) => `No project detected. Please run this command again from a project directory.  If you are trying to migrate an app, run ${command}`,
+                noThemeMigrationAccess: (accountId) => `This project contains a CMS theme. You must opt in to theme migration beta to continue updating it on ${uiAccountDescription(accountId)}. Try again with a different account or ${uiLink('join the beta now', getProductUpdatesUrl('253920', accountId))}`,
             },
             examples: {
                 default: 'Migrate an existing project to the new version of the projects framework.',
@@ -921,13 +1163,13 @@ exports.commands = {
                 },
             },
             cloneStatus: {
-                inProgress: () => `Cloning app configuration to ${chalk_1.default.bold('public-app.json')} component definition ...`,
-                done: 'Cloning app configuration to public-app.json component definition ... DONE',
+                inProgress: () => `Cloning app configuration to ${chalk.bold(LEGACY_PUBLIC_APP_FILE)} component definition ...`,
+                done: `Cloning app configuration to ${LEGACY_PUBLIC_APP_FILE} component definition ... DONE`,
                 success: (dest) => `Your cloned project was created in ${dest}`,
-                failure: 'Cloning app configuration to public-app.json component definition ... FAILED',
+                failure: `Cloning app configuration to ${LEGACY_PUBLIC_APP_FILE} component definition ... FAILED`,
             },
             errors: {
-                invalidAccountTypeTitle: () => `${chalk_1.default.bold('Developer account not targeted')}`,
+                invalidAccountTypeTitle: () => `${chalk.bold('Developer account not targeted')}`,
                 invalidAccountTypeDescription: (useCommand, authCommand) => `Only public apps created in a developer account can be converted to a project component. Select a connected developer account with ${useCommand} or ${authCommand} and try again.`,
                 couldNotWriteConfigPath: (configPath) => `Failed to write project config at ${configPath}`,
             },
@@ -941,17 +1183,31 @@ exports.commands = {
                 type: {
                     describe: "The path to the component type's location within the hubspot-project-components Github repo: https://github.com/HubSpot/hubspot-project-components",
                 },
+                distribution: {
+                    describe: 'The distribution method for the application.',
+                },
+                auth: {
+                    describe: 'The authentication type for the application.',
+                },
+                features: {
+                    describe: 'Which features to include with the application.',
+                },
             },
-            creatingComponent: (projectName) => `Adding a new component to ${chalk_1.default.bold(projectName)}`,
-            success: (componentName) => `${componentName} was successfully added to your project.`,
+            creatingComponent: (projectName) => `\nAdding a new app feature to ${chalk.bold(projectName)}\n`,
+            success: (componentName, multiple = false) => `${componentName || 'An app'} ${multiple ? 'were' : 'was'} successfully added to your ${componentName ? 'app' : 'project'}.`,
             error: {
-                failedToDownloadComponent: 'Failed to download project component. Please try again later.',
+                failedToDownloadComponent: 'Failed to download project. Please try again later.',
+                invalidComponentType: (componentType) => `'${componentType}' is not a valid project component type.`,
+                maxExceeded: (maxCount) => `This project has the maximum allowed(${maxCount})`,
+                authTypeNotAllowed: (authType) => `Auth type '${authType}' not allowed.`,
+                distributionNotAllowed: (dist) => `Distribution '${dist}' not allowed.`,
+                portalDoesNotHaveAccessToThisFeature: (accountId) => `The account ${uiAccountDescription(accountId)} does not have access to this feature.`,
                 locationInProject: 'This command must be run from within a project directory.',
-                failedToFetchComponentList: 'Failed to fetch the list of available components. Please try again later.',
+                failedToFetchComponentList: 'Failed to fetch the list of available features. Please try again later.',
                 projectContainsPublicApp: 'This project contains a public app. This command is currently only compatible with projects that contain private apps.',
             },
             examples: {
-                default: 'Create a component within your project',
+                default: 'Create an app feature within your project',
                 withFlags: 'Use --name and --type flags to bypass the prompt.',
             },
         },
@@ -962,25 +1218,28 @@ exports.commands = {
                 deploying: (path) => `Deploying project at path: ${path}`,
             },
             errors: {
-                deploy: (details) => `Deploy error: ${details}`,
+                deploy: 'Deploy error: an unknown error occurred.',
                 noBuilds: 'Deploy error: no builds for this project were found.',
                 noBuildId: 'You must specify a build to deploy',
-                projectNotFound: (projectName, accountIdentifier, command) => `The project ${chalk_1.default.bold(projectName)} does not exist in account ${accountIdentifier}. Run ${command} to upload your project files to HubSpot.`,
-                buildIdDoesNotExist: (buildId, projectName, linkToProject) => `Build ${buildId} does not exist for project ${chalk_1.default.bold(projectName)}. ${linkToProject}`,
-                buildAlreadyDeployed: (buildId, linkToProject) => `Build ${buildId} is already deployed. ${linkToProject}`,
-                viewProjectsBuilds: 'View project builds in HubSpot',
+                projectNotFound: (accountId, projectName) => `The project ${chalk.bold(projectName)} does not exist in account ${uiAccountDescription(accountId)}. Run ${uiCommandReference('hs project upload')} to upload your project files to HubSpot.`,
+                buildIdDoesNotExist: (accountId, buildId, projectName) => `Build ${buildId} does not exist for project ${chalk.bold(projectName)}. ${uiLink('View project builds in HubSpot', getProjectDetailUrl(projectName, accountId))}`,
+                buildAlreadyDeployed: (accountId, buildId, projectName) => `Build ${buildId} is already deployed. ${uiLink('View project builds in HubSpot', getProjectDetailUrl(projectName, accountId))}`,
+                deployContainsRemovals: (componentName) => `- This deploy would remove the ${chalk.bold(componentName)} component. To proceed, run the deploy command with the ${uiCommandReference('--force')} flag`,
+                deployBlockedHeader: "This build couldn't be deployed because it will be too disruptive for existing users. Fix the following issues and try again:",
+                deployWarningsHeader: `Deploying this build might have unintended consequences for users. Review the following issues and run ${uiCommandReference('hs project deploy --force')} to try again:`,
+                deployIssueComponentGeneric: (uid, componentTypeName) => `- [${mapToUserFriendlyName(componentTypeName)}] ${chalk.bold('(' + uid + ')')}  reported issues with the deploy`,
+                deployIssueComponentWarning: (uid, componentTypeName, message) => `- [${mapToUserFriendlyName(componentTypeName)}] ${chalk.bold('(' + uid + ')')} ${message}`,
             },
             examples: {
                 default: 'Deploy the latest build of the current project',
                 withOptions: 'Deploy build 5 of the project my-project',
             },
             options: {
-                build: {
-                    describe: 'Project build ID to be deployed',
-                },
-                project: {
-                    describe: 'Project name',
-                },
+                build: 'Project build ID to be deployed',
+                project: 'Project name',
+                profile: 'The profile to target with this deploy',
+                force: 'Skip warnings and force deploy. Use this carefully as it will bypass warnings for destructive actions.',
+                deployLatestBuild: 'Deploy the latest build of the current project',
             },
         },
         listBuilds: {
@@ -1011,7 +1270,7 @@ exports.commands = {
                 noProjectConfig: 'No project detected. Run this command again from a project directory.',
                 failedToFetchProjectDetails: 'There was an error fetching project details',
                 noFunctionsLinkText: 'Visit developer docs',
-                noFunctionsInProject: `There aren't any functions in this project\n\t- Run ${(0, ui_1.uiCommandReference)('hs project logs --help')} to learn more about logs\n\t- ${(0, ui_1.uiLink)('Visit developer docs', 'https://developers.hubspot.com/docs/platform/serverless-functions')} to learn more about serverless functions`,
+                noFunctionsInProject: `There aren't any functions in this project\n\t- Run ${uiCommandReference('hs project logs --help')} to learn more about logs\n\t- ${uiLink('Visit developer docs', 'https://developers.hubspot.com/docs/platform/serverless-functions')} to learn more about serverless functions`,
                 noFunctionWithName: (name) => `No function with name "${name}"`,
                 functionNotDeployed: (name) => `The function with name "${name}" is not deployed`,
                 projectLogsManagerNotInitialized: 'Function called on ProjectLogsManager before initialization',
@@ -1064,7 +1323,7 @@ exports.commands = {
                 autoDeployDisabled: (deployCommand) => `Automatic deploys are disabled for this project. Run ${deployCommand} to deploy this build.`,
             },
             errors: {
-                projectLockedError: () => `Your project is locked. This may mean that another user is running the ${chalk_1.default.bold('`hs project dev`')} command for this project. If this is you, unlock the project in Projects UI.`,
+                projectLockedError: () => `Your project is locked. This may mean that another user is running the ${chalk.bold('`hs project dev`')} command for this project. If this is you, unlock the project in Projects UI.`,
             },
             options: {
                 forceCreate: {
@@ -1082,7 +1341,7 @@ exports.commands = {
             },
             logs: {
                 processExited: 'Stopping watcher...',
-                watchCancelledFromUi: `The watch process has been cancelled from the UI. Any changes made since cancelling have not been uploaded. To resume watching, rerun ${(0, ui_1.uiCommandReference)('hs project watch')}.`,
+                watchCancelledFromUi: `The watch process has been cancelled from the UI. Any changes made since cancelling have not been uploaded. To resume watching, rerun ${uiCommandReference('hs project watch')}.`,
                 resuming: 'Resuming watcher...',
                 uploadSucceeded: (remotePath, filePath) => `Uploaded file "${filePath}" to "${remotePath}"`,
                 deleteFileSucceeded: (remotePath) => `Deleted file "${remotePath}"`,
@@ -1106,7 +1365,7 @@ exports.commands = {
             },
             errors: {
                 projectConfigNotFound: 'No project config found. Please ensure that you are in a project directory.',
-                projectLockedError: `Your project is locked. This may mean that another user is running the ${chalk_1.default.bold(`hs project dev`)} command for this project. If this is you, unlock the project in Projects UI.`,
+                projectLockedError: `Your project is locked. This may mean that another user is running the ${chalk.bold(`hs project dev`)} command for this project. If this is you, unlock the project in Projects UI.`,
                 uploadFailed: (remotePath, filePath) => `Failed to upload file "${filePath}" to "${remotePath}"`,
                 deleteFileFailed: (remotePath) => `Failed to delete file "${remotePath}"`,
                 deleteFolderFailed: (remotePath) => `Failed to delete folder "${remotePath}"`,
@@ -1123,7 +1382,7 @@ exports.commands = {
             },
             errors: {
                 downloadFailed: 'Something went wrong downloading the project',
-                projectNotFound: (projectName, accountId) => `Your project ${chalk_1.default.bold(projectName)} could not be found in ${accountId}`,
+                projectNotFound: (projectName, accountId) => `Your project ${chalk.bold(projectName)} could not be found in ${accountId}`,
             },
             warnings: {
                 cannotDownloadWithinProject: 'Cancelling project download. Please run the command again outside the context of an existing project.',
@@ -1155,8 +1414,8 @@ exports.commands = {
         feedback: {
             describe: 'Leave feedback or file a bug report.',
             openPrompt: 'Open the feedback form in your browser?',
-            success: (url) => `We opened ${(0, ui_1.uiLink)('the developer feedback form', url)} in your browser.`,
-            error: (url) => `Navigate to ${(0, ui_1.uiLink)('the developer feedback form', url)} to leave feedback.`,
+            success: (url) => `We opened ${uiLink('the developer feedback form', url)} in your browser.`,
+            error: (url) => `Navigate to ${uiLink('the developer feedback form', url)} to leave feedback.`,
         },
         installDeps: {
             help: {
@@ -1172,19 +1431,32 @@ exports.commands = {
             installingDependenciesFailed: (directory) => `Installing dependencies for ${directory} failed`,
             noProjectConfig: 'No project detected. Run this command from a project directory.',
             noPackageJsonInProject: (projectName, link) => `No dependencies to install. The project ${projectName} folder might be missing component or subcomponent files. ${link}`,
-            packageManagerNotInstalled: (packageManager, link) => `This command depends on ${packageManager}, install ${chalk_1.default.bold(link)}`,
+            packageManagerNotInstalled: (packageManager, link) => `This command depends on ${packageManager}, install ${chalk.bold(link)}`,
+        },
+        validate: {
+            describe: 'Validate the project before uploading',
+            mustBeRanWithinAProject: 'This command must be run from within a project directory.',
+            badVersion: 'This command is only available for projects 2025.2 and later.',
+            examples: {
+                default: 'Validate the project before uploading',
+            },
+            success: (projectName) => `Project ${projectName} is valid and ready to upload`,
+            failure: (projectName) => `Project ${projectName} is invalid`,
+            options: {
+                profile: {
+                    describe: 'The profile to target for this validation',
+                },
+            },
         },
     },
     remove: {
-        describe: 'Delete a file or folder from HubSpot.',
-        deleted: (path, accountId) => `Deleted "${path}" from account ${accountId}`,
+        describe: 'Delete a file or folder from the HubSpot CMS.',
+        deleted: (path, accountId) => `Deleted "${path}" from account ${uiAccountDescription(accountId)}`,
         errors: {
-            deleteFailed: (path, accountId) => `Deleting "${path}" from account ${accountId} failed`,
+            deleteFailed: (path, accountId) => `Deleting "${path}" from account ${uiAccountDescription(accountId)} failed`,
         },
         positionals: {
-            path: {
-                describe: 'Remote hubspot path',
-            },
+            path: 'Remote hubspot path',
         },
     },
     sandbox: {
@@ -1193,39 +1465,39 @@ exports.commands = {
             create: {
                 developer: {
                     loading: {
-                        add: (accountName) => `Creating developer sandbox ${chalk_1.default.bold(accountName)}`,
-                        fail: (accountName) => `Failed to create a developer sandbox ${chalk_1.default.bold(accountName)}.`,
-                        succeed: (accountName, accountId) => `Successfully created a developer sandbox ${chalk_1.default.bold(accountName)} with portalId ${chalk_1.default.bold(accountId)}.`,
+                        add: (accountName) => `Creating developer sandbox ${chalk.bold(accountName)}`,
+                        fail: (accountName) => `Failed to create a developer sandbox ${chalk.bold(accountName)}.`,
+                        succeed: (accountName, accountId) => `Successfully created a developer sandbox ${chalk.bold(accountName)} with portalId ${chalk.bold(accountId)}.`,
                     },
                     success: {
                         configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
                     },
                     failure: {
-                        invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk_1.default.bold(accountName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
-                        limit: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} developer sandboxes. \n- To connect a developer sandbox to your HubSpot CLI, run ${chalk_1.default.bold('hs auth')} and follow the prompts.`,
-                        alreadyInConfig: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} developer sandboxes. \n- To use an existing developer sandbox, run ${chalk_1.default.bold('hs accounts use')}.`,
+                        invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk.bold(accountName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
+                        limit: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} developer sandboxes. \n- To connect a developer sandbox to your HubSpot CLI, run ${chalk.bold('hs auth')} and follow the prompts.`,
+                        alreadyInConfig: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} developer sandboxes. \n- To use an existing developer sandbox, run ${chalk.bold('hs accounts use')}.`,
                         scopes: {
                             message: "The personal access key you provided doesn't include developer sandbox permissions.",
-                            instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes developer sandbox permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                            instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes developer sandbox permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                         },
                     },
                 },
                 standard: {
                     loading: {
-                        add: (accountName) => `Creating standard sandbox ${chalk_1.default.bold(accountName)}`,
-                        fail: (accountName) => `Failed to create a standard sandbox ${chalk_1.default.bold(accountName)}.`,
-                        succeed: (accountName, accountId) => `Successfully created a standard sandbox ${chalk_1.default.bold(accountName)} with portalId ${chalk_1.default.bold(accountId)}.`,
+                        add: (accountName) => `Creating standard sandbox ${chalk.bold(accountName)}`,
+                        fail: (accountName) => `Failed to create a standard sandbox ${chalk.bold(accountName)}.`,
+                        succeed: (accountName, accountId) => `Successfully created a standard sandbox ${chalk.bold(accountName)} with portalId ${chalk.bold(accountId)}.`,
                     },
                     success: {
                         configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
                     },
                     failure: {
-                        invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk_1.default.bold(accountName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
-                        limit: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} standard sandboxes. \n- To connect a standard sandbox to your HubSpot CLI, run ${chalk_1.default.bold('hs auth')} and follow the prompts.`,
-                        alreadyInConfig: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} standard sandboxes. \n- To use an existing standard sandbox, run ${chalk_1.default.bold('hs accounts use')}.`,
+                        invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk.bold(accountName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
+                        limit: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} standard sandboxes. \n- To connect a standard sandbox to your HubSpot CLI, run ${chalk.bold('hs auth')} and follow the prompts.`,
+                        alreadyInConfig: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} standard sandboxes. \n- To use an existing standard sandbox, run ${chalk.bold('hs accounts use')}.`,
                         scopes: {
                             message: "The personal access key you provided doesn't include standard sandbox permissions.",
-                            instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes standard sandbox permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                            instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes standard sandbox permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                         },
                     },
                 },
@@ -1239,8 +1511,8 @@ exports.commands = {
                 examples: {
                     default: 'Deletes the sandbox account named MySandboxAccount.',
                 },
-                confirm: (account) => `Delete sandbox ${chalk_1.default.bold(account)}? All data for this sandbox will be permanently deleted.`,
-                defaultAccountWarning: (account) => `The sandbox ${chalk_1.default.bold(account)} is currently set as the default account.`,
+                confirm: (account) => `Delete sandbox ${chalk.bold(account)}? All data for this sandbox will be permanently deleted.`,
+                defaultAccountWarning: (account) => `The sandbox ${chalk.bold(account)} is currently set as the default account.`,
                 success: {
                     delete: (account, sandboxHubId) => `Sandbox "${account}" with portalId "${sandboxHubId}" was deleted successfully.`,
                     deleteDefault: (account, sandboxHubId) => `Sandbox "${account}" with portalId "${sandboxHubId}" was deleted successfully and removed as the default account.`,
@@ -1252,9 +1524,9 @@ exports.commands = {
                     noSandboxAccounts: (authCommand) => `There are no sandboxes connected to the CLI. To add a sandbox, run ${authCommand}.`,
                     noSandboxAccountId: "This sandbox can't be deleted from the CLI because we could not find the associated sandbox account.",
                     noParentAccount: (authCommand) => `This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run ${authCommand} and add the parent account.`,
-                    objectNotFound: (account) => `Sandbox ${chalk_1.default.bold(account)} may have been deleted through the UI. The account has been removed from the config.`,
-                    noParentPortalAvailable: (command, url) => `This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run ${command}. You can also delete the sandbox from the HubSpot management tool: ${chalk_1.default.bold(url)}.`,
-                    invalidKey: (account, authCommand) => `Your personal access key for account ${chalk_1.default.bold(account)} is inactive. To re-authenticate, please run ${authCommand}.`,
+                    objectNotFound: (account) => `Sandbox ${chalk.bold(account)} may have been deleted through the UI. The account has been removed from the config.`,
+                    noParentPortalAvailable: (command, url) => `This sandbox can't be deleted from the CLI because you haven't given the CLI access to its parent account. To do this, run ${command}. You can also delete the sandbox from the HubSpot management tool: ${chalk.bold(url)}.`,
+                    invalidKey: (account, authCommand) => `Your personal access key for account ${chalk.bold(account)} is inactive. To re-authenticate, please run ${authCommand}.`,
                 },
                 options: {
                     force: {
@@ -1268,18 +1540,18 @@ exports.commands = {
         },
         sync: {
             loading: {
-                add: (accountName) => `Syncing sandbox ${chalk_1.default.bold(accountName)}`,
-                fail: (accountName) => `Failed to sync sandbox ${chalk_1.default.bold(accountName)}.`,
-                succeed: (accountName) => `Successfully synced sandbox ${chalk_1.default.bold(accountName)}.`,
+                add: (accountName) => `Syncing sandbox ${chalk.bold(accountName)}`,
+                fail: (accountName) => `Failed to sync sandbox ${chalk.bold(accountName)}.`,
+                succeed: (accountName) => `Successfully synced sandbox ${chalk.bold(accountName)}.`,
             },
             success: {
                 configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (accountName, parentAccountName) => `Couldn't sync ${chalk_1.default.bold(accountName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to sync the sandbox. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (accountName, parentAccountName) => `Couldn't sync ${chalk.bold(accountName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to sync the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include sandbox sync permissions.",
-                    instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes sandbox sync permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes sandbox sync permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1296,7 +1568,7 @@ exports.commands = {
                             name: 'Name of the secret',
                         },
                         errors: {
-                            noApps: `Please create a new app to add an app secret. Use ${(0, ui_1.uiCommandReference)('hs project create')} to create a new project and begin the app creation process.`,
+                            noApps: `Please create a new app to add an app secret. Use ${uiCommandReference('hs project create')} to create a new project and begin the app creation process.`,
                         },
                         options: {
                             app: 'The app id to set the secret for',
@@ -1426,9 +1698,7 @@ exports.commands = {
                 },
                 success: (themePath, selectorsPath) => `Selectors generated for ${themePath}, please double check the selectors generated at ${selectorsPath} before uploading the theme.`,
                 positionals: {
-                    path: {
-                        describe: "The path of the theme you'd like to generate an editor-preview.json for.",
-                    },
+                    path: "The path of the theme you'd like to generate an editor-preview.json for.",
                 },
             },
             marketplaceValidate: {
@@ -1459,25 +1729,16 @@ exports.commands = {
                 errors: {
                     invalidPath: (path) => `The path "${path}" is not a path to a directory`,
                     noThemeComponents: 'Your project has no theme components available to preview.',
+                    uploadFailed: (src, dest) => `Uploading file "${src}" to "${dest}" failed`,
                 },
                 positionals: {
-                    src: {
-                        describe: 'Path to the local directory your theme is in, relative to your current working directory',
-                    },
-                    dest: {
-                        describe: 'Path in HubSpot Design Tools. Can be a net new path. If you wish to preview a site page using your theme changes it must match the path of the theme used by the site.',
-                    },
+                    src: 'Path to the local directory your theme is in, relative to your current working directory',
+                    dest: 'Path in HubSpot Design Tools. Can be a net new path. If you wish to preview a site page using your theme changes it must match the path of the theme used by the site.',
                 },
                 options: {
-                    notify: {
-                        describe: 'Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file',
-                    },
-                    noSsl: {
-                        describe: 'Disable HTTPS',
-                    },
-                    port: {
-                        describe: 'The port on which to start the local server',
-                    },
+                    notify: 'Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file',
+                    noSsl: 'Disable HTTPS',
+                    port: 'The port on which to start the local server',
                 },
                 initialUploadProgressBar: {
                     start: 'Starting...',
@@ -1501,11 +1762,6 @@ exports.commands = {
                 logs: {
                     validatingModule: (path) => `Validating module "${path}" \n`,
                 },
-                options: {
-                    json: {
-                        describe: 'Output raw json data',
-                    },
-                },
                 results: {
                     required: 'Required validation results:',
                     recommended: 'Recommended validation results:',
@@ -1516,9 +1772,7 @@ exports.commands = {
                     noErrors: 'No errors',
                 },
                 positionals: {
-                    src: {
-                        describe: 'Path to the module within the Design Manager.',
-                    },
+                    src: 'Path to the module within the Design Manager.',
                 },
             },
         },
@@ -1531,86 +1785,54 @@ exports.commands = {
             invalidPath: (path) => `The path "${path}" is not a path to a file or folder`,
             uploadFailed: (src, dest) => `Uploading file "${src}" to "${dest}" failed`,
             someFilesFailed: (dest) => `One or more files failed to upload to "${dest}" in the Design Manager`,
-            deleteFailed: (path, accountId) => `Deleting "${path}" from account ${accountId} failed`,
+            deleteFailed: (path, accountId) => `Deleting "${path}" from account ${uiAccountDescription(accountId)} failed`,
         },
         options: {
-            options: {
-                describe: 'Options to pass to javascript fields files',
-            },
-            saveOutput: {
-                describe: "If true, saves all output from javascript fields files as 'fields.output.json'.",
-            },
-            convertFields: {
-                describe: 'If true, converts any javascript fields files contained in module folder or project root.',
-            },
-            clean: {
-                describe: 'Will delete the destination directory and its contents before uploading. This will also clear the global content associated with any global partial templates and modules.',
-            },
-            force: {
-                describe: 'Skips confirmation prompts when doing a clean upload.',
-            },
+            options: 'Options to pass to javascript fields files',
+            saveOutput: "If true, saves all output from javascript fields files as 'fields.output.json'.",
+            convertFields: 'If true, converts any javascript fields files contained in module folder or project root.',
+            clean: 'Will delete the destination directory and its contents before uploading. This will also clear the global content associated with any global partial templates and modules.',
+            force: 'Skips confirmation prompts when doing a clean upload.',
         },
         previewUrl: (previewUrl) => `To preview this theme, visit: ${previewUrl}`,
         positionals: {
-            src: {
-                describe: 'Path to the local file, relative to your current working directory.',
-            },
-            dest: {
-                describe: 'Path in HubSpot Design Tools, can be a net new path.',
-            },
+            src: 'Path to the local file, relative to your current working directory.',
+            dest: 'Path in HubSpot Design Tools, can be a net new path.',
         },
         success: {
-            fileUploaded: (src, dest, accountId) => `Uploaded file from "${src}" to "${dest}" in the Design Manager of account ${accountId}`,
+            fileUploaded: (src, dest, accountId) => `Uploaded file from "${src}" to "${dest}" in the Design Manager of account ${uiAccountDescription(accountId)}`,
             uploadComplete: (dest) => `Uploading files to "${dest}" in the Design Manager is complete`,
         },
-        uploading: (src, dest, accountId) => `Uploading files from "${src}" to "${dest}" in the Design Manager of account ${accountId}`,
+        uploading: (src, dest, accountId) => `Uploading files from "${src}" to "${dest}" in the Design Manager of account ${uiAccountDescription(accountId)}`,
         notUploaded: (src) => `There was an error processing "${src}". The file has not been uploaded.`,
-        cleaning: (filePath, accountId) => `Removing "${filePath}" from account ${accountId} and uploading local...`,
-        confirmCleanUpload: (filePath, accountId) => `You are about to delete the directory "${filePath}" and its contents on HubSpot account ${accountId} before uploading. This will also clear the global content associated with any global partial templates and modules. Are you sure you want to do this?`,
+        cleaning: (filePath, accountId) => `Removing "${filePath}" from account ${uiAccountDescription(accountId)} and uploading local...`,
+        confirmCleanUpload: (filePath, accountId) => `You are about to delete the directory "${filePath}" and its contents on HubSpot account ${uiAccountDescription(accountId)} before uploading. This will also clear the global content associated with any global partial templates and modules. Are you sure you want to do this?`,
     },
     watch: {
         describe: 'Watch a directory on your computer for changes and upload the changed files to the HubSpot CMS.',
         errors: {
-            folderFailed: (src, dest, accountId) => `Initial uploading of folder "${src}" to "${dest}" in account ${accountId} had failures`,
-            fileFailed: (file, dest, accountId) => `Upload of file "${file}" to "${dest}" in account ${accountId} failed`,
+            folderFailed: (src, dest, accountId) => `Initial uploading of folder "${src}" to "${dest}" in account ${uiAccountDescription(accountId)} had failures`,
+            fileFailed: (file, dest, accountId) => `Upload of file "${file}" to "${dest}" in account ${uiAccountDescription(accountId)} failed`,
             destinationRequired: 'A destination directory needs to be passed',
             invalidPath: (path) => `The "${path}" is not a path to a directory`,
         },
         options: {
-            disableInitial: {
-                describe: 'Disable the initial upload when watching a directory (default)',
-            },
-            initialUpload: {
-                describe: 'Upload directory before watching for updates',
-            },
-            notify: {
-                describe: 'Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file',
-            },
-            remove: {
-                describe: 'Will cause watch to delete files in your HubSpot account that are not found locally.',
-            },
-            convertFields: {
-                describe: 'If true, converts any javascript fields files contained in module folder or project root.',
-            },
-            saveOutput: {
-                describe: "If true, saves all output from javascript fields files as 'fields.output.json'.",
-            },
-            options: {
-                describe: 'Options to pass to javascript fields files',
-            },
+            disableInitial: 'Disable the initial upload when watching a directory (default)',
+            initialUpload: 'Upload directory before watching for updates',
+            notify: 'Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file',
+            remove: 'Will cause watch to delete files in your HubSpot account that are not found locally.',
+            convertFields: 'If true, converts any javascript fields files contained in module folder or project root.',
+            saveOutput: "If true, saves all output from javascript fields files as 'fields.output.json'.",
+            options: 'Options to pass to javascript fields files',
         },
         positionals: {
-            src: {
-                describe: 'Path to the local directory your files are in, relative to your current working directory',
-            },
-            dest: {
-                describe: 'Path in HubSpot Design Tools. Can be a net new path',
-            },
+            src: 'Path to the local directory your files are in, relative to your current working directory',
+            dest: 'Path in HubSpot Design Tools. Can be a net new path',
         },
         warnings: {
-            disableInitial: () => `Passing the "${chalk_1.default.bold('--disable-initial')}" option is no longer necessary. Running "${chalk_1.default.bold('hs watch')}" no longer uploads the watched directory by default.`,
-            initialUpload: () => `To upload the directory run "${chalk_1.default.bold('hs upload')}" beforehand or add the "${chalk_1.default.bold('--initial-upload')}" option when running "${chalk_1.default.bold('hs watch')}".`,
-            notUploaded: (path) => `The "${chalk_1.default.bold('hs watch')}" command no longer uploads the watched directory when started. The directory "${path}" was not uploaded.`,
+            disableInitial: `Passing the "${chalk.bold('--disable-initial')}" option is no longer necessary. Running "${uiCommandReference('hs watch')}" no longer uploads the watched directory by default.`,
+            initialUpload: `To upload the directory run "${uiCommandReference('hs upload')}" beforehand or add the "${chalk.bold('--initial-upload')}" option when running "${uiCommandReference('hs watch')}".`,
+            notUploaded: (path) => `The "${uiCommandReference('hs watch')}" command no longer uploads the watched directory when started. The directory "${path}" was not uploaded.`,
         },
     },
     convertFields: {
@@ -1630,38 +1852,132 @@ exports.commands = {
             missingSrc: 'Please specify the path to your javascript fields file or directory with the --src flag.',
         },
     },
+    testAccount: {
+        describe: 'Commands for working with test accounts.',
+        subcommands: {
+            importData: {
+                describe: 'Import data into the CRM',
+                options: {
+                    skipConfirm: {
+                        describe: 'Skip the confirmation prompt',
+                    },
+                    filePath: {
+                        describe: 'The path to the JSON file containing the import schema',
+                    },
+                },
+            },
+        },
+        create: {
+            describe: 'Create a test account from a config file',
+            configPathPrompt: '[--config-path] Enter the path to the test account config: ',
+            createTestAccountFromConfigPrompt: 'How would you like to create your test account?',
+            createFromConfigOption: 'Create test account from config file',
+            createFromScratchOption: 'Create test account from scratch',
+            errors: {
+                configFileNotFound: (configPath) => `No test account config file exists at ${configPath}. Create a test account config file with the ${uiCommandReference('hs test-account create-config')} command.`,
+                configFileParseFailed: (configPath) => `Failed to parse test account config file at ${configPath}`,
+                saveAccountToConfigFailure: (accountName) => `Failed to save test account config file to config at ${accountName}`,
+            },
+            polling: {
+                start: (testAccountName) => `Creating test account "${chalk.bold(testAccountName)}"...`,
+                syncing: 'Test account created! Syncing account data... (may take a few minutes - you can exit and the sync will continue)',
+                success: (testAccountName, testAccountId) => `Test account "${chalk.bold(testAccountName)}" successfully created with id: ${chalk.bold(testAccountId)}`,
+                createFailure: 'Failed to create test account.',
+            },
+            options: {
+                configPath: 'The path to the test account config',
+            },
+            example: (configPath) => `Create a test account from the config file at ${configPath}`,
+        },
+        createConfig: {
+            describe: 'Create a test account config file.',
+            pathPrompt: '[--path] Enter the name of the Test Account config file: ',
+            errors: {
+                pathError: 'Path is required',
+                pathFormatError: 'Path must end with .json',
+                failedToCreate: 'Failed to create test account config',
+                pathExistsError: 'A file already exists at this path. Please try again with a different path.',
+            },
+            success: {
+                configFileCreated: (path) => `Test account config successfully created at ${path}`,
+            },
+            options: {
+                name: 'The name of the test account',
+                description: 'The description of the test account',
+                path: 'The path to the test account config',
+            },
+            example: (name) => `Create a test account config file with the name "${name}"`,
+        },
+        delete: {
+            describe: 'Delete a test account from your HubSpot account and CLI config',
+            pathPrompt: '[--path] What is the path to the test account config?',
+            info: {
+                deletionCanceled: 'Deletion canceled by user',
+                accountNotFoundWithId: (id) => `No account was found with ID ${id}`,
+                replaceDefaultAccount: (testAccountId, parentAccountName) => `The removed test account ${chalk.bold(testAccountId)} was the default account. Replaced default account to parent account: ${chalk.bold(parentAccountName)}`,
+            },
+            prompts: {
+                selectTestAccounts: 'Select test account(s) to delete',
+                confirmDeletion: 'All data for the account will be permanently deleted. Any connected apps will have their access tokens revoked. Do you wish to proceed?',
+            },
+            errors: {
+                failedToDelete: (testAccountToDelete) => `Failed to delete test account with ID ${testAccountToDelete}`,
+                failedToSelectAccount: 'Failed to select a test account to delete',
+                noAccountsToDelete: (accountId) => `There are no test accounts associated with ${uiAccountDescription(accountId)} to delete. Try running ${uiCommandReference('hs account use')} to change your default account`,
+                failedToDeleteFromConfig: (testAccountToDelete) => `Failed to delete test account with ID ${testAccountToDelete} from the CLI config`,
+                failedToFetchTestAccounts: 'Failed to fetch developer test accounts',
+                testAccountNotFound: (nameOrId) => `Test account${nameOrId ? ` ${chalk.bold(nameOrId)}` : ''} not found in config. \nTry running ${uiCommandReference('hs account auth')} to add the account to config or visit ${uiLink('developer test accounts', 'https://app.hubspot.com/l/developer-test-accounts/')} to delete the test account.`,
+                parentAccountNotFound: (testAccountId) => `Parent account of test account ${chalk.bold(testAccountId)} not found in config. \nTry running ${uiCommandReference('hs account auth')} to add the parent account to config or visit ${uiLink('developer test accounts', 'https://app.hubspot.com/l/developer-test-accounts/')} to delete the test account.`,
+            },
+            success: {
+                testAccountDeletedFromHubSpot: (testAccountToDelete) => `Successfully deleted test account with ID ${testAccountToDelete}`,
+                testAccountDeletedFromConfig: (accountId) => `Successfully deleted test account with ID ${accountId} from the CLI config`,
+            },
+            options: {
+                name: 'The name of the test account (in your CLI config) to delete',
+                id: 'The id of the test account',
+            },
+            examples: {
+                withPositionalID: (testAccountToDelete) => `Delete a test account with id "${testAccountToDelete}" using positional argument`,
+                withPositionalName: (testAccountToDelete) => `Delete a test account with name "${testAccountToDelete}" using positional argument`,
+                withID: (testAccountToDelete) => `Delete a test account with the id "${testAccountToDelete}"`,
+                withName: (testAccountToDelete) => `Delete a test account with the name "${testAccountToDelete}"`,
+                withoutId: 'Delete a test account via a prompt',
+            },
+        },
+    },
     secrets: {
         add: {
             loading: {
-                add: (secretName) => `Adding secret ${chalk_1.default.bold(secretName)}`,
-                fail: (secretName) => `Failed to add secret ${chalk_1.default.bold(secretName)}.`,
-                succeed: (secretName) => `Successfully added secret ${chalk_1.default.bold(secretName)}.`,
+                add: (secretName) => `Adding secret ${chalk.bold(secretName)}`,
+                fail: (secretName) => `Failed to add secret ${chalk.bold(secretName)}.`,
+                succeed: (secretName) => `Successfully added secret ${chalk.bold(secretName)}.`,
             },
             success: {
                 configFileUpdated: (secretName, authType) => `Secret "${secretName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (secretName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(secretName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add secrets. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (secretName, parentAccountName) => `Couldn't add ${chalk.bold(secretName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add secrets. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include secrets permissions.",
-                    instructions: (secretName, url) => `To update CLI permissions for "${secretName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes secrets permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (secretName, url) => `To update CLI permissions for "${secretName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes secrets permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (secretName) => `Deleting secret ${chalk_1.default.bold(secretName)}`,
-                fail: (secretName) => `Failed to delete secret ${chalk_1.default.bold(secretName)}.`,
-                succeed: (secretName) => `Successfully deleted secret ${chalk_1.default.bold(secretName)}.`,
+                add: (secretName) => `Deleting secret ${chalk.bold(secretName)}`,
+                fail: (secretName) => `Failed to delete secret ${chalk.bold(secretName)}.`,
+                succeed: (secretName) => `Successfully deleted secret ${chalk.bold(secretName)}.`,
             },
             success: {
                 configFileUpdated: (secretName, authType) => `Secret "${secretName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (secretName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(secretName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete secrets. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (secretName, parentAccountName) => `Couldn't delete ${chalk.bold(secretName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete secrets. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include secrets permissions.",
-                    instructions: (secretName, url) => `To update CLI permissions for "${secretName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes secrets permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (secretName, url) => `To update CLI permissions for "${secretName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes secrets permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1675,10 +1991,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Secrets updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list secrets because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list secrets. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list secrets because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list secrets. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include secrets permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes secrets permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes secrets permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1686,35 +2002,35 @@ exports.commands = {
     serverless: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless functions. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless functions. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless functions. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless functions. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1728,10 +2044,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless functions updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless functions because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless functions. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless functions because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless functions. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1739,35 +2055,35 @@ exports.commands = {
     serverlessFunctionLogs: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function logs ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function logs ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function logs ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function logs ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function logs ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function logs ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function logs "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function logs. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function logs. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function log permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function log permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function log permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function logs ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function logs ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function logs ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function logs ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function logs ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function logs ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function logs "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function logs. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function logs. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function log permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function log permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function log permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1781,10 +2097,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless function logs updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless function logs because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function logs. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless function logs because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function logs. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function log permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function log permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function log permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1792,35 +2108,35 @@ exports.commands = {
     serverlessFunctionMetrics: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function metrics ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function metrics ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function metrics ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function metrics ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function metrics ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function metrics ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function metrics "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function metrics. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function metrics. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function metric permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function metric permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function metric permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function metrics ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function metrics ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function metrics ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function metrics ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function metrics ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function metrics ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function metrics "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function metrics. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function metrics. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function metric permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function metric permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function metric permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1834,10 +2150,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless function metrics updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless function metrics because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function metrics. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless function metrics because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function metrics. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function metric permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function metric permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function metric permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1845,35 +2161,35 @@ exports.commands = {
     serverlessFunctionSettings: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function settings ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function settings ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function settings ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function settings ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function settings ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function settings ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function settings "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function settings. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function settings. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function setting permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function setting permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function setting permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function settings ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function settings ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function settings ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function settings ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function settings ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function settings ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function settings "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function settings. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function settings. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function setting permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function setting permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function setting permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1887,10 +2203,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless function settings updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless function settings because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function settings. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless function settings because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function settings. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function setting permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function setting permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function setting permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1898,35 +2214,35 @@ exports.commands = {
     serverlessFunctionVersions: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function versions ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function versions ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function versions ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function versions ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function versions ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function versions ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function versions "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function versions. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function versions. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function version permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function version permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function version permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function versions ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function versions ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function versions ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function versions ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function versions ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function versions ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function versions "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function versions. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function versions. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function version permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function version permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function version permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1940,10 +2256,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless function versions updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless function versions because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function versions. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless function versions because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function versions. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function version permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function version permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function version permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1951,35 +2267,35 @@ exports.commands = {
     serverlessFunctionWebhooks: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function webhooks ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function webhooks ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function webhooks ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function webhooks ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function webhooks ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function webhooks ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhooks "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhooks. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhooks. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function webhooks ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function webhooks ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function webhooks ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function webhooks ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function webhooks ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function webhooks ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhooks "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhooks. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhooks. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -1993,10 +2309,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless function webhooks updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless function webhooks because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhooks. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless function webhooks because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhooks. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2004,35 +2320,35 @@ exports.commands = {
     serverlessFunctionWebhookSubscriptions: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function webhook subscriptions ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function webhook subscriptions ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function webhook subscriptions ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function webhook subscriptions ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function webhook subscriptions ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function webhook subscriptions ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhook subscriptions "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhook subscriptions. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhook subscriptions. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function webhook subscriptions ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function webhook subscriptions ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function webhook subscriptions ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function webhook subscriptions ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function webhook subscriptions ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function webhook subscriptions ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhook subscriptions "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhook subscriptions. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhook subscriptions. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2046,10 +2362,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless function webhook subscriptions updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless function webhook subscriptions because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhook subscriptions. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless function webhook subscriptions because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhook subscriptions. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2057,35 +2373,35 @@ exports.commands = {
     serverlessFunctionWebhookSubscriptionEvents: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function webhook subscription events ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function webhook subscription events ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function webhook subscription events ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function webhook subscription events ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function webhook subscription events ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function webhook subscription events ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhook subscription events "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhook subscription events. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhook subscription events. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription event permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function webhook subscription events ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function webhook subscription events ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function webhook subscription events ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function webhook subscription events ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function webhook subscription events ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function webhook subscription events ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhook subscription events "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhook subscription events. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhook subscription events. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription event permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2099,10 +2415,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless function webhook subscription events updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless function webhook subscription events because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhook subscription events. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless function webhook subscription events because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhook subscription events. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription event permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2110,35 +2426,35 @@ exports.commands = {
     serverlessFunctionWebhookSubscriptionEventTypes: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function webhook subscription event types ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function webhook subscription event types ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function webhook subscription event types ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function webhook subscription event types ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function webhook subscription event types ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function webhook subscription event types ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhook subscription event types "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhook subscription event types. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhook subscription event types. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription event type permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function webhook subscription event types ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function webhook subscription event types ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function webhook subscription event types ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function webhook subscription event types ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function webhook subscription event types ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function webhook subscription event types ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhook subscription event types "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhook subscription event types. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhook subscription event types. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription event type permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2152,10 +2468,10 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless function webhook subscription event types updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless function webhook subscription event types because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhook subscription event types. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless function webhook subscription event types because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhook subscription event types. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription event type permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2163,35 +2479,35 @@ exports.commands = {
     serverlessFunctionWebhookSubscriptionEventTypeOptions: {
         add: {
             loading: {
-                add: (functionName) => `Adding serverless function webhook subscription event type options ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to add serverless function webhook subscription event type options ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully added serverless function webhook subscription event type options ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Adding serverless function webhook subscription event type options ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to add serverless function webhook subscription event type options ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully added serverless function webhook subscription event type options ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhook subscription event type options "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhook subscription event type options. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't add ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to add serverless function webhook subscription event type options. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription event type option permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type option permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type option permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
         delete: {
             loading: {
-                add: (functionName) => `Deleting serverless function webhook subscription event type options ${chalk_1.default.bold(functionName)}`,
-                fail: (functionName) => `Failed to delete serverless function webhook subscription event type options ${chalk_1.default.bold(functionName)}.`,
-                succeed: (functionName) => `Successfully deleted serverless function webhook subscription event type options ${chalk_1.default.bold(functionName)}.`,
+                add: (functionName) => `Deleting serverless function webhook subscription event type options ${chalk.bold(functionName)}`,
+                fail: (functionName) => `Failed to delete serverless function webhook subscription event type options ${chalk.bold(functionName)}.`,
+                succeed: (functionName) => `Successfully deleted serverless function webhook subscription event type options ${chalk.bold(functionName)}.`,
             },
             success: {
                 configFileUpdated: (functionName, authType) => `Serverless function webhook subscription event type options "${functionName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk_1.default.bold(functionName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhook subscription event type options. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (functionName, parentAccountName) => `Couldn't delete ${chalk.bold(functionName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to delete serverless function webhook subscription event type options. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription event type option permissions.",
-                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type option permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (functionName, url) => `To update CLI permissions for "${functionName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type option permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2205,67 +2521,22 @@ exports.commands = {
                 configFileUpdated: (authType) => `Serverless function webhook subscription event type options updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (parentAccountName) => `Couldn't list serverless function webhook subscription event type options because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhook subscription event type options. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (parentAccountName) => `Couldn't list serverless function webhook subscription event type options because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to list serverless function webhook subscription event type options. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include serverless function webhook subscription event type option permissions.",
-                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type option permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (url) => `To update CLI permissions: \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes serverless function webhook subscription event type option permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
     },
-    setupMcp: {
-        describe: 'Configure the HubSpot CLI MCP (Model Context Protocol) server for use with Cursor.',
-        errors: {
-            serverNotFound: 'hsmcp command not found. Please ensure the HubSpot CLI is properly installed and available in your PATH.',
-            installHint: 'If you installed the CLI locally, make sure to install it globally with: npm install -g @hubspot/cli',
-            configurationFailed: 'Failed to configure MCP server',
-        },
-        warnings: {
-            alreadyConfigured: 'MCP server is already configured.',
-        },
-        success: {
-            configured: 'MCP server successfully configured for Cursor.',
-            restartCursor: 'Please restart Cursor to apply the changes.',
-        },
-        instructions: {
-            title: 'Manual MCP Server Configuration Instructions:',
-            step1: '1. Open or create the Cursor configuration file at:',
-            step2: '2. Add the following configuration to the file:',
-            step3: '3. Restart Cursor to apply the changes.',
-            documentation: 'For more information, visit: https://docs.cursor.com/context/model-context-protocol',
-        },
-        options: {
-            autoSetup: {
-                describe: 'Automatically configure the MCP server in Cursor configuration',
-            },
-            showInstructions: {
-                describe: 'Display manual configuration instructions instead of auto-setup',
-            },
-            global: {
-                describe: 'Configure globally for all Cursor workspaces (default: true)',
-            },
-        },
-        prompts: {
-            selectAction: 'How would you like to configure the MCP server?',
-            selectScope: 'Configure MCP server for:',
-            overwrite: 'MCP server is already configured. Overwrite existing configuration?',
-        },
-        choices: {
-            autoSetup: 'Automatically configure (recommended)',
-            showInstructions: 'Show manual configuration instructions',
-            global: 'Global (all Cursor workspaces)',
-            project: 'Current project only',
-        },
-        examples: {
-            default: 'Configure the MCP server interactively',
-            autoSetup: 'Automatically configure the MCP server',
-            autoSetupGlobal: 'Automatically configure the MCP server globally',
-            autoSetupProject: 'Automatically configure for current project only',
-            showInstructions: 'Display manual configuration instructions',
-        },
-    },
 };
-exports.lib = {
+export const lib = {
+    parsing: {
+        unableToParseStringToNumber: 'Unable to parse string to number',
+    },
+    configMiddleWare: {
+        invalidAccountIdEnvironmentVariable: 'Unable to parse `HUBSPOT_ACCOUNT_ID` environment variable into a number',
+    },
     process: {
         exitDebug: (signal) => `Attempting to gracefully exit. Triggered by ${signal}`,
     },
@@ -2275,40 +2546,41 @@ exports.lib = {
         noCompatibleComponents: (serverKey) => `Skipping call to ${serverKey} because there are no compatible components in the project.`,
     },
     LocalDevManager: {
-        staticAuthAccountsMustMatch: 'You must test static auth apps in the account the project exists in',
-        appNotFound: (accountId, appUid) => `Unable to find app with uid ${appUid} in account ${(0, ui_1.uiAccountDescription)(accountId)}`,
+        appNotFound: (accountId, appUid) => `Unable to find app with uid ${appUid} in account ${uiAccountDescription(accountId)}`,
         failedToInitialize: 'Missing required arguments to initialize Local Dev',
-        noDeployedBuild: (projectName, accountIdentifier, uploadCommand) => `Your project ${chalk_1.default.bold(projectName)} exists in ${accountIdentifier}, but has no deployed build. Projects must be successfully deployed to be developed locally. Address any build and deploy errors your project may have, then run ${uploadCommand} to upload and deploy your project.`,
+        noDeployedBuild: (projectName, accountIdentifier, uploadCommand) => `Your project ${chalk.bold(projectName)} exists in ${accountIdentifier}, but has no deployed build. Projects must be successfully deployed to be developed locally. Address any build and deploy errors your project may have, then run ${uploadCommand} to upload and deploy your project.`,
         noComponents: 'There are no components in this project.',
         betaMessage: 'HubSpot projects local development',
-        learnMoreLocalDevServer: (0, ui_1.uiLink)('Learn more about the projects local dev server', 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'),
-        running: (projectName, accountIdentifier) => chalk_1.default.hex(ui_2.UI_COLORS.SORBET)(`Running ${chalk_1.default.bold(projectName)} locally on ${accountIdentifier}, waiting for changes ...`),
-        quitHelper: `Press ${chalk_1.default.bold('q')} to stop the local dev server`,
-        viewProjectLink: (name, accountId) => (0, ui_1.uiLink)('View project in HubSpot', (0, urls_1.getProjectDetailUrl)(name, accountId) || ''),
+        learnMoreLocalDevServer: uiLink('Learn more about the projects local dev server', 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'),
+        running: (projectName, accountIdentifier) => chalk.hex(UI_COLORS.SORBET)(`Running ${chalk.bold(projectName)} locally on ${accountIdentifier}, waiting for changes ...`),
+        quitHelper: `Press ${chalk.bold('q')} to stop the local dev server`,
+        viewProjectLink: (name, accountId) => uiLink('View project in HubSpot', getProjectDetailUrl(name, accountId) || ''),
+        viewLocalDevUILink: (accountId, showWelcomeScreen) => uiLink('View local dev session in HubSpot', getLocalDevUiUrl(accountId, showWelcomeScreen)),
+        localDevUIAutoMessage: (accountId, showWelcomeScreen) => `Opening your ${uiLink('local dev session in HubSpot', getLocalDevUiUrl(accountId, showWelcomeScreen))}...`,
         viewTestAccountLink: 'View developer test account in HubSpot',
         exitingStart: 'Stopping local dev server ...',
         exitingSucceed: 'Successfully exited',
         exitingFail: 'Failed to cleanup before exiting',
-        missingUid: `Could not find a uid for the selected app. Confirm that the app config file contains the uid field and re-run ${(0, ui_1.uiCommandReference)('hs project dev')}.`,
+        missingUid: `Could not find a uid for the selected app. Confirm that the app config file contains the uid field and re-run ${uiCommandReference('hs project dev')}.`,
         uploadWarning: {
             appLabel: '[App]',
             uiExtensionLabel: '[UI Extension]',
-            missingComponents: (missingComponents) => `Couldn't find the following components in the deployed build for this project: ${chalk_1.default.bold(missingComponents)}. This may cause issues in local development.`,
-            defaultWarning: chalk_1.default.bold('Changing project configuration requires a new project build.'),
-            defaultPublicAppWarning: (installCount, installText) => `${chalk_1.default.bold('Changing project configuration requires a new project build.')}\n\nThis will affect your public app's ${chalk_1.default.bold(`${installCount} existing ${installText}`)}. If your app has users in production, we strongly recommend creating a copy of this app to test your changes before proceding.`,
+            missingComponents: (missingComponents) => `Couldn't find the following components in the deployed build for this project: ${chalk.bold(missingComponents)}. This may cause issues in local development.`,
+            defaultWarning: chalk.bold('Changing project configuration requires a new project build.'),
+            defaultPublicAppWarning: (installCount, installText) => `${chalk.bold('Changing project configuration requires a new project build.')}\n\nThis will affect your public app's ${chalk.bold(`${installCount} existing ${installText}`)}. If your app has users in production, we strongly recommend creating a copy of this app to test your changes before proceeding.`,
             header: (warning) => `${warning} To reflect these changes and continue testing:`,
             instructionsHeader: 'To reflect these changes and continue testing:',
-            stopDev: `  * Stop ${(0, ui_1.uiCommandReference)('hs project dev')}`,
+            stopDev: `  * Stop ${uiCommandReference('hs project dev')}`,
             runUpload: (command) => `  * Run ${command}`,
-            restartDev: `  * Re-run ${(0, ui_1.uiCommandReference)('hs project dev')}`,
+            restartDev: `  * Re-run ${uiCommandReference('hs project dev')}`,
             pushToGithub: '  * Commit and push your changes to GitHub',
-            defaultMarketplaceAppWarning: (installCount, accountText) => `${chalk_1.default.bold('Changing project configuration requires creating a new project build.')}\n\nYour marketplace app is currently installed in ${chalk_1.default.bold(`${installCount} ${accountText}`)}. Any uploaded changes will impact your app's users. We strongly recommend creating a copy of this app to test your changes before proceding.`,
+            defaultMarketplaceAppWarning: (installCount, accountText) => `${chalk.bold('Changing project configuration requires creating a new project build.')}\n\nYour marketplace app is currently installed in ${chalk.bold(`${installCount} ${accountText}`)}. Any uploaded changes will impact your app's users. We strongly recommend creating a copy of this app to test your changes before proceeding.`,
         },
         activeInstallWarning: {
-            installCount: (appName, installCount) => `${chalk_1.default.bold(`The app ${appName} is installed in ${installCount} production ${installCount === 1 ? 'account' : 'accounts'}`)}`,
+            installCount: (appName, installCount) => `${chalk.bold(`The app ${appName} is installed in ${installCount} production ${installCount === 1 ? 'account' : 'accounts'}`)}`,
             explanation: 'Some changes made during local development may need to be synced to HubSpot, which will impact those existing installs. We strongly recommend creating a copy of this app to use instead.',
             confirmation: `You will always be asked to confirm any permanent changes to your app's configuration before uploading them.`,
-            confirmationPrompt: `Proceed with local development of this ${chalk_1.default.bold('production')} app?`,
+            confirmationPrompt: `Proceed with local development of this ${chalk.bold('production')} app?`,
         },
         devServer: {
             cleanupError: (message) => `Failed to cleanup local dev server: ${message}`,
@@ -2318,7 +2590,19 @@ exports.lib = {
         },
     },
     AppDevModeInterface: {
-        defaultMarketplaceAppWarning: (installCount) => `\n\nYour marketplace app is currently installed in ${chalk_1.default.bold(`${installCount} ${installCount === 1 ? 'account' : 'accounts'}`)}. Any uploaded changes will impact your app's users. We strongly recommend creating a copy of this app to test your changes before proceding.`,
+        defaultMarketplaceAppWarning: (installCount) => `Your marketplace app is currently installed in ${chalk.bold(`${installCount} ${installCount === 1 ? 'account' : 'accounts'}`)}. Any uploaded changes will impact your app's users. We strongly recommend creating a copy of this app to test your changes before proceeding.`,
+        autoInstallDeclined: 'You must install your app on your target test account to proceed with local development.',
+        autoInstallSuccess: (appName, targetTestAccountId) => `Successfully installed app ${appName} on account ${uiAccountDescription(targetTestAccountId)}\n`,
+        autoInstallError: (appName, targetTestAccountId) => `Error installing app ${appName} on account ${uiAccountDescription(targetTestAccountId)}. You may still be able to install your app in your browser.`,
+        fetchAppData: {
+            checking: (appName) => `Checking installations for your app ${chalk.bold(appName)}...`,
+            success: (appName, accountId) => `Your app ${chalk.bold(appName)} is installed on account ${uiAccountDescription(accountId, false)}`,
+            notInstalled: (appName, accountId) => `Your app ${chalk.bold(appName)} is not currently installed on account ${uiAccountDescription(accountId, false)}`,
+            activeInstallations: (appName, installCount) => `[WARNING] Your app ${chalk.bold(appName)} is installed in ${chalk.bold(`${installCount} ${installCount === 1 ? 'account' : 'accounts'}`)}`,
+            error: 'An error occurred while checking installations for your app',
+        },
+        distributionChanged: `Your app's distribution type has been changed from ${APP_DISTRIBUTION_TYPES.PRIVATE} to ${APP_DISTRIBUTION_TYPES.MARKETPLACE}. Once uploaded, this change cannot be reversed. Before uploading your project, confirm that you want to ${chalk.bold('permanantly')} change your app's distribution type. This will uninstall your app from all accounts.`,
+        authTypeChanged: `Your app's auth type has been changed from ${APP_AUTH_TYPES.STATIC} to ${APP_AUTH_TYPES.OAUTH}. Once uploaded, this change cannot be reversed. Before uploading your project, confirm that you want to ${chalk.bold('permanantly')} change your app's auth type. This will uninstall your app from all accounts.`,
     },
     LocalDevWebsocketServer: {
         errors: {
@@ -2327,103 +2611,139 @@ exports.lib = {
             unknownMessageType: (type) => `Unsupported message received. Unknown message type: ${type}`,
             invalidJSON: (data) => `Unsupported message received. Invalid JSON: ${data}`,
             portManagerNotRunning: (prefix) => `${prefix}Error: PortManagerServing must be running before starting LocalDevWebsocketServer.`,
+            originNotAllowed: (origin) => `Connections from ${origin ? `origin ${origin}` : 'this origin'} are not allowed.`,
         },
         logs: {
             startup: (port) => `LocalDevWebsocketServer running on port ${port}`,
         },
     },
     LocalDevProcess: {
-        projectConfigMismatch: `Unable to upload project. The project config has been modified since starting ${(0, ui_1.uiCommandReference)('hs project dev')}.`,
+        projectConfigMismatch: `Unable to upload project. The project config has been modified since starting ${uiCommandReference('hs project dev')}.`,
         uploadInitiated: 'Project upload initiated from Local Dev UI.',
+        deployInitiated: 'Project deploy initiated from Local Dev UI.',
         uploadFailed: 'Project upload failed. To proceed with local development, fix any necessary errors, then re-upload your project.',
+        deployFailed: 'Project deploy failed. To proceed with local development, fix any necessary errors, then re-deploy your project.',
         uploadSuccess: 'Project upload completed successfully. Resuming local dev...',
+        uploadSuccessAutoDeployDisabled: 'Project upload completed successfully, but auto-deploy is disabled for this project. Deploy your latest build to proceed with local development.',
+        deploySuccess: 'Project deploy completed successfully. Resuming local dev...',
+        noBuildToDeploy: 'Error deploying project. No build was found to deploy.',
     },
     localDevHelpers: {
-        confirmDefaultAccountIsTarget: {
-            configError: `An error occurred while reading the default account from your config. Run ${(0, ui_1.uiCommandReference)('hs auth')} to re-auth this account`,
-            declineDefaultAccountExplanation: `To develop on a different account, run ${(0, ui_1.uiCommandReference)('hs accounts use')} to change your default account, then re-run ${(0, ui_1.uiCommandReference)('hs project dev')}.`,
-        },
-        checkIfDefaultAccountIsSupported: {
-            publicApp: `This project contains a public app. Local development of public apps is only supported on developer accounts and developer test accounts. Change your default account using ${(0, ui_1.uiCommandReference)('hs accounts use')}, or link a new account with ${(0, ui_1.uiCommandReference)('hs auth')}.`,
-            privateApp: `This project contains a private app. Local development of private apps is not supported in developer accounts. Change your default account using ${(0, ui_1.uiCommandReference)('hs accounts use')}, or link a new account with ${(0, ui_1.uiCommandReference)('hs auth')}.`,
-        },
-        validateAccountOption: {
-            invalidPublicAppAccount: `This project contains a public app. The "--account" flag must point to a developer test account to develop this project locally. Alternatively, change your default account to an App Developer Account using ${(0, ui_1.uiCommandReference)('hs accounts use')} and run ${(0, ui_1.uiCommandReference)('hs project dev')} to set up a new Developer Test Account.`,
-            invalidPrivateAppAccount: `This project contains a private app. The account specified with the "--account" flag points to a developer account, which do not support the local development of private apps. Update the "--account" flag to point to a standard, sandbox, or developer test account, or change your default account by running ${(0, ui_1.uiCommandReference)('hs accounts use')}.`,
-            nonSandboxWarning: `Testing in a sandbox is strongly recommended. To switch the target account, select an option below or run ${(0, ui_1.uiCommandReference)('hs accounts use')} before running the command again.`,
-            publicAppNonDeveloperTestAccountWarning: `Local development of public apps is only supported in ${chalk_1.default.bold('developer test accounts')}.`,
-        },
-        createNewProjectForLocalDev: {
-            projectMustExistExplanation: (projectName, accountId) => `The project ${projectName} does not exist in the target account ${(0, ui_1.uiAccountDescription)(accountId)}. This command requires the project to exist in the target account.`,
-            publicAppProjectMustExistExplanation: (projectName, accountId) => `The project ${projectName} does not exist in ${(0, ui_1.uiAccountDescription)(accountId)}, the app developer account associated with your target account. This command requires the project to exist in this app developer account.`,
-            createProject: (projectName, accountIdentifier) => `Create new project ${projectName} in ${accountIdentifier}?`,
-            choseNotToCreateProject: 'Exiting because this command requires the project to exist in the target account.',
-            creatingProject: (projectName, accountIdentifier) => `Creating project ${projectName} in ${accountIdentifier}`,
-            createdProject: (projectName, accountIdentifier) => `Created project ${projectName} in ${accountIdentifier}`,
-            failedToCreateProject: 'Failed to create project in the target account.',
-        },
-        createInitialBuildForNewProject: {
-            initialUploadMessage: 'HubSpot Local Dev Server Startup',
-            projectLockedError: 'Your project is locked. This may mean that another user is running the `hs project watch` command for this project. If this is you, unlock the project in Projects UI.',
-            genericError: `An error occurred while creating the initial build for this project. Run ${(0, ui_1.uiCommandReference)('hs project upload')} to try again.`,
-        },
-        checkIfParentAccountIsAuthed: {
-            notAuthedError: (parentAccountId, accountIdentifier) => `To develop this project locally, run ${(0, ui_1.uiCommandReference)(`hs auth --account=${parentAccountId}`)} to authenticate the App Developer Account ${parentAccountId} associated with ${accountIdentifier}.`,
-        },
-        selectAccountTypePrompt: {
-            message: '[--account] Choose the type of account to test on',
-            developerTestAccountOption: 'Test on a developer test account',
-            sandboxAccountOption: 'Test on a sandbox account',
-            sandboxAccountOptionDisabled: 'Disabled - requires access to sandbox accounts',
-            productionAccountOption: `<${chalk_1.default.red('!')} Test on this account ${chalk_1.default.red('!')}>`,
+        project: {
+            compareLocalProjectToDeployed: {
+                noDeployedBuild: (projectName, accountIdentifier) => `Your project ${chalk.bold(projectName)} exists in ${accountIdentifier}, but has no deployed build. Projects must be successfully deployed to be developed locally. Address any build and deploy errors your project may have, then run ${uiCommandReference('hs project upload')} to upload and deploy your project.`,
+                checking: 'Checking if your deployed build is up to date...',
+                upToDate: 'Deployed build is up to date.',
+                notUpToDate: `Your project contains undeployed local changes.`,
+                notUpToDateExplanation: (profile) => `Run ${uiCommandReference(`hs project upload ${profile ? `--profile ${profile}` : ''}`)} to upload these changes to HubSpot, then re-run ${uiCommandReference(`hs project dev ${profile ? `--profile ${profile}` : ''}`)} to continue local development.`,
+            },
+            createNewProjectForLocalDev: {
+                projectMustExistExplanation: (projectName, accountId) => `The project ${projectName} does not exist in the target account ${uiAccountDescription(accountId)}. This command requires the project to exist in the target account.`,
+                publicAppProjectMustExistExplanation: (projectName, accountId) => `The project ${projectName} does not exist in ${uiAccountDescription(accountId)}, the app developer account associated with your target account. This command requires the project to exist in this app developer account.`,
+                createProject: (projectName, accountIdentifier) => `Create new project ${projectName} in ${accountIdentifier}?`,
+                choseNotToCreateProject: 'Exiting because this command requires the project to exist in the target account.',
+                creatingProject: (projectName, accountIdentifier) => `Creating project ${projectName} in ${accountIdentifier}`,
+                createdProject: (projectName, accountIdentifier) => `Created project ${projectName} in ${accountIdentifier}`,
+                failedToCreateProject: 'Failed to create project in the target account.',
+            },
+            createInitialBuildForNewProject: {
+                initialUploadMessage: 'HubSpot Local Dev Server Startup',
+                projectLockedError: 'Your project is locked. This may mean that another user is running the `hs project watch` command for this project. If this is you, unlock the project in Projects UI.',
+                genericError: `An error occurred while creating the initial build for this project. Run ${uiCommandReference('hs project upload')} to try again.`,
+            },
+        },
+        account: {
+            checkIfDefaultAccountIsSupported: {
+                publicApp: `This project contains a public app. Local development of public apps is only supported on developer accounts and developer test accounts. Change your default account using ${uiCommandReference('hs accounts use')}, or link a new account with ${uiCommandReference('hs auth')}.`,
+                privateApp: `This project contains a private app. Local development of private apps is not supported in developer accounts. Change your default account using ${uiCommandReference('hs accounts use')}, or link a new account with ${uiCommandReference('hs auth')}.`,
+            },
+            validateAccountOption: {
+                invalidPublicAppAccount: `This project contains a public app. The "--account" flag must point to a developer test account to develop this project locally. Alternatively, change your default account to an App Developer Account using ${uiCommandReference('hs accounts use')} and run ${uiCommandReference('hs project dev')} to set up a new Developer Test Account.`,
+                invalidPrivateAppAccount: `This project contains a private app. The account specified with the "--account" flag points to a developer account, which do not support the local development of private apps. Update the "--account" flag to point to a standard, sandbox, or developer test account, or change your default account by running ${uiCommandReference('hs accounts use')}.`,
+                nonSandboxWarning: `Testing in a sandbox is strongly recommended. To switch the target account, select an option below or run ${uiCommandReference('hs accounts use')} before running the command again.`,
+                publicAppNonDeveloperTestAccountWarning: `Local development of public apps is only supported in ${chalk.bold('developer test accounts')}.`,
+            },
+            checkIfParentAccountIsAuthed: {
+                notAuthedError: (parentAccountId, accountIdentifier) => `To develop this project locally, run ${uiCommandReference(`hs auth --account=${parentAccountId}`)} to authenticate the App Developer Account ${parentAccountId} associated with ${accountIdentifier}.`,
+            },
+            selectAccountTypePrompt: {
+                message: '[--testing-account] Choose the type of account to test on',
+                developerTestAccountOption: 'Test on a developer test account (recommended)',
+                sandboxAccountOption: 'Test on a sandbox account',
+                sandboxAccountOptionDisabled: 'Disabled - requires access to sandbox accounts',
+                productionAccountOption: (accountId) => `<${chalk.red('!')} Test on your project account: ${uiAccountDescription(accountId, false)} ${chalk.red('!')}>`,
+            },
+            confirmDefaultAccountIsTarget: {
+                configError: `An error occurred while reading the default account from your config. Run ${uiCommandReference('hs auth')} to re-auth this account`,
+                declineDefaultAccountExplanation: `To develop on a different account, run ${uiCommandReference('hs accounts use')} to change your default account, then re-run ${uiCommandReference('hs project dev')}.`,
+            },
         },
     },
     middleware: {
         updateNotification: {
-            notifyTitle: chalk_1.default.bold('Update available'),
-            cmsUpdateNotification: (packageName) => `${chalk_1.default.bold('The CMS CLI is now the HubSpot CLI')}\n\nTo upgrade, uninstall ${chalk_1.default.bold(packageName)}\nand then run ${(0, ui_1.uiCommandReference)('{updateCommand}')}`,
-            cliUpdateNotification: `HubSpot CLI version ${chalk_1.default.cyan(chalk_1.default.bold('{currentVersion}'))} is outdated.\nRun ${(0, ui_1.uiCommandReference)('{updateCommand}')} to upgrade to version ${chalk_1.default.cyan(chalk_1.default.bold('{latestVersion}'))}`,
+            notifyTitle: chalk.bold('Update available'),
+            cmsUpdateNotification: (packageName) => `${chalk.bold('The CMS CLI is now the HubSpot CLI')}\n\nTo upgrade, uninstall ${chalk.bold(packageName)}\nand then run ${uiCommandReference('{updateCommand}')}`,
+            cliUpdateNotification: `HubSpot CLI version ${chalk.cyan(chalk.bold('{currentVersion}'))} is outdated.\nRun ${uiCommandReference('{updateCommand}')} to upgrade to version ${chalk.cyan(chalk.bold('{latestVersion}'))}`,
         },
         autoUpdateCLI: {
-            updateAvailable: (latestVersion) => `There's a new HubSpot CLI version available! Updating to version ${chalk_1.default.bold(latestVersion)}`,
-            updateSucceeded: (latestVersion) => `Successfully updated HubSpot CLI to version ${chalk_1.default.bold(latestVersion)}`,
+            updateAvailable: (latestVersion) => `There's a new HubSpot CLI version available! Updating to version ${chalk.bold(latestVersion)}`,
+            updateSucceeded: (latestVersion) => `Successfully updated HubSpot CLI to version ${chalk.bold(latestVersion)}`,
             notInstalledGlobally: 'Cannot auto-update the HubSpot CLI because NPM is not installed globally',
-            updateFailed: (latestVersion) => `Failed to update HubSpot CLI to version ${chalk_1.default.bold(latestVersion)}`,
+            updateFailed: (latestVersion) => `Failed to update HubSpot CLI to version ${chalk.bold(latestVersion)}`,
         },
     },
     projectProfiles: {
         logs: {
-            usingProfile: (profileName) => `Using profile from ${chalk_1.default.bold(profileName)}`,
-            profileTargetAccount: (accountId) => `Targeting ${(0, ui_1.uiAccountDescription)(accountId)}`,
+            usingProfile: (profileName) => `Using profile from ${chalk.bold(profileName)}`,
+            profileTargetAccount: (accountId) => `Targeting ${uiAccountDescription(accountId)}`,
             profileVariables: 'Profile variables',
         },
         exitIfUsingProfiles: {
             errors: {
-                noProfileSpecified: `This project is configured to use profiles, but no profile was specified. Target a profile using the ${(0, ui_1.uiCommandReference)('--profile')} flag.`,
+                noProfileSpecified: `This project is configured to use profiles, but no profile was specified. Target a profile using the ${uiCommandReference('--profile')} flag.`,
             },
         },
         loadProfile: {
             errors: {
                 noProjectConfig: 'No project config found. Please run this command from a project directory.',
-                profileNotFound: (profileName) => `Profile ${chalk_1.default.bold(profileName)} not found.`,
-                missingAccountId: (profileName) => `Profile ${chalk_1.default.bold(profileName)} is missing an account id.`,
-                failedToLoadProfile: (profileName) => `Failed to load profile ${chalk_1.default.bold(profileName)}.`,
+                profileNotFound: (profileName) => `Profile ${chalk.bold(profileName)} not found.`,
+                missingAccountId: (profileName) => `Profile ${chalk.bold(profileName)} is missing an account id.`,
+                failedToLoadProfile: (profileName) => `Failed to load profile ${chalk.bold(profileName)}.`,
             },
         },
     },
     projects: {
         create: {
+            prompt: {
+                marketPlaceDistribution: 'On the HubSpot marketplace',
+                privateDistribution: 'Privately',
+                distribution: '[--distribution] How would you like to distribute your application?',
+                auth: '[--auth] What type of authentication would you like your application to use',
+                staticAuth: 'Static Auth',
+                oauth: 'OAuth',
+            },
             errors: {
                 noProjectsInConfig: 'Unable to find any projects in the target repository\'s config.json file. Please ensure that there is a "projects" array in the config file.',
                 missingConfigFileTemplateSource: 'Failed to fetch the config.json file from the target repository. Please ensure that there is a valid config.json file at the root of the repository and try again.',
-                missingPropertiesInConfig: 'Found misconfigured projects in the target repository\'s config.json file. Please ensure that each project in the target repository\'s config.json file contains the following properties: ["name", "label", "path", "insertPath"].',
+                missingPropertiesInConfig: 'Found misconfigured projects in the target repository\'s config.json file. Please ensure that each project in the target repository\'s config.json file contains the following properties: ["name", "label", "path"].',
+                exceededMaxNumberOfApps: (max) => `This project currently has the maximum number of apps: ${max}`,
+                unableToParseAppConfig: (file) => `Unable to parse app file: ${file}`,
+                invalidAuthDistCombo: (authType, distribution) => `Invalid distribution and auth combination. Apps with distribution '${distribution}' must have auth '${authType}'`,
             },
         },
+        add: {
+            nothingAdded: 'No features added.',
+        },
+        updateHsMetaFilesWithAutoGeneratedFields: {
+            header: 'Created the following components and features:',
+            applicationLog: (componentType, uid, name) => `  - Created ${chalk.bold(componentType)} with uid ${chalk.bold(uid)} and name ${chalk.bold(name)}`,
+            componentLog: (componentType, uid) => `  - Created ${chalk.bold(componentType)} feature with uid ${chalk.bold(uid)}`,
+        },
         validateProjectConfig: {
-            configNotFound: `Unable to locate a project configuration file. Try running again from a project directory, or run ${(0, ui_1.uiCommandReference)('hs project create')} to create a new project.`,
+            configNotFound: `Unable to locate a project configuration file. Try running again from a project directory, or run ${uiCommandReference('hs project create')} to create a new project.`,
             configMissingFields: 'The project configuration file is missing required fields.',
-            srcDirNotFound: (srcDir, projectDir) => `Project source directory ${chalk_1.default.bold(srcDir)} could not be found in ${chalk_1.default.bold(projectDir)}.`,
-            srcOutsideProjectDir: (projectConfig, srcDir) => `Invalid value for 'srcDir' in ${projectConfig}: ${chalk_1.default.bold(`srcDir: "${srcDir}"`)}\n\t'srcDir' must be a relative path to a folder under the project root, such as "." or "./src"`,
+            srcDirNotFound: (srcDir, projectDir) => `Project source directory ${chalk.bold(srcDir)} could not be found in ${chalk.bold(projectDir)}.`,
+            srcOutsideProjectDir: (projectConfig, srcDir) => `Invalid value for 'srcDir' in ${projectConfig}: ${chalk.bold(`srcDir: "${srcDir}"`)}\n\t'srcDir' must be a relative path to a folder under the project root, such as "." or "./src"`,
         },
         getProjectConfig: {
             error: 'Could not read from project config',
@@ -2431,15 +2751,15 @@ exports.lib = {
         ensureProjectExists: {
             createPrompt: (projectName, accountIdentifier) => `The project ${projectName} does not exist in ${accountIdentifier}. Would you like to create it?`,
             createPromptUpload: (projectName, accountIdentifier) => `[--forceCreate] The project ${projectName} does not exist in ${accountIdentifier}. Would you like to create it?`,
-            createSuccess: (projectName, accountIdentifier) => `New project ${chalk_1.default.bold(projectName)} successfully created in ${chalk_1.default.bold(accountIdentifier)}.`,
-            notFound: (projectName, accountIdentifier) => `Your project ${chalk_1.default.bold(projectName)} could not be found in ${chalk_1.default.bold(accountIdentifier)}.`,
+            createSuccess: (projectName, accountIdentifier) => `New project ${chalk.bold(projectName)} successfully created in ${chalk.bold(accountIdentifier)}.`,
+            notFound: (projectName, accountIdentifier) => `Your project ${chalk.bold(projectName)} could not be found in ${chalk.bold(accountIdentifier)}.`,
         },
         pollFetchProject: {
             checkingProject: (accountIdentifier) => `Checking if project exists in ${accountIdentifier}`,
         },
         logFeedbackMessage: {
             feedbackHeader: "We'd love to hear your feedback!",
-            feedbackMessage: `How are you liking the new projects and developer tools? \n > Run ${(0, ui_1.uiCommandReference)('hs feedback')} to let us know what you think!\n`,
+            feedbackMessage: `How are you liking the new projects and developer tools? \n > Run ${uiCommandReference('hs feedback')} to let us know what you think!\n`,
         },
     },
     projectBuildAndDeploy: {
@@ -2453,38 +2773,50 @@ exports.lib = {
         },
         pollBuildAutodeployStatusError: (buildId) => `Error fetching autodeploy status for build #${buildId}`,
         pollProjectBuildAndDeploy: {
-            buildSucceededAutomaticallyDeploying: (buildId, accountIdentifier) => `Build #${buildId} succeeded. ${chalk_1.default.bold('Automatically deploying')} to ${accountIdentifier}\n`,
+            buildSucceededAutomaticallyDeploying: (buildId, accountIdentifier) => `Build #${buildId} succeeded. ${chalk.bold('Automatically deploying')} to ${accountIdentifier}\n`,
             cleanedUpTempFile: (path) => `Cleaned up temporary file ${path}`,
-            viewDeploys: 'View all deploys for this project in HubSpot',
-            unableToFindAutodeployStatus: (buildId, viewDeploysLink) => `Unable to find the auto deploy for build #${buildId}. This deploy may have been skipped. ${viewDeploysLink}.`,
+            viewDeploys: 'view all deploys for this project in HubSpot',
+            unableToFindAutodeployStatus: (buildId, viewDeploysLink) => `Unable to find the auto deploy for build #${buildId}. This deploy may have been skipped or blocked due to components being removed. Manually deploy with ${uiCommandReference('hs project deploy')} or ${viewDeploysLink}.`,
         },
     },
     projectUpload: {
+        wrongPlatformVersionMetaFiles: `Detected components that require a minimum platform version of ${PLATFORM_VERSIONS.v2025_2}.  You need to update your platform version in your ${PROJECT_CONFIG_FILE} and run ${uiCommandReference('hs project upload')}`,
         uploadProjectFiles: {
-            add: (projectName, accountIdentifier) => `Uploading ${chalk_1.default.bold(projectName)} project files to ${accountIdentifier}`,
-            fail: (projectName, accountIdentifier) => `Failed to upload ${chalk_1.default.bold(projectName)} project files to ${accountIdentifier}`,
-            succeed: (projectName, accountIdentifier) => `Uploaded ${chalk_1.default.bold(projectName)} project files to ${accountIdentifier}`,
+            add: (projectName, accountIdentifier) => `Uploading ${chalk.bold(projectName)} project files to ${accountIdentifier}`,
+            fail: (projectName, accountIdentifier) => `Failed to upload ${chalk.bold(projectName)} project files to ${accountIdentifier}`,
+            succeed: (projectName, accountIdentifier) => `Uploaded ${chalk.bold(projectName)} project files to ${accountIdentifier}`,
             buildCreated: (projectName, buildId) => `Project "${projectName}" uploaded and build #${buildId} created`,
         },
         handleProjectUpload: {
-            emptySource: (srcDir) => `Source directory "${srcDir}" is empty. Add files to your project and rerun ${(0, ui_1.uiCommandReference)('hs project upload')} to upload them to HubSpot.`,
+            emptySource: (srcDir) => `Source directory "${srcDir}" is empty. Add files to your project and rerun ${uiCommandReference('hs project upload')} to upload them to HubSpot.`,
             compressed: (byteCount) => `Project files compressed: ${byteCount} bytes`,
             compressing: (path) => `Compressing build files to "${path}"`,
             fileFiltered: (filename) => `Ignore rule triggered for "${filename}"`,
+            legacyFileDetected: (filename, platformVersion) => `The ${chalk.bold(filename)} file is not supported on platform version ${chalk.bold(platformVersion)} and will be ignored.`,
         },
     },
     boxen: {
         failedToLoad: 'Failed to load boxen util.',
     },
+    importData: {
+        errors: {
+            incorrectAccountType: (derivedAccountId) => `The account ${uiAccountDescription(derivedAccountId)} is not a standard account, developer test account, or app developer account.`,
+            failedToImportData: 'Failed to import data into portal.',
+            notDeveloperTestAccount: 'The account is not a developer test account.',
+            noAccountConfig: (accountId) => `No account config found for ${uiAccountDescription(accountId)}`,
+        },
+        inProgress: (portalId, fileNames) => `Importing data into ${uiAccountDescription(portalId)} from [${fileNames.join(', ')}]`,
+        viewImportLink: (baseUrl, accountId, importId) => `Data import currently processing. You can view the status of your import ${uiLink('here', `${baseUrl}/import/${accountId}/post/${importId}`)}`,
+    },
     ui: {
-        betaTag: chalk_1.default.bold('[BETA]'),
+        betaTag: chalk.bold('[BETA]'),
         betaWarning: {
-            header: chalk_1.default.yellow('***************************** WARNING ****************************'),
-            footer: chalk_1.default.yellow('******************************************************************'),
+            header: chalk.yellow('***************************** WARNING ****************************'),
+            footer: chalk.yellow('******************************************************************'),
         },
-        infoTag: chalk_1.default.bold('[INFO]'),
-        deprecatedTag: chalk_1.default.bold('[DEPRECATED]'),
-        errorTag: chalk_1.default.bold('[ERROR]'),
+        infoTag: chalk.bold('[INFO]'),
+        deprecatedTag: chalk.bold('[DEPRECATED]'),
+        errorTag: chalk.bold('[ERROR]'),
         deprecatedMessage: (command, url) => `The ${command} command is deprecated and will be disabled soon. ${url}`,
         deprecatedDescription: (message, command, url) => `${message}. The ${command} command is deprecated and will be disabled soon. ${url}`,
         deprecatedUrlText: 'Learn more.',
@@ -2499,27 +2831,27 @@ exports.lib = {
                 },
                 accountsListCommand: {
                     command: 'hs accounts list',
-                    message: (command) => `Run ${command} to see a list of configured HubSpot accounts`,
+                    message: (command) => `${command} - See a list of configured HubSpot accounts`,
                 },
                 accountsUseCommand: {
                     command: 'hs accounts use',
-                    message: (command) => `Run ${command} to set the Hubspot account that the CLI will target by default`,
+                    message: (command) => `${command} - Set the Hubspot account that the CLI will target by default`,
                 },
                 authCommand: {
                     command: 'hs auth',
-                    message: (command) => `Run ${command} to connect the CLI to additional HubSpot accounts`,
+                    message: (command) => `${command} - Connect the CLI to additional HubSpot accounts`,
                 },
                 feedbackCommand: {
                     command: 'hs feedback',
-                    message: (command) => `Run ${command} to report a bug or leave feedback`,
+                    message: (command) => `${command} - Report a bug or leave feedback`,
                 },
                 helpCommand: {
                     command: 'hs help',
-                    message: (command) => `Run ${command} to see a list of available commands`,
+                    message: (command) => `${command} - See a list of available commands`,
                 },
                 projectCreateCommand: {
                     command: 'hs project create',
-                    message: (command) => `Run ${command} to create a new project`,
+                    message: (command) => `${command} - Create a new project`,
                 },
                 projectDeployCommand: {
                     command: 'hs project deploy',
@@ -2527,19 +2859,19 @@ exports.lib = {
                 },
                 projectHelpCommand: {
                     command: 'hs project --help',
-                    message: (command) => `Run ${command} to learn more about available project commands`,
+                    message: (command) => `${command} - Learn more about available project commands`,
                 },
                 projectUploadCommand: {
                     command: 'hs project upload',
-                    message: (command) => `Run ${command} to upload your project to HubSpot and trigger builds`,
+                    message: (command) => `${command} - Upload your project to HubSpot and trigger builds`,
                 },
                 projectDevCommand: {
                     command: 'hs project dev',
-                    message: (command) => `Run ${command} to set up your test environment and start local development`,
+                    message: (command) => `${command} - Set up a test environment and start local development`,
                 },
                 projectInstallDepsCommand: {
                     command: 'hs project install-deps',
-                    message: (command) => `Run ${command} to install dependencies for your project components`,
+                    message: (command) => `${command} - Install all project dependencies`,
                 },
                 sampleProjects: {
                     linkText: "HubSpot's sample projects",
@@ -2563,6 +2895,12 @@ exports.lib = {
             noLogsFound: 'No logs found.',
         },
     },
+    buildAccount: {
+        createDeveloperTestAccountV3: {
+            syncFailure: 'Failed to sync developer test account',
+            pakFailure: 'Failed to generate personal access key for developer test account',
+        },
+    },
     configOptions: {
         enableOrDisableBooleanFieldPrompt: {
             message: (fieldName) => `Choose to enable or disable ${fieldName}`,
@@ -2573,72 +2911,118 @@ exports.lib = {
         },
         setAllowUsageTracking: {
             fieldName: 'usage tracking',
-            success: (isEnabled) => `Allow usage tracking set to: "${isEnabled}"`,
+            success: (isEnabled) => `Successfully updated ${chalk.bold('allow usage tracking')} to ${chalk.bold(isEnabled)}`,
         },
         setAllowAutoUpdates: {
             fieldName: 'auto updates',
-            success: (isEnabled) => `Allow auto updates set to: "${isEnabled}"`,
+            success: (isEnabled) => `Successfully updated ${chalk.bold('allow auto updates')} to ${chalk.bold(isEnabled)}`,
         },
         setDefaultCmsPublishMode: {
             promptMessage: 'Select CMS publish mode to be used as the default',
             error: (validModes) => `The provided CMS publish mode is invalid. Valid values are ${validModes}.`,
-            success: (mode) => `Default mode updated to: ${mode}`,
+            success: (mode) => `Successfully updated ${chalk.bold('default CMS publish mode')} to ${chalk.bold(mode)}`,
         },
         setHttpTimeout: {
             promptMessage: 'Enter http timeout duration',
-            success: (timeout) => `HTTP timeout set to: ${timeout}`,
+            success: (timeout) => `Successfully updated ${chalk.bold('HTTP timeout')} to ${chalk.bold(timeout)}`,
+            error: (timeout) => `Invalid HTTP timeout value "${timeout}". Must be a number greater than 3000.`,
+        },
+        setAutoOpenBrowser: {
+            fieldName: 'auto open browser',
+            enabled: `Successfully updated ${chalk.bold('auto open browser')} to ${chalk.bold('enabled')}`,
+            disabled: `Successfully updated ${chalk.bold('auto open browser')} to ${chalk.bold('disabled')}`,
         },
     },
     commonOpts: {
         options: {
-            account: {
-                describe: 'HubSpot account id or name from config',
-            },
-            config: {
-                describe: 'Path to a config file',
-            },
-            overwrite: {
-                describe: 'Overwrite existing files',
-            },
+            account: 'HubSpot account id or name from config',
+            config: 'Path to a config file',
+            overwrite: 'Overwrite existing files',
             modes: {
-                describe: {
-                    default: (modes) => `${modes}`,
-                    read: (modes) => `Read from ${modes}`,
-                    write: (modes) => `Write to ${modes}`,
-                },
-            },
-            qa: {
-                describe: 'Run command in QA mode',
-            },
-            useEnv: {
-                describe: 'Use environment variable config',
-            },
-            debug: {
-                describe: 'Set log level to debug',
+                default: (modes) => `${modes}`,
+                read: (modes) => `Read from ${modes}`,
+                write: (modes) => `Write to ${modes}`,
             },
+            qa: 'Run command in QA mode',
+            useEnv: 'Use environment variable config',
+            jsonOutput: 'Format output as JSON',
+            debug: 'Set log level to debug',
+        },
+    },
+    configMigrate: {
+        deprecatedConfigWarning: (deprecatedConfigPath) => `This command applies to global configuration, but we detected a deprecated config at ${deprecatedConfigPath}.`,
+        handleMigration: {
+            description: (archivedConfigName) => `We will migrate your deprecated config file to the new global configuration file location. This will create a new global configuration file in your root directory. Then it will archive the deprecated config as ${archivedConfigName} for you to manually cleanup at your convenience.`,
+            confirmPrompt: 'Migrate the deprecated config to the global location?',
+            success: 'Your deprecated config file has been successfully migrated.',
+        },
+        handleMergeConfigProperties: {
+            mergeConflictMessage: (count, propertyList) => `Conflict${count > 1 ? 's' : ''} detected for ${chalk.bold(propertyList)}.`,
+            mergeConfigConflictPrompt: (property, newValue, oldValue) => `Change ${property} from ${newValue} to ${oldValue}?`,
+        },
+        handleMerge: {
+            description: (archivedConfigName) => `We will automatically merge the contents of your deprecated config file into your global configuration file. This will merge the configured accounts and settings into the global config. Then it will archive the deprecated config as ${archivedConfigName} for you to manually cleanup at your convenience.`,
+            confirmPrompt: 'Merge the deprecated config into your global config?',
+            skippedExistingAccounts: (accountIds) => `The following accounts were not merged because they already exist in the global config:${accountIds.map(id => `\n- ${uiAccountDescription(Number(id))}`).join('')}`,
+            success: 'Your deprecated config file has been successfully merged with the global config file.',
         },
     },
     prompts: {
+        importDataFilePathPrompt: {
+            promptContext: `To view the JSON schema for data imports, visit ${uiLink('the docs', 'https://developers.hubspot.com/docs/guides/api/crm/imports')}`,
+            promptMessage: '[--file-path] Select the JSON file that will be used to import your data.',
+        },
+        confirmImportDataPrompt: {
+            message: (dataFileNames, cliAccount) => `You are importing [${dataFileNames.join(', ')}] into ${uiAccountDescription(getAccountIdentifier(cliAccount))}. Continue?`,
+        },
+        importDataTestAccountSelectPrompt: {
+            errors: {
+                noAccountsFound: 'No accounts found.',
+                noChildTestAccountsFound: (parentAccountId) => `No developer test accounts found under the parent account ${uiAccountDescription(parentAccountId)}`,
+            },
+        },
         projectDevTargetAccountPrompt: {
             createNewSandboxOption: '<Test on a new development sandbox>',
             createNewDeveloperTestAccountOption: '<Test on a new developer test account>',
-            chooseDefaultAccountOption: () => `<${chalk_1.default.bold('❗')} Test on this production account ${chalk_1.default.bold('❗')}>`,
+            chooseDefaultAccountOption: () => `<${chalk.bold('❗')} Test on this production account ${chalk.bold('❗')}>`,
             promptMessage: (accountType, accountIdentifier) => `[--account] Choose a ${accountType} under ${accountIdentifier} to test with:`,
             sandboxLimit: (limit) => `Your account reached the limit of ${limit} development sandboxes`,
             sandboxLimitWithSuggestion: (limit, authCommand) => `Your account reached the limit of ${limit} development sandboxes. Run ${authCommand} to add an existing one to the config.`,
             developerTestAccountLimit: (limit) => `Your account reached the limit of ${limit} developer test accounts.`,
-            confirmDefaultAccount: (accountName, accountType) => `Continue testing on ${chalk_1.default.bold(`${accountName} (${accountType})`)}? (Y/n)`,
+            confirmDefaultAccount: (accountName, accountType) => `Continue testing on ${chalk.bold(`${accountName} (${accountType})`)}? (Y/n)`,
             confirmUseExistingDeveloperTestAccount: (accountName) => `Continue with ${accountName}? This account isn't currently connected to the HubSpot CLI. By continuing, you'll be prompted to generate a personal access key and connect it.`,
             noAccountId: 'No account ID found for the selected account. Please try again.',
         },
         projectLogsPrompt: {
-            functionName: (projectName) => `[--function] Select function in ${chalk_1.default.bold(projectName)} project`,
+            functionName: (projectName) => `[--function] Select function in ${chalk.bold(projectName)} project`,
         },
         setAsDefaultAccountPrompt: {
             setAsDefaultAccountMessage: 'Set this account as the default?',
             setAsDefaultAccount: (accountName) => `Account "${accountName}" set as the default account`,
             keepingCurrentDefault: (accountName) => `Account "${accountName}" will continue to be the default account`,
         },
+        createDeveloperTestAccountConfigPrompt: {
+            namePrompt: (withFlag = true) => `${withFlag ? '[--name] ' : ''}Enter the name of the Test Account:`,
+            descriptionPrompt: (withFlag = true) => `${withFlag ? '[--description] ' : ''}Enter the description of the Test Account:`,
+            useDefaultAccountLevelsPrompt: {
+                message: 'Would you like to create a default Test Account, or customize your own?',
+                default: 'Default (All Hubs, ENTERPRISE)',
+                manual: 'Customize my own',
+            },
+            tiersPrompt: 'Select an option per hub to customize tiers. If left blank, default is ENTERPRISE',
+            hubTypes: {
+                marketing: 'Marketing',
+                ops: 'Ops',
+                service: 'Service',
+                sales: 'Sales',
+                content: 'Content',
+            },
+            errors: {
+                allHubsRequired: 'Select a tier for each hub',
+                tiersError: 'Cannot have more than one tier per hub',
+                nameRequired: 'The name may not be blank. Please add a name for the Test Account.',
+            },
+        },
         accountNamePrompt: {
             enterAccountName: 'Enter a unique name to reference this account in the CLI:',
             enterDeveloperTestAccountName: 'Name your developer test account:',
@@ -2657,11 +3041,14 @@ exports.lib = {
             enterAccountId: 'Enter the account ID for your account (the number under the DOMAIN column at https://app.hubspot.com/myaccounts-beta ): ',
             enterClientId: 'Enter your OAuth2 client ID: ',
             enterClientSecret: 'Enter your OAuth2 client secret: ',
-            enterPersonalAccessKey: 'Enter your personal access key: ',
+            enterPersonalAccessKey: '[--personal-access-key] Enter your personal access key: ',
             selectScopes: 'Select access scopes (see https://developers.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes)',
             personalAccessKeySetupTitle: 'HubSpot Personal Access Key Setup',
-            personalAccessKeyBrowserOpenPrep: "A personal access key is required to authenticate the CLI to interact with your HubSpot account. We'll open a secure page in your default browser where you can view and copy your personal access key.",
-            personalAccessKeyBrowserOpenPrompt: 'Open HubSpot to copy your personal access key?',
+            personalAccessKeyBrowserOpenPrep: 'A personal access key is required to authenticate the CLI to interact with your HubSpot account.',
+            personalAccessKeyPromptChoices: {
+                OPEN_BROWSER: 'Open HubSpot to copy your personal access key',
+                PASTE_EXISTING: 'Enter existing personal access key',
+            },
             logs: {
                 openingWebBrowser: (url) => `Opening ${url} in your web browser`,
             },
@@ -2710,15 +3097,20 @@ exports.lib = {
                 languageRequired: "Please select API sample app's language",
             },
         },
-        createProjectPrompt: {
+        projectNameAndDestPrompt: {
             enterName: '[--name] Give your project a name: ',
             enterDest: '[--dest] Enter the folder to create the project in:',
-            selectTemplate: '[--template] Choose a project template: ',
             errors: {
                 nameRequired: 'A project name is required',
                 destRequired: 'A project dest is required',
                 invalidDest: 'There is an existing project at this destination. Please provide a new path for this project.',
                 invalidCharacters: 'The selected destination contains invalid characters. Please provide a new path and try again.',
+            },
+        },
+        selectProjectTemplatePrompt: {
+            selectTemplate: '[--template] Choose a project template: ',
+            features: '[--features] Which features would you like your app to include?',
+            errors: {
                 invalidTemplate: (template) => `[--template] Could not find template "${template}". Please choose an available template:`,
                 projectTemplateRequired: 'Project template is required when projectTemplates is provided',
             },
@@ -2735,10 +3127,10 @@ exports.lib = {
             selectAppIdClone: (accountName) => `[--appId] Choose an app under ${accountName} to clone:`,
             errors: {
                 noAccountId: 'An account ID is required to select an app.',
-                noAppsMigration: () => `${chalk_1.default.bold('No apps to migrate')}`,
-                noAppsClone: () => `${chalk_1.default.bold('No apps to clone')}`,
-                noAppsMigrationMessage: (accountName) => `The selected developer account ${chalk_1.default.bold(accountName)} doesn't have any apps that can be migrated to the projects framework.`,
-                noAppsCloneMessage: (accountName) => `The selected developer account ${chalk_1.default.bold(accountName)} doesn't have any apps that can be cloned to the projects framework.`,
+                noAppsMigration: () => `${chalk.bold('No apps to migrate')}`,
+                noAppsClone: () => `${chalk.bold('No apps to clone')}`,
+                noAppsMigrationMessage: (accountName) => `The selected developer account ${chalk.bold(accountName)} doesn't have any apps that can be migrated to the projects framework.`,
+                noAppsCloneMessage: (accountName) => `The selected developer account ${chalk.bold(accountName)} doesn't have any apps that can be cloned to the projects framework.`,
                 errorFetchingApps: 'There was an error fetching public apps.',
                 cannotBeMigrated: 'Cannot be migrated',
             },
@@ -2751,11 +3143,14 @@ exports.lib = {
             },
         },
         projectAddPrompt: {
-            selectType: '[--type] Select a component to add: ',
+            selectType: '[--type] Select an app feature to add: ',
+            selectFeatures: '[--features] Select an app feature to add: ',
             enterName: '[--name] Give your component a name: ',
             errors: {
                 nameRequired: 'A component name is required',
+                componentRequired: 'Must select a feature to add',
                 invalidType: (type) => `[--type] Could not find type "${type}". Please choose an available type:`,
+                cannotAddFeature: (feature, reasons) => `Cannot Add feature '${feature}' to project for the following reasons: ${reasons}`,
             },
         },
         secretPrompt: {
@@ -2789,7 +3184,7 @@ exports.lib = {
             enterName: '[--project] Enter project name:',
             errors: {
                 invalidName: 'You entered an invalid name. Please try again.',
-                projectDoesNotExist: (projectName, accountIdentifier) => `Project ${chalk_1.default.bold(projectName)} could not be found in "${accountIdentifier}"`,
+                projectDoesNotExist: (projectName, accountIdentifier) => `Project ${chalk.bold(projectName)} could not be found in "${accountIdentifier}"`,
             },
         },
         previewPrompt: {
@@ -2802,11 +3197,13 @@ exports.lib = {
             },
         },
         installAppPrompt: {
-            explanation: 'Local development requires this app to be installed in the target test account',
+            explanation: 'Local development requires this app to be installed in the target test account.',
             reinstallExplanation: "This app's required scopes have been updated since it was last installed on the target test account. To avoid issues with local development, we recommend reinstalling the app with the updated scopes.",
+            staticAuthExplanation: (projectAccountId, testingAccountId, projectName, appUid) => `To install this static auth app, your testing account ${uiAccountDescription(testingAccountId)} must be on ${uiLink("this app's allowlist", getAppAllowlistUrl(projectAccountId, projectName, appUid))}.`,
             prompt: 'Open HubSpot to install this app?',
+            autoPrompt: 'Install this app in your target test account?',
             reinstallPrompt: 'Open HubSpot to reinstall this app?',
-            decline: `To continue local development of this app, install it in your target test account and re-run ${chalk_1.default.bold('`hs project dev`')}`,
+            decline: `To continue local development of this app, install it in your target test account and re-run ${chalk.bold('`hs project dev`')}`,
         },
         selectHubDBTablePrompt: {
             selectTable: 'Select a HubDB table:',
@@ -2820,6 +3217,9 @@ exports.lib = {
             },
         },
     },
+    polling: {
+        timeoutError: (timeoutMs) => `Polling timed out after ${timeoutMs}ms.`,
+    },
     convertFields: {
         positionals: {
             src: {
@@ -2835,20 +3235,20 @@ exports.lib = {
     developerTestAccount: {
         create: {
             loading: {
-                add: (accountName) => `Creating developer test account ${chalk_1.default.bold(accountName)}`,
-                fail: (accountName) => `Failed to create a developer test account ${chalk_1.default.bold(accountName)}.`,
-                succeed: (accountName, accountId) => `Successfully created a developer test account ${chalk_1.default.bold(accountName)} with portalId ${chalk_1.default.bold(accountId)}.`,
+                add: (accountName) => `Creating developer test account ${chalk.bold(accountName)}`,
+                fail: (accountName) => `Failed to create a developer test account ${chalk.bold(accountName)}.`,
+                succeed: (accountName, accountId) => `Successfully created a developer test account ${chalk.bold(accountName)} with portalId ${chalk.bold(accountId)}.`,
             },
             success: {
                 configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk_1.default.bold(accountName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
-                limit: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} developer test accounts. \n- To connect a developer test account to your HubSpot CLI, run ${chalk_1.default.bold('hs auth')} and follow the prompts.`,
-                alreadyInConfig: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} developer test accounts. \n- To use an existing developer test account, run ${chalk_1.default.bold('hs accounts use')}.`,
+                invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk.bold(accountName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
+                limit: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} developer test accounts. \n- To connect a developer test account to your HubSpot CLI, run ${chalk.bold('hs auth')} and follow the prompts.`,
+                alreadyInConfig: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} developer test accounts. \n- To use an existing developer test account, run ${chalk.bold('hs accounts use')}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include developer test account permissions.",
-                    instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes developer test account permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes developer test account permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2857,58 +3257,58 @@ exports.lib = {
         create: {
             developer: {
                 loading: {
-                    add: (accountName) => `Creating developer sandbox ${chalk_1.default.bold(accountName)}`,
-                    fail: (accountName) => `Failed to create a developer sandbox ${chalk_1.default.bold(accountName)}.`,
-                    succeed: (accountName, accountId) => `Successfully created a developer sandbox ${chalk_1.default.bold(accountName)} with portalId ${chalk_1.default.bold(accountId)}.`,
+                    add: (accountName) => `Creating developer sandbox ${chalk.bold(accountName)}`,
+                    fail: (accountName) => `Failed to create a developer sandbox ${chalk.bold(accountName)}.`,
+                    succeed: (accountName, accountId) => `Successfully created a developer sandbox ${chalk.bold(accountName)} with portalId ${chalk.bold(accountId)}.`,
                 },
                 success: {
                     configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
                 },
                 failure: {
-                    invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk_1.default.bold(accountName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
-                    limit: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} developer sandboxes. \n- To connect a developer sandbox to your HubSpot CLI, run ${chalk_1.default.bold('hs auth')} and follow the prompts.`,
-                    alreadyInConfig: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} developer sandboxes. \n- To use an existing developer sandbox, run ${chalk_1.default.bold('hs accounts use')}.`,
+                    invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk.bold(accountName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
+                    limit: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} developer sandboxes. \n- To connect a developer sandbox to your HubSpot CLI, run ${chalk.bold('hs auth')} and follow the prompts.`,
+                    alreadyInConfig: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} developer sandboxes. \n- To use an existing developer sandbox, run ${chalk.bold('hs accounts use')}.`,
                     scopes: {
                         message: "The personal access key you provided doesn't include developer sandbox permissions.",
-                        instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes developer sandbox permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                        instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes developer sandbox permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                     },
                     generic: 'An error occurred while creating a developer sandbox',
                 },
             },
             standard: {
                 loading: {
-                    add: (accountName) => `Creating standard sandbox ${chalk_1.default.bold(accountName)}`,
-                    fail: (accountName) => `Failed to create a standard sandbox ${chalk_1.default.bold(accountName)}.`,
-                    succeed: (accountName, accountId) => `Successfully created a standard sandbox ${chalk_1.default.bold(accountName)} with portalId ${chalk_1.default.bold(accountId)}.`,
+                    add: (accountName) => `Creating standard sandbox ${chalk.bold(accountName)}`,
+                    fail: (accountName) => `Failed to create a standard sandbox ${chalk.bold(accountName)}.`,
+                    succeed: (accountName, accountId) => `Successfully created a standard sandbox ${chalk.bold(accountName)} with portalId ${chalk.bold(accountId)}.`,
                 },
                 success: {
                     configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
                 },
                 failure: {
-                    invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk_1.default.bold(accountName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
-                    limit: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} standard sandboxes. \n- To connect a standard sandbox to your HubSpot CLI, run ${chalk_1.default.bold('hs auth')} and follow the prompts.`,
-                    alreadyInConfig: (accountName, limit) => `${chalk_1.default.bold(accountName)} reached the limit of ${limit} standard sandboxes. \n- To use an existing standard sandbox, run ${chalk_1.default.bold('hs accounts use')}.`,
+                    invalidUser: (accountName, parentAccountName) => `Couldn't create ${chalk.bold(accountName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
+                    limit: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} standard sandboxes. \n- To connect a standard sandbox to your HubSpot CLI, run ${chalk.bold('hs auth')} and follow the prompts.`,
+                    alreadyInConfig: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} standard sandboxes. \n- To use an existing standard sandbox, run ${chalk.bold('hs accounts use')}.`,
                     scopes: {
                         message: "The personal access key you provided doesn't include standard sandbox permissions.",
-                        instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes standard sandbox permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                        instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes standard sandbox permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                     },
                 },
             },
         },
         sync: {
             loading: {
-                add: (accountName) => `Syncing sandbox ${chalk_1.default.bold(accountName)}`,
-                fail: (accountName) => `Failed to sync sandbox ${chalk_1.default.bold(accountName)}.`,
-                succeed: (accountName) => `Successfully synced sandbox ${chalk_1.default.bold(accountName)}.`,
+                add: (accountName) => `Syncing sandbox ${chalk.bold(accountName)}`,
+                fail: (accountName) => `Failed to sync sandbox ${chalk.bold(accountName)}.`,
+                succeed: (accountName) => `Successfully synced sandbox ${chalk.bold(accountName)}.`,
             },
             success: {
                 configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
             },
             failure: {
-                invalidUser: (accountName, parentAccountName) => `Couldn't sync ${chalk_1.default.bold(accountName)} because your account has been removed from ${chalk_1.default.bold(parentAccountName)} or your permission set doesn't allow you to sync the sandbox. To update your permissions, contact a super admin in ${chalk_1.default.bold(parentAccountName)}.`,
+                invalidUser: (accountName, parentAccountName) => `Couldn't sync ${chalk.bold(accountName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to sync the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 scopes: {
                     message: "The personal access key you provided doesn't include sandbox sync permissions.",
-                    instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes sandbox sync permissions. \n- Update the CLI config for this account by running ${chalk_1.default.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes sandbox sync permissions. \n- Update the CLI config for this account by running ${chalk.bold('hs auth')} and entering the new key.\n`,
                 },
             },
         },
@@ -2923,9 +3323,9 @@ exports.lib = {
         suppressErrors: {
             platformVersionErrors: {
                 header: 'Platform version update required',
-                unspecifiedPlatformVersion: (platformVersion) => `Projects with an ${chalk_1.default.bold(platformVersion)} are no longer supported.`,
-                platformVersionRetired: (platformVersion) => `Projects with ${chalk_1.default.bold(`platformVersion ${platformVersion}`)} are no longer supported.`,
-                nonExistentPlatformVersion: (platformVersion) => `Projects with ${chalk_1.default.bold(`platformVersion ${platformVersion}`)} are not supported.`,
+                unspecifiedPlatformVersion: (platformVersion) => `Projects with an ${chalk.bold(platformVersion)} are no longer supported.`,
+                platformVersionRetired: (platformVersion) => `Projects with ${chalk.bold(`platformVersion ${platformVersion}`)} are no longer supported.`,
+                nonExistentPlatformVersion: (platformVersion) => `Projects with ${chalk.bold(`platformVersion ${platformVersion}`)} are not supported.`,
                 updateProject: 'Please update your project to the latest version and try again.',
                 docsLink: 'Projects platform versioning (BETA)',
                 betaLink: (docsLink) => `For more info, see ${docsLink}.`,
@@ -2977,13 +3377,13 @@ exports.lib = {
             unableToDetermineSecondaryLink: 'npm HubSpot CLI version history',
         },
         projectDependenciesChecks: {
-            missingDependencies: (dir) => `missing dependencies in ${chalk_1.default.bold(dir)}`,
+            missingDependencies: (dir) => `missing dependencies in ${chalk.bold(dir)}`,
             missingDependenciesSecondary: (command) => `Run ${command} to install all project dependencies locally`,
             unableToDetermine: (dir) => `Unable to determine if dependencies are installed ${dir}`,
             success: 'App dependencies are installed and up to date',
         },
         files: {
-            invalidJson: (filename) => `invalid JSON in ${chalk_1.default.bold(filename)}`,
+            invalidJson: (filename) => `invalid JSON in ${chalk.bold(filename)}`,
             validJson: 'JSON files valid',
         },
         port: {
@@ -2997,19 +3397,19 @@ exports.lib = {
             },
             cliConfig: {
                 header: 'CLI configuration',
-                configFileSubHeader: (filename) => `Config File: ${chalk_1.default.bold(filename)}`,
+                configFileSubHeader: (filename) => `Config File: ${chalk.bold(filename)}`,
                 defaultAccountSubHeader: (accountDetails) => `Default Account: ${accountDetails}`,
                 noConfigFile: 'CLI configuration not found',
                 noConfigFileSecondary: (command) => `Run ${command} and follow the prompts to create your CLI configuration file and connect it to your HubSpot account`,
             },
             projectConfig: {
                 header: 'Project configuration',
-                projectDirSubHeader: (projectDir) => `Project dir: ${chalk_1.default.bold(projectDir)}`,
-                projectNameSubHeader: (projectName) => `Project name: ${chalk_1.default.bold(projectName)}`,
+                projectDirSubHeader: (projectDir) => `Project dir: ${chalk.bold(projectDir)}`,
+                projectNameSubHeader: (projectName) => `Project name: ${chalk.bold(projectName)}`,
             },
             counts: {
-                errors: (count) => `${chalk_1.default.bold('Errors:')} ${count}`,
-                warnings: (count) => `${chalk_1.default.bold('Warning:')} ${count}`,
+                errors: (count) => `${chalk.bold('Errors:')} ${count}`,
+                warnings: (count) => `${chalk.bold('Warning:')} ${count}`,
             },
         },
     },
@@ -3020,25 +3420,35 @@ exports.lib = {
         componentsToBeMigrated: (components) => `The following features will be migrated: ${components}`,
         componentsThatWillNotBeMigrated: (components) => `[NOTE] These features are not yet supported for migration but will be available later: ${components}`,
         sourceContentsMoved: (newLocation) => `The contents of your old source directory have been moved to ${newLocation}, move any required files to the new source directory.`,
-        projectMigrationWarningTitle: '⚠️ Important: Migrating to platformVersion 2025.2 is irreversible ⚠️',
-        projectMigrationWarning: (0, ui_1.uiBetaTag)(`Running the ${(0, ui_1.uiCommandReference)('hs project migrate')} command will permanently upgrade your project to platformVersion 2025.2. This action cannot be undone. To ensure you have access to your original files, they will be copied to a new directory (archive) for safekeeping.\n\nThis command will guide you through the process, prompting you to enter the required fields and will download the new project source code into your project source directory.`, false),
+        projectMigrationWarningTitle: 'Important: Migrating to platformVersion 2025.2 is irreversible',
+        projectMigrationWarning: uiBetaTag(`Running the ${uiCommandReference('hs project migrate')} command will permanently upgrade your project to platformVersion 2025.2. This action cannot be undone. To ensure you have access to your original files, they will be copied to a new directory (archive) for safekeeping.\n\nThis command will guide you through the process, prompting you to enter the required fields and will download the new project source code into your project source directory.`, false),
+        exitWithoutMigrating: 'Exiting without migrating',
+        success: {
+            downloadedProject: (projectName, projectDest) => `Saved ${projectName} to ${projectDest}`,
+            themesMigrationSuccess: (platformVersion) => `Successfully migrated project to platformVersion ${chalk.bold(platformVersion)}. Upload your project using ${uiCommandReference('hs project upload')}`,
+        },
         errors: {
             project: {
                 invalidConfig: 'The project configuration file is invalid. Please check the config file and try again.',
-                doesNotExist: (account) => `Project does not exist in ${(0, ui_1.uiAccountDescription)(account)}. Migrations are only supported for existing projects.`,
+                doesNotExist: (account) => `Project does not exist in ${uiAccountDescription(account)}. Migrations are only supported for existing projects.`,
+                themesAlreadyMigrated: 'This project has already been migrated to the latest platform version.',
+                noProjectForThemesMigration: 'Theme migrations are only supported for projects. Please try again from a project directory.',
+                themesAndAppsNotAllowed: 'Support for migrating projects containing both themes and apps to the latest platform version is coming soon. Try again later.',
                 multipleApps: 'Multiple apps found in project, this is not allowed in 2025.2',
                 alreadyExists: (projectName) => `A project with name ${projectName} already exists. Please choose another name.`,
+                failedToMigrateThemes: 'Failed to migrate project themes. Please verify that your themes are properly formatted before trying again.',
+                failedToUpdateProjectConfig: 'Failed to update project config file. Please update the platformVersion in the project config file manually.',
             },
             unmigratableReasons: {
                 upToDate: 'App is already up to date',
                 isPrivateApp: 'Private apps are not currently migratable',
                 listedInMarketplace: 'Listed apps are not currently migratable',
-                projectConnectedToGitHub: (projectName, accountId) => `The project is linked to a GitHub repository.  ${(0, ui_1.uiLink)('Visit the project settings page to unlink it', (0, urls_1.getProjectSettingsUrl)(projectName, accountId))}`,
-                partOfProjectAlready: `This app is part of a project, run ${(0, ui_1.uiCommandReference)('hs project migrate')} from the project directory to migrate it`,
+                projectConnectedToGitHub: (projectName, accountId) => `The project is linked to a GitHub repository.  ${uiLink('Visit the project settings page to unlink it', getProjectSettingsUrl(projectName, accountId))}`,
+                partOfProjectAlready: `This app is part of a project, run ${uiCommandReference('hs project migrate')} from the project directory to migrate it`,
                 generic: (reasonCode) => `Unable to migrate app: ${reasonCode}`,
             },
             noAppsEligible: (accountId, reasons) => `No apps in account ${accountId} are currently migratable${reasons.length ? `\n  - ${reasons.join('\n  - ')}` : ''}`,
-            invalidAccountTypeTitle: `${chalk_1.default.bold('Developer account not targeted')}`,
+            invalidAccountTypeTitle: `${chalk.bold('Developer account not targeted')}`,
             invalidAccountTypeDescription: (useCommand, authCommand) => `Only public apps created in a developer account can be converted to a project component. Select a connected developer account with ${useCommand} or ${authCommand} and try again.`,
             appWithAppIdNotFound: (appId) => `Could not find an app with the id ${appId} `,
             noAppsForProject: (projectName) => `No apps associated with project ${projectName}`,
@@ -3046,6 +3456,7 @@ exports.lib = {
             notUngatedForUnifiedApps: (account) => `Your account ${account} isn't enrolled in the required product beta to access this command.`,
         },
         prompt: {
+            themesMigration: (count) => `Identified ${count} theme${count === 1 ? '' : 's'} to migrate. This will migrate all themes in the project.`,
             chooseApp: 'Which app would you like to migrate?',
             inputName: '[--name] What would you like to name the project?',
             inputDest: '[--dest] Where would you like to save the project?',
@@ -3053,6 +3464,7 @@ exports.lib = {
             proceed: 'Would you like to proceed?',
         },
         spinners: {
+            checkingForMigratableComponents: 'Checking project for migratable components...',
             beginningMigration: 'Beginning migration',
             unableToStartMigration: 'Unable to begin migration',
             finishingMigration: 'Wrapping up migration',