@hubspot/cli 7.7.35-experimental.0 → 7.8.0-beta.1

package/lang/en.js

@@ -3,9 +3,10 @@ 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 { APP_DISTRIBUTION_TYPES, APP_AUTH_TYPES, PROJECT_CONFIG_FILE, PROJECT_WITH_APP, } from '../lib/constants.js';
+import { uiAccountDescription, uiBetaTag, uiCommandReference, uiLink, UI_COLORS, uiAuthCommandReference, } from '../lib/ui/index.js';
+import { getProjectDetailUrl, getProjectSettingsUrl, getLocalDevUiUrl, } 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: {
@@ -18,6 +19,7 @@ export const commands = {
         },
     },
     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',
@@ -84,7 +86,7 @@ export const commands = {
                 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.`,
+                    migrationNotConfirmed: `Did not migrate your configuration file. Run ${uiAuthCommandReference()} 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: {
@@ -94,9 +96,13 @@ export const commands = {
             },
             list: {
                 accounts: `${chalk.bold('Accounts')}:`,
-                defaultAccount: (account) => `${chalk.bold('Default account')}: ${account}`,
+                defaultAccountTitle: `${chalk.bold('Default Account')}`,
+                defaultAccount: (account) => `Account: ${account}`,
                 describe: 'List names of accounts defined in config.',
-                configPath: (configPath) => `${chalk.bold('Config path')}: ${configPath}`,
+                configPath: (configPath) => `Source: ${configPath}`,
+                overrideFilePathTitle: `${chalk.bold('Default Account Override')}`,
+                overrideFilePath: (overrideFilePath) => `Source: ${overrideFilePath}`,
+                overrideAccount: (account) => `Account: ${account}`,
                 labels: {
                     accountId: 'Account ID',
                     authType: 'Auth Type',
@@ -122,6 +128,8 @@ export const commands = {
                 errors: {
                     accountNotFound: (specifiedAccount, configPath) => `The account "${specifiedAccount}" could not be found in ${configPath}`,
                 },
+                accountOverride: (accountOverride) => `This project currently has an account override set: "${accountOverride}". Account "${accountOverride}" will continue to act as the default account for this project.`,
+                accountOverrideCommands: `Use ${uiCommandReference('hs account create-override')} to change override accounts, or ${uiCommandReference('hs account remove-override')} to remove the override and use your default account.`,
                 examples: {
                     default: 'Select a HubSpot account to use as the default account',
                     idBased: 'Set the default account to the account in the config with accountId equal to "1234567"',
@@ -143,6 +151,7 @@ export const commands = {
                     replaceDefaultAccount: 'The removed account was the default account.',
                 },
                 prompts: {
+                    deleteOverrideFile: (overrideFilePath, accountName) => `Delete the override file (${overrideFilePath}) associated with ${accountName}?`,
                     selectAccountToRemove: 'Select an account to remove from the config',
                 },
                 errors: {
@@ -162,12 +171,40 @@ export const commands = {
                     accountRemoved: (accountName) => `Account "${accountName}" removed from the config`,
                 },
             },
+            removeOverride: {
+                describe: (overrideFile) => `Remove the default account override file (${overrideFile}) from the current working directory.`,
+                accountOverride: (overrideFilePath, accountOverride) => `There is an account override file at ${overrideFilePath} associated with account "${accountOverride}".`,
+                prompts: {
+                    deleteOverrideFile: 'Delete account override file?',
+                },
+                success: 'Removed the default account override file.',
+                noOverrideFile: 'No default account override file found in the current working directory. No action required.',
+                errors: {
+                    globalConfigNotFound: `This command is only compatible with our new global config. Run ${uiCommandReference('hs account auth')} to get started.`,
+                },
+                options: {
+                    force: {
+                        describe: 'Skip confirmation prompt when removing the override file',
+                    },
+                },
+            },
             info: {
                 accountId: (accountId) => `${chalk.bold('Account ID')}: ${accountId}`,
+                defaultAccountTitle: `${chalk.bold('Default Account')}`,
+                configPath: (configPath) => `Source: ${configPath}`,
+                defaultAccount: (accountName) => `Account: ${accountName}`,
+                overrideFilePathTitle: `${chalk.bold('Default Account Override')}`,
+                overrideFilePath: (overrideFilePath) => `Source: ${overrideFilePath}`,
+                overrideAccount: (accountName) => `Account: ${accountName}`,
                 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.',
                 },
+                options: {
+                    account: {
+                        describe: 'Account name or id to show info for',
+                    },
+                },
                 examples: {
                     default: 'Print information for the default account',
                     idBased: 'Print information for the account with accountId equal to "1234567"',
@@ -191,6 +228,30 @@ export const commands = {
                     other: (count) => `Remove ${count} inactive accounts from the CLI config?`,
                 },
                 removeSuccess: (accountName) => `Removed ${accountName} from the CLI config.`,
+                replaceDefaultAccount: 'The default account was removed.',
+                defaultAccountOverride: (overrideFilePath) => `\n(This will also delete the default account override file at ${overrideFilePath})`,
+            },
+            createOverride: {
+                describe: (hsAccountFileName) => `Create a new default account override file (${hsAccountFileName}) in the current working directory.`,
+                success: (overrideFilePath) => `Default account override file created at ${overrideFilePath}`,
+                accountOverride: (overrideFilePath, accountOverride) => `An account override file already exists at ${overrideFilePath} associated with account "${accountOverride}".`,
+                prompts: {
+                    replaceOverrideFile: 'Replace existing account override file?',
+                },
+                errors: {
+                    globalConfigNotFound: `This command is only compatible with our new global config. Run ${uiCommandReference('hs account auth')} to get started.`,
+                    accountNotFound: (configPath) => `The specified account could not be found in the config file ${configPath}`,
+                },
+                options: {
+                    account: {
+                        describe: 'Name or ID of the account to create an override file for.',
+                    },
+                },
+                examples: {
+                    default: (hsAccountFileName) => `Create a new default account override file (${hsAccountFileName}) in the current working directory`,
+                    idBased: (hsAccountFileName) => `Create a new default account override file (${hsAccountFileName}) in the current working directory, using the account with accountId "1234567"`,
+                    nameBased: (hsAccountFileName) => `Create a new default account override file (${hsAccountFileName}) in the current working directory, using the account with name "MyAccount"`,
+                },
             },
         },
     },
@@ -260,6 +321,10 @@ export const commands = {
                         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.`,
+                },
             },
         },
     },
@@ -280,6 +345,9 @@ export const commands = {
                     pageTemplateScoreTitle: 'Page template scores',
                     lighthouseLinksTitle: 'Lighthouse links',
                     failedTemplatePathsTitle: 'The following templates could not be scored',
+                    themeToCheckTitle: (themeToCheck, target) => `${themeToCheck} ${target} scores`,
+                    themeTitle: (themeToCheck) => `Theme: ${themeToCheck}`,
+                    poweredByLink: `Powered by ${uiLink('Google Lighthouse', 'https://developer.chrome.com/docs/lighthouse/overview/')}`,
                 },
                 errors: {
                     targetOptionRequired: '[--target] is required for detailed view',
@@ -398,9 +466,9 @@ export const commands = {
         },
     },
     customObject: {
-        betaMessage: `${chalk.bold('[BETA]')} The Custom Object CLI is currently in beta and is subject to change.`,
+        betaMessage: `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.',
+        seeMoreLink: `${uiLink('View our docs to find out more', 'https://developers.hubspot.com/docs/api-reference/crm-custom-objects-v3/guide#custom-objects-api-guide')}`,
         subcommands: {
             create: {
                 describe: 'Create custom object instances.',
@@ -800,7 +868,7 @@ export const commands = {
             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.',
+            updateConfig: `To update an existing config file, use the ${uiAuthCommandReference()} command.`,
         },
         errors: {
             invalidAccountIdProvided: `--account must be a number.`,
@@ -862,8 +930,9 @@ export const commands = {
         tailLogs: (functionPath, accountId) => `Waiting for log entries for "${functionPath}" on account "${accountId}".\n`,
     },
     mcp: {
-        describe: 'Commands for managing HubSpot MCP servers',
+        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',
@@ -875,6 +944,7 @@ export const commands = {
             },
             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}`,
             },
@@ -941,6 +1011,7 @@ export const commands = {
         selectLink: 'Select a link to open',
     },
     project: {
+        describe: `Commands for managing projects. For more information visit our documentation https://developers.hubspot.com/docs/getting-started/quickstart`,
         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 ${uiCommandReference('hs project profile add')} to get started!`,
@@ -1009,11 +1080,11 @@ export const 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)',
                 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.',
-                learnMoreMessageV3: `Learn more about ${uiLink('HubSpot projects local dev', 'https://hubspot.mintlify.io/en-us/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'),
+                learnMoreMessageV2: `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/developer-tooling/local-development/hubspot-cli/project-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`,
@@ -1023,21 +1094,22 @@ export const commands = {
             },
             errors: {
                 noProjectConfig: 'No project detected. Please run this command again from a project directory.',
-                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.`,
+                noAccount: (accountId) => `An error occurred while reading account ${uiAccountDescription(accountId)} from your config. Run ${uiAuthCommandReference()} to re-auth this account.`,
+                noAccountsInConfig: `No accounts found in your config. Run ${uiAuthCommandReference()} 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: `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',
+                unsupportedAccountFlagV2: '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.',
+                projectAccount: 'The id of the account to upload your project to. Must be used with --testing-account. Supported on platform versions 2025.2 and newer.',
+                testingAccount: 'The id of the account to install apps and test on. Must be used with --project-account. Supported on platform versions 2025.2 and newer.',
+                account: 'The id of the account to upload your project to. Unsupported on platform versions 2025.2 and newer.',
             },
         },
         create: {
@@ -1069,7 +1141,7 @@ export const 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',
@@ -1107,34 +1179,40 @@ export const commands = {
                     describe: 'Project name (cannot be changed)',
                 },
             },
-            header: {
-                text: 'This command will migrate an app to the projects framework. It will walk you through the fields required to complete the migration and download the project source code into a directory of your choosing.',
-                link: 'Learn more about migrating apps to the projects framework',
-            },
-            deprecationWarning: (oldCommand, newCommand) => `The ${oldCommand} command is deprecated and will be removed. Use ${newCommand} going forward.`,
+            header: `This command will migrate an app to the projects framework. It will walk you through the fields required to complete the migration and download the project source code into a directory of your choosing.\n${uiLink('Learn more about migrating apps to the projects framework', 'https://developers.hubspot.com/docs/platform/migrate-a-public-app-to-projects')}`,
+            deprecationWarning: (platformVersion) => `The ${uiCommandReference('hs project migrate-app')} command is deprecated and will be removed. Use ${uiCommandReference(`hs app migrate --platform-version=${platformVersion}`)} going forward.`,
             migrationStatus: {
-                inProgress: () => `Converting app configuration to ${chalk.bold('public-app.json')} component definition ...`,
+                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 public-app.json component definition ... DONE',
-                failure: () => 'Converting app configuration to public-app.json component definition ... FAILED',
+                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.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('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.`,
-                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.bold('This will not affect existing app users or installs.')}`,
+                title: `${chalk.bold('You are about to migrate an app to the projects framework')}\n`,
+                projectConversion: `${chalk.bold('The selected app will be converted to a project component.')}\n`,
+                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.\n`,
+                buildAndDeploy: 'This will create a new project with a single app component and immediately build and deploy it to your developer account (build #1).\n',
+                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.',
             createAppPrompt: "Proceed with migrating this app to a project component (this process can't be aborted)?",
             projectDetailsLink: 'View project details in your developer account',
+            errors: {
+                noAppsForProject: (projectName) => `No apps associated with project ${projectName}`,
+                noAccountConfig: 'No account configuration found. Please check your account settings.',
+                projectAlreadyExists: (projectName) => `A project with name ${projectName} already exists. Please choose another name.`,
+                invalidApp: (appId) => `Could not migrate appId ${appId}. This app cannot be migrated at this time. Please choose another public app.`,
+                migrationFailed: 'Migration Failed',
+                notAllowedWithinProject: `This command cannot be run from within a project directory. Run the command again from outside a project directory. If you are trying to migrate a project, run ${uiCommandReference('hs project migrate')}`,
+            },
         },
         migrate: {
             preamble: (platformVersion) => `This command will migrate an existing project to platformVersion ${platformVersion}.  It will walk you through the fields required to complete the migration and download the new project source code into the project source directory.  It will also copy all of your existing files to a new directory (archive) in case you need access to your old files later.`,
             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.',
@@ -1154,15 +1232,16 @@ export const commands = {
                 },
             },
             cloneStatus: {
-                inProgress: () => `Cloning app configuration to ${chalk.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.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}`,
+                noAccountConfig: (accountId) => `No account config found for ${uiAccountDescription(accountId)}`,
             },
         },
         add: {
@@ -1192,7 +1271,7 @@ export const commands = {
                 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`,
+                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 features. Please try again later.',
                 projectContainsPublicApp: 'This project contains a public app. This command is currently only compatible with projects that contain private apps.',
@@ -1269,7 +1348,7 @@ export const commands = {
             },
             logs: {
                 showingLogs: 'Showing logs for:',
-                hubspotLogsDirectLink: 'View function logs in HubSpot',
+                hubspotLogsDirectLink: (url) => `${uiLink('View function logs in HubSpot', url)}`,
                 noLogsFound: (name) => `No logs were found for "${name}"`,
             },
             table: {
@@ -1310,11 +1389,11 @@ export const commands = {
             logs: {
                 buildSucceeded: (buildId) => `Build #${buildId} succeeded\n`,
                 readyToGoLive: '🚀 Ready to take your project live?',
-                runCommand: (command) => `Run \`${command}\``,
-                autoDeployDisabled: (deployCommand) => `Automatic deploys are disabled for this project. Run ${deployCommand} to deploy this build.`,
+                runCommand: (command) => `Run \`${uiCommandReference(command)}\``,
+                autoDeployDisabled: (deployCommand) => `Automatic deploys are disabled for this project. Run ${uiCommandReference(deployCommand)} to deploy this build.`,
             },
             errors: {
-                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.`,
+                projectLockedError: `Your project is locked. This may mean that another user is running the ${uiCommandReference('hs project dev')} command for this project. If this is you, unlock the project in Projects UI.`,
             },
             options: {
                 forceCreate: {
@@ -1323,6 +1402,9 @@ export const commands = {
                 message: {
                     describe: 'Add a message when you upload your project and create a build',
                 },
+                profile: {
+                    describe: 'Profile to target for this upload',
+                },
             },
         },
         watch: {
@@ -1360,6 +1442,7 @@ export const commands = {
                 uploadFailed: (remotePath, filePath) => `Failed to upload file "${filePath}" to "${remotePath}"`,
                 deleteFileFailed: (remotePath) => `Failed to delete file "${remotePath}"`,
                 deleteFolderFailed: (remotePath) => `Failed to delete folder "${remotePath}"`,
+                v2ApiError: (platformVersion) => `${uiCommandReference('hs project watch')} is not supported for platform version '${platformVersion}' use ${uiCommandReference('hs project dev')} instead to develop locally. ${uiLink('How to develop locally', 'https://developers.hubspot.com/docs/guides/crm/ui-extensions/local-development')}`,
             },
         },
         download: {
@@ -1374,6 +1457,7 @@ export const commands = {
             errors: {
                 downloadFailed: 'Something went wrong downloading the project',
                 projectNotFound: (projectName, accountId) => `Your project ${chalk.bold(projectName)} could not be found in ${accountId}`,
+                noBuildIdToDownload: 'No build ID available for download',
             },
             warnings: {
                 cannotDownloadWithinProject: 'Cancelling project download. Please run the command again outside the context of an existing project.',
@@ -1421,8 +1505,8 @@ export const commands = {
             addingDependenciesToLocation: (dependencies, directory) => `Installing ${dependencies} in ${directory}`,
             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.bold(link)}`,
+            noPackageJsonInProject: (projectName) => `No dependencies to install. The project ${projectName} folder might be missing component or subcomponent files. ${uiLink('Learn how to create a project from scratch', 'https://developers.hubspot.com/docs/apps/developer-platform/build-apps/create-an-app#customize-a-new-project-using-the-cli')}`,
+            packageManagerNotInstalled: (packageManager) => `This command depends on ${packageManager}, install ${uiLink(packageManager, 'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm')}`,
         },
         validate: {
             describe: 'Validate the project before uploading',
@@ -1439,6 +1523,17 @@ export const commands = {
                 },
             },
         },
+        list: {
+            describe: 'List uploaded projects that exist in the current target account',
+            projects: `${chalk.bold('Projects')}:`,
+            labels: {
+                name: 'Name',
+                platformVersion: 'Platform Version',
+            },
+            errors: {
+                noProjectsFound: (accountId) => `No projects found for account ${uiAccountDescription(accountId)}`,
+            },
+        },
     },
     remove: {
         describe: 'Delete a file or folder from the HubSpot CMS.',
@@ -1454,6 +1549,30 @@ export const commands = {
         describe: 'Commands for managing sandboxes.',
         subcommands: {
             create: {
+                describe: 'Create a sandbox account.',
+                failure: {
+                    noAccountConfig: (accountId) => `No account config found for ${uiAccountDescription(accountId)}. Run ${uiAuthCommandReference()} to add it.`,
+                    invalidAccountType: (accountType, accountName) => `Sandboxes must be created from a production account. Your current default account ${chalk.bold(accountName)} is a ${chalk.bold(accountType)}. \n- Run ${uiCommandReference('hs account use')} to switch to your default account to your production account. \n- Run ${uiAuthCommandReference()} to connect a production account to the HubSpot CLI.\n`,
+                    noSandboxAccountConfig: (accountId) => `No account config found for ${uiAccountDescription(accountId)}. Run ${uiAuthCommandReference()} to add the sandbox account.`,
+                    optionMissing: {
+                        type: 'Type is required when using --force. Use --type=developer or --type=standard.',
+                        name: 'Name is required when using --force. Use --name=YourSandboxName.',
+                    },
+                },
+                options: {
+                    force: {
+                        describe: 'Skips all prompts and uses provided options.',
+                    },
+                    name: {
+                        describe: 'Name of the sandbox account to create',
+                    },
+                    type: {
+                        describe: 'Type of sandbox to create (developer or standard)',
+                    },
+                },
+                examples: {
+                    default: 'Creates a standard sandbox named MySandboxAccount.',
+                },
                 developer: {
                     loading: {
                         add: (accountName) => `Creating developer sandbox ${chalk.bold(accountName)}`,
@@ -1465,11 +1584,11 @@ export const commands = {
                     },
                     failure: {
                         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')}.`,
+                        limit: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} developer sandboxes. \n- To connect a developer sandbox to your HubSpot CLI, run ${uiAuthCommandReference()} 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 account 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                         },
                     },
                 },
@@ -1484,11 +1603,11 @@ export const commands = {
                     },
                     failure: {
                         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')}.`,
+                        limit: (accountName, limit) => `${chalk.bold(accountName)} reached the limit of ${limit} standard sandboxes. \n- To connect a standard sandbox to your HubSpot CLI, run ${uiAuthCommandReference()} 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 account 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                         },
                     },
                 },
@@ -1496,28 +1615,28 @@ export const commands = {
             delete: {
                 describe: 'Delete a sandbox account.',
                 debug: {
-                    deleting: (account) => `Deleting sandbox account "${account}"`,
+                    deleting: (account) => `Deleting sandbox account "${uiAccountDescription(account)}"`,
                     error: 'Error deleting sandbox account:',
                 },
                 examples: {
                     default: 'Deletes the sandbox account named MySandboxAccount.',
                 },
-                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.`,
+                confirm: (account) => `Delete sandbox ${uiAccountDescription(account)}? All data for this sandbox will be permanently deleted.`,
+                defaultAccountWarning: (account) => `The sandbox ${uiAccountDescription(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.`,
                     configFileUpdated: (account, configFilename) => `Removed account ${account} from ${configFilename}.`,
                 },
                 failure: {
-                    invalidUser: (accountName, parentAccountName) => `Couldn't delete ${accountName} because your account has been removed from ${parentAccountName} or your permission set doesn't allow you to delete the sandbox. To update your permissions, contact a super admin in ${parentAccountName}.`,
+                    invalidUser: (account, parentAccount) => `Couldn't delete ${uiAccountDescription(account)} because your account has been removed from ${uiAccountDescription(parentAccount)} or your permission set doesn't allow you to delete the sandbox. To update your permissions, contact a super admin in ${uiAccountDescription(parentAccount)}.`,
                     noAccount: 'No account specified. Specify an account by using the --account flag.',
-                    noSandboxAccounts: (authCommand) => `There are no sandboxes connected to the CLI. To add a sandbox, run ${authCommand}.`,
+                    noSandboxAccounts: `There are no sandboxes connected to the CLI. To add a sandbox, run ${uiAuthCommandReference()}.`,
                     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.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}.`,
+                    noParentAccount: `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 ${uiAuthCommandReference()} and add the parent account.`,
+                    objectNotFound: (account) => `Sandbox ${uiAccountDescription(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 ${uiCommandReference(command)}. You can also delete the sandbox from the HubSpot management tool: ${chalk.bold(url)}.`,
+                    invalidKey: (account) => `Your personal access key for account ${uiAccountDescription(account)} is inactive. To re-authenticate, please run ${uiAuthCommandReference()}.`,
                 },
                 options: {
                     force: {
@@ -1542,7 +1661,13 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
+                },
+            },
+            confirm: {
+                syncContactRecords: {
+                    standard: 'Copy up to 5000 most recently updated contacts? This includes up to 100 of each of the following: associated deals, tickets, and companies.',
+                    developer: 'Include up to 100 most recently updated contacts? This includes up to 100 of each of the following: associated deals, tickets, and companies. This can be done once per sandbox.',
                 },
             },
         },
@@ -1622,7 +1747,7 @@ export const commands = {
                 describe: 'Create a new secret.',
                 errors: {
                     add: (secretName) => `The secret "${secretName}" was not added`,
-                    alreadyExists: (secretName, command) => `The secret "${secretName}" already exists, it's value can be modified with ${command}`,
+                    alreadyExists: (secretName) => `The secret "${secretName}" already exists, it's value can be modified with ${uiCommandReference('hs secret update')}`,
                 },
                 positionals: {
                     name: {
@@ -1630,7 +1755,7 @@ export const commands = {
                     },
                 },
                 success: {
-                    add: (secretName, accountIdentifier) => `The secret "${secretName}" was added to the HubSpot account: ${accountIdentifier}`,
+                    add: (secretName, accountId) => `The secret "${secretName}" was added to the HubSpot account: ${uiAccountDescription(accountId)}`,
                 },
             },
             delete: {
@@ -1648,7 +1773,7 @@ export const commands = {
                     },
                 },
                 success: {
-                    delete: (secretName, accountIdentifier) => `The secret "${secretName}" was deleted from the HubSpot account: ${accountIdentifier}`,
+                    delete: (secretName, accountId) => `The secret "${secretName}" was deleted from the HubSpot account: ${uiAccountDescription(accountId)}`,
                 },
             },
             list: {
@@ -1671,7 +1796,7 @@ export const commands = {
                     },
                 },
                 success: {
-                    update: (secretName, accountIdentifier) => `The secret "${secretName}" was updated in the HubSpot account: ${accountIdentifier}`,
+                    update: (secretName, accountId) => `The secret "${secretName}" was updated in the HubSpot account: ${accountId}`,
                     updateExplanation: 'Existing serverless functions will start using this new value within 10 seconds.',
                 },
             },
@@ -1900,18 +2025,41 @@ export const commands = {
             example: (name) => `Create a test account config file with the name "${name}"`,
         },
         delete: {
-            describe: 'Delete a test account config file.',
+            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: 'Failed to delete test account',
+                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: {
-                testAccountDeleted: (testAccountId) => `Test account with id ${testAccountId} successfully deleted`,
+                testAccountDeletedFromHubSpot: (testAccountToDelete) => `Successfully deleted test account with ID ${testAccountToDelete}`,
+                testAccountDeletedFromConfig: (accountId) => `Successfully deleted test account with ID ${accountId} from the CLI config`,
             },
-            positionals: {
-                testAccountId: 'The id of the test account',
+            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',
             },
-            example: (testAccountId) => `Delete a test account with the id "${testAccountId}"`,
         },
     },
     secrets: {
@@ -1928,7 +2076,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -1945,7 +2093,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -1962,7 +2110,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -1981,7 +2129,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -1998,7 +2146,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2015,7 +2163,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2034,7 +2182,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2051,7 +2199,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2068,7 +2216,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2087,7 +2235,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2104,7 +2252,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2121,7 +2269,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2140,7 +2288,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2157,7 +2305,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2174,7 +2322,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2193,7 +2341,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2210,7 +2358,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2227,7 +2375,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2246,7 +2394,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2263,7 +2411,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2280,7 +2428,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2299,7 +2447,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2316,7 +2464,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2333,7 +2481,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2352,7 +2500,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2369,7 +2517,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2386,7 +2534,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2405,7 +2553,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2422,7 +2570,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2439,7 +2587,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2458,7 +2606,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2475,7 +2623,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2492,7 +2640,7 @@ export const commands = {
                 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -2558,10 +2706,14 @@ export const lib = {
         },
     },
     AppDevModeInterface: {
+        autoInstallStaticAuthApp: {
+            installing: (appName, targetTestAccountId) => `Installing ${chalk.bold(appName)} on account ${uiAccountDescription(targetTestAccountId)}...`,
+            success: (appName, targetTestAccountId) => `Successfully installed ${chalk.bold(appName)} on account ${uiAccountDescription(targetTestAccountId)}\n`,
+            error: (appName, targetTestAccountId) => `Error installing ${chalk.bold(appName)} on account ${uiAccountDescription(targetTestAccountId)}. You may still be able to install your app in your browser.`,
+        },
         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)}`,
@@ -2571,6 +2723,12 @@ export const lib = {
         },
         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.`,
+        installationFailed: 'An error occured while installing your app. Your app must be installed in your target test account to proceed with local development.',
+        waitUntilAppIsInstalled: {
+            link: (installUrl) => `${uiLink('Install your app', installUrl)} to proceed with local development\n`,
+            waiting: 'Waiting for your app to be installed...',
+            success: (appName, accountId) => `Your app ${chalk.bold(appName)} has been installed successfully on account ${uiAccountDescription(accountId)}\n`,
+        },
     },
     LocalDevWebsocketServer: {
         errors: {
@@ -2588,8 +2746,13 @@ export const lib = {
     LocalDevProcess: {
         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: {
         project: {
@@ -2598,7 +2761,7 @@ export const lib = {
                 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.`,
+                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.`,
@@ -2614,37 +2777,42 @@ export const lib = {
                 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.`,
             },
+            checkAndInstallDependencies: {
+                checkingDependencies: 'Checking for missing or updated dependencies...',
+                dependenciesUpToDate: 'All dependencies are up to date',
+                dependenciesFailure: 'Failed to check or install dependencies',
+            },
         },
         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')}.`,
+                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 account use')}, or link a new account with ${uiAuthCommandReference()}.`,
+                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 account use')}, or link a new account with ${uiAuthCommandReference()}.`,
             },
             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.`,
+                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 account 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 account use')}.`,
+                nonSandboxWarning: `Testing in a sandbox is strongly recommended. To switch the target account, select an option below or run ${uiCommandReference('hs account 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}.`,
+                notAuthedError: (parentAccountId, accountIdentifier) => `To develop this project locally, run ${uiAuthCommandReference({ accountId: parentAccountId })} to authenticate the App Developer Account ${parentAccountId} associated with ${accountIdentifier}.`,
             },
             selectAccountTypePrompt: {
-                message: '[--testing-account] Choose the type of account to test on',
+                message: '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')}.`,
+                configError: `An error occurred while reading the default account from your config. Run ${uiAuthCommandReference()} to re-auth this account`,
+                declineDefaultAccountExplanation: `To develop on a different account, run ${uiCommandReference('hs account use')} to change your default account, then re-run ${uiCommandReference('hs project dev')}.`,
             },
         },
     },
     middleware: {
         updateNotification: {
-            notifyTitle: chalk.bold('Update available'),
+            notifyTitle: chalk.bold('CLI 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}'))}`,
         },
@@ -2755,6 +2923,7 @@ export const lib = {
             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: {
@@ -2771,13 +2940,15 @@ export const lib = {
         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.bold('[BETA]'),
+        betaTag: '[BETA]',
+        betaTagWithStyle: chalk.bold('[BETA]'),
         betaWarning: {
             header: chalk.yellow('***************************** WARNING ****************************'),
             footer: chalk.yellow('******************************************************************'),
         },
         infoTag: chalk.bold('[INFO]'),
-        deprecatedTag: chalk.bold('[DEPRECATED]'),
+        deprecatedTag: '[DEPRECATED]',
+        deprecatedTagWithStyle: 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}`,
@@ -2796,7 +2967,7 @@ export const lib = {
                     message: (command) => `${command} - See a list of configured HubSpot accounts`,
                 },
                 accountsUseCommand: {
-                    command: 'hs accounts use',
+                    command: 'hs account use',
                     message: (command) => `${command} - Set the Hubspot account that the CLI will target by default`,
                 },
                 authCommand: {
@@ -2835,6 +3006,9 @@ export const lib = {
                     command: 'hs project install-deps',
                     message: (command) => `${command} - Install all project dependencies`,
                 },
+                projectCommandTip: {
+                    message: 'Tip: All project commands must be run from within a project directory',
+                },
                 sampleProjects: {
                     linkText: "HubSpot's sample projects",
                     url: 'https://developers.hubspot.com/docs/platform/sample-projects?utm_source=cli&utm_content=project_create_whats_next',
@@ -2858,7 +3032,7 @@ export const lib = {
         },
     },
     buildAccount: {
-        createDeveloperTestAccountV3: {
+        createDeveloperTestAccountV2: {
             syncFailure: 'Failed to sync developer test account',
             pakFailure: 'Failed to generate personal access key for developer test account',
         },
@@ -2873,25 +3047,26 @@ export const 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: 'Auto opening your browser has been enabled',
-            disabled: 'Auto opening your browser has been disabled',
+            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: {
@@ -2921,6 +3096,21 @@ export const lib = {
             mergeConflictMessage: (count, propertyList) => `Conflict${count > 1 ? 's' : ''} detected for ${chalk.bold(propertyList)}.`,
             mergeConfigConflictPrompt: (property, newValue, oldValue) => `Change ${property} from ${newValue} to ${oldValue}?`,
         },
+        handleAccountNameConflicts: {
+            warnings: {
+                accountNameConflictMessage: (count) => `${count} account name conflict${count > 1 ? 's' : ''} detected.`,
+                forceFlagDetected: (count, renameDetails) => `Force flag detected. Automatically renaming ${count} account${count > 1 ? 's' : ''} with duplicate name${count > 1 ? 's' : ''}:\n${renameDetails}`,
+            },
+            prompts: {
+                renameOrOmitAccountPrompt: (accountName, accountId) => `Local account name="${accountName}" (ID: ${accountId}) conflicts with an existing global account.\nRename the local account to include it in the merge? If not, it will be skipped.`,
+                newAccountNamePrompt: (accountName, portalId) => `Enter a new name for the local account [ID: ${portalId}] (currently named "${accountName}"):`,
+            },
+            errors: {
+                nameRequired: 'The name may not be blank. Please add a name for the config.',
+                sameName: 'The new account name must be different from the current name.',
+                nameAlreadyInConfig: (name) => `The name "${name}" is already used by another account.`,
+            },
+        },
         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?',
@@ -2929,6 +3119,11 @@ export const lib = {
         },
     },
     prompts: {
+        promptUtils: {
+            errors: {
+                noSelectableChoices: 'Exiting prompt because no selectable choices are available',
+            },
+        },
         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.',
@@ -2945,10 +3140,10 @@ export const lib = {
         projectDevTargetAccountPrompt: {
             createNewSandboxOption: '<Test on a new development sandbox>',
             createNewDeveloperTestAccountOption: '<Test on a new developer test account>',
-            chooseDefaultAccountOption: () => `<${chalk.bold('❗')} Test on this production account ${chalk.bold('❗')}>`,
-            promptMessage: (accountType, accountIdentifier) => `[--account] Choose a ${accountType} under ${accountIdentifier} to test with:`,
+            chooseDefaultAccountOption: `<${chalk.bold('❗')} Test on this production account ${chalk.bold('❗')}>`,
+            promptMessage: (accountType, accountIdentifier) => `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.`,
+            sandboxLimitWithSuggestion: (limit) => `Your account reached the limit of ${limit} development sandboxes. Run ${uiAuthCommandReference()} 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.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.`,
@@ -3088,8 +3283,8 @@ export const lib = {
             selectAppIdClone: (accountName) => `[--appId] Choose an app under ${accountName} to clone:`,
             errors: {
                 noAccountId: 'An account ID is required to select an app.',
-                noAppsMigration: () => `${chalk.bold('No apps to migrate')}`,
-                noAppsClone: () => `${chalk.bold('No apps to clone')}`,
+                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.',
@@ -3105,10 +3300,12 @@ export const lib = {
         },
         projectAddPrompt: {
             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',
+                noSelectableChoices: 'There are no available features that can be added to this project',
                 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}`,
             },
@@ -3144,7 +3341,7 @@ export const lib = {
             enterName: '[--project] Enter project name:',
             errors: {
                 invalidName: 'You entered an invalid name. Please try again.',
-                projectDoesNotExist: (projectName, accountIdentifier) => `Project ${chalk.bold(projectName)} could not be found in "${accountIdentifier}"`,
+                projectDoesNotExist: (projectName, accountId) => `Project ${chalk.bold(projectName)} could not be found in "${uiAccountDescription(accountId)}"`,
             },
         },
         previewPrompt: {
@@ -3159,7 +3356,6 @@ export const lib = {
         installAppPrompt: {
             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?',
@@ -3204,11 +3400,11 @@ export const lib = {
             },
             failure: {
                 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')}.`,
+                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 ${uiAuthCommandReference()} 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 ${uiCommandReference('hs account 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.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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -3225,14 +3421,13 @@ export const lib = {
                     configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
                 },
                 failure: {
-                    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')}.`,
+                    limit: (accountId, limit, link) => `${uiAccountDescription(accountId)} reached the limit of ${limit} developer sandboxes. \n- View sandbox details at ${uiLink('View sandbox details at', link)} \n- To connect a developer sandbox to your HubSpot CLI, run ${uiAuthCommandReference()} and follow the prompts.`,
+                    alreadyInConfig: (accountId, limit) => `${uiAccountDescription(accountId)} reached the limit of ${limit} developer sandboxes. \n- To use an existing developer sandbox, run ${uiCommandReference('hs account use')}. \n- To delete an existing sandbox, run ${uiCommandReference('hs sandbox delete')}.`,
+                    generic: 'An error occurred while creating a developer sandbox',
                     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.bold('hs auth')} and entering the new key.\n`,
+                        instructions: (account, url) => `To update CLI permissions for "${chalk.bold(account)}": \n- ${uiLink('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 ${uiAuthCommandReference()} and entering the new key.\n`,
                     },
-                    generic: 'An error occurred while creating a developer sandbox',
                 },
             },
             standard: {
@@ -3245,30 +3440,54 @@ export const lib = {
                     configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
                 },
                 failure: {
-                    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')}.`,
+                    limit: (accountId, limit, link) => `${uiAccountDescription(accountId)} reached the limit of ${limit} standard sandboxes.\n- View sandbox details at ${uiLink('View sandbox details at', link)} \n- To connect a standard sandbox to your HubSpot CLI, run ${uiAuthCommandReference()} and follow the prompts.`,
+                    alreadyInConfig: (accountId, limit) => `${uiAccountDescription(accountId)} reached the limit of ${limit} standard sandboxes. \n- To use an existing standard sandbox, run ${uiCommandReference('hs account use')}. \n- To delete an existing sandbox, run ${uiCommandReference('hs sandbox delete')}.`,
                     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.bold('hs auth')} and entering the new key.\n`,
+                        instructions: (account, url) => `To update CLI permissions for "${chalk.bold(account)}": \n- ${uiLink('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 ${uiAuthCommandReference()} and entering the new key.\n`,
                     },
                 },
             },
+            failure: {
+                usageLimitsFetch: 'Unable to fetch sandbox usage limits. Please try again.',
+                scopes: {
+                    message: "The personal access key you provided doesn't include sandbox permissions.",
+                    instructions: (account, url) => `To update CLI permissions for "${chalk.bold(account)}": \n- Go to ${url}, deactivate the existing personal access key, and create a new one that includes Sandbox permissions. \n- Update the CLI config for this account by running ${uiAuthCommandReference()} and entering the new key.\n`,
+                },
+                invalidUser: (accountName, parentAccountId) => `Couldn't create ${chalk.bold(accountName)} because your account has been removed from ${uiAccountDescription(parentAccountId)} or your permission set doesn't allow you to create the sandbox. To update your permissions, contact a super admin in ${uiAccountDescription(parentAccountId)}.`,
+                '403Gating': (accountName, parentAccountId) => `We couldn't create ${chalk.bold(accountName)} because ${uiAccountDescription(parentAccountId)} is a developer account and does not have access to development sandboxes. To gain access to developer sandboxes, you can ${uiLink('convert your account', 'https://developers.hubspot.com/docs/getting-started/convert-your-account-into-a-developer-crm-account')}.`,
+            },
         },
         sync: {
+            info: {
+                syncMessage: (url) => `Asset sync from production to the sandbox is in progress and is running in the background. It may take some time. ${uiLink('View sync status details here', url)}`,
+                syncMessageDevSb: (url) => `Sync of object definitions from production to the sandbox is in progress and is running in the background. It may take some time. ${url}`,
+            },
+            confirm: {
+                syncContactRecords: {
+                    standard: 'Do you want to sync contact records from your production account?',
+                },
+            },
             loading: {
                 add: (accountName) => `Syncing sandbox ${chalk.bold(accountName)}`,
-                fail: (accountName) => `Failed to sync sandbox ${chalk.bold(accountName)}.`,
-                succeed: (accountName) => `Successfully synced sandbox ${chalk.bold(accountName)}.`,
+                fail: (accountId) => `Failed to sync sandbox ${uiAccountDescription(accountId)}.`,
+                succeed: (accountId) => `Successfully synced sandbox ${uiAccountDescription(accountId)}.`,
+                startSync: 'Initiating sync...',
+                succeedDevSb: (accountId) => `Initiated sync of object definitions from production to ${uiAccountDescription(accountId)}`,
+                successDevSbInfo: (accountId, url) => `Initiated sync of object definitions from production to ${uiAccountDescription(accountId)}. It may take some time. ${url}`,
             },
             success: {
                 configFileUpdated: (accountName, authType) => `Account "${accountName}" updated using "${authType}"`,
             },
             failure: {
+                syncTypeFetch: 'Unable to fetch available sandbox sync types. Please try again.',
                 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)}.`,
+                syncInProgress: (url) => `Couldn't run the sync because there's another sync in progress. Wait for the current sync to finish and then try again. To check the sync status, visit the sync activity log: ${url}.`,
+                notSuperAdmin: (accountId) => `Couldn't run the sync because you are not a super admin in ${uiAccountDescription(accountId)}. Ask the account owner for super admin access to the sandbox.`,
+                objectNotFound: (accountId) => `Couldn't sync the sandbox because ${uiAccountDescription(accountId)} may have been deleted through the UI. Run ${uiCommandReference('hs sandbox delete')} to remove this account from the config.`,
                 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.bold('hs auth')} and entering the new key.\n`,
+                    instructions: (accountName, url) => `To update CLI permissions for "${accountName}": \n- ${uiLink('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 ${uiAuthCommandReference()} and entering the new key.\n`,
                 },
             },
         },
@@ -3279,6 +3498,8 @@ export const lib = {
             errorContext: (context) => `Context: ${context}`,
             errorCause: (cause) => `Cause: ${cause}`,
             unknownErrorOccurred: 'An unknown error has occurred.',
+            configTimeoutErrorOccurred: (timeout, configSetCommand) => `This error occurred because a request exceeded the default HTTP timeout of ${timeout}ms. To increase the default HTTP timeout, run ${uiCommandReference(configSetCommand)}.`,
+            genericTimeoutErrorOccurred: 'This error occurred because an HTTP request timed out. Re-running the command may resolve this issue.',
         },
         suppressErrors: {
             platformVersionErrors: {
@@ -3290,7 +3511,7 @@ export const lib = {
                 docsLink: 'Projects platform versioning (BETA)',
                 betaLink: (docsLink) => `For more info, see ${docsLink}.`,
             },
-            missingScopeError: (request, accountName, authCommand) => `Couldn't execute the ${request} because the access key for ${accountName} is missing required scopes. To update scopes, run ${authCommand}. Then deactivate the existing key and generate a new one that includes the missing scopes.`,
+            missingScopeError: (request, accountName) => `Couldn't execute the ${request} because the access key for ${accountName} is missing required scopes. To update scopes, run ${uiAuthCommandReference()}. Then deactivate the existing key and generate a new one that includes the missing scopes.`,
         },
     },
     serverless: {
@@ -3298,7 +3519,7 @@ export const lib = {
             fetchScopeDataError: (scopeGroup) => `Error verifying access of scopeGroup ${scopeGroup}:`,
             portalMissingScope: 'Your account does not have access to this action. Talk to an account admin to request it.',
             userMissingScope: "You don't have access to this action. Ask an account admin to change your permissions in Users & Teams settings.",
-            genericMissingScope: 'Your access key does not allow this action. Please generate a new access key by running `hs auth personalaccesskey`.',
+            genericMissingScope: `Your access key does not allow this action. Please generate a new access key by running ${uiAuthCommandReference()}.`,
         },
     },
     doctor: {
@@ -3307,13 +3528,13 @@ export const lib = {
         accountChecks: {
             active: 'Default account active',
             inactive: "Default account isn't active",
-            inactiveSecondary: (command) => `Run ${command} to remove inactive accounts from your CLI config`,
+            inactiveSecondary: (command) => `Run ${uiCommandReference(command)} to remove inactive accounts from your CLI config`,
             unableToDetermine: 'Unable to determine if the portal is active',
             pak: {
                 incomplete: 'Personal access key is valid, but there are more scopes available to your user that are not included in your key.',
-                incompleteSecondary: (command, link) => `To add the available scopes, run ${command} and re-authenticate your account with a new key that has those scopes. Visit HubSpot to view selected and available scopes for your personal access key. ${link}`,
+                incompleteSecondary: (link) => `To add the available scopes, run ${uiAuthCommandReference()} and re-authenticate your account with a new key that has those scopes. Visit HubSpot to view selected and available scopes for your personal access key. ${link}`,
                 invalid: 'Personal access key is invalid',
-                invalidSecondary: (command) => `To get a new key, run ${command}, deactivate your access key, and generate a new one. Then use that new key to authenticate your account.`,
+                invalidSecondary: `To get a new key, run ${uiAuthCommandReference()}, deactivate your access key, and generate a new one. Then use that new key to authenticate your account.`,
                 valid: (link) => `Personal Access Key is valid. ${link}`,
                 viewScopes: 'View selected scopes',
             },
@@ -3330,25 +3551,24 @@ export const lib = {
         },
         hsChecks: {
             notLatest: (hsVersion) => `Version ${hsVersion} outdated`,
-            notLatestSecondary: (command, hsVersion) => `Run ${command} to upgrade to the latest version ${hsVersion}`,
+            notLatestSecondary: (command, hsVersion) => `Run ${uiCommandReference(command)} to upgrade to the latest version ${hsVersion}`,
             latest: (hsVersion) => `HubSpot CLI v${hsVersion} up to date`,
             unableToDetermine: 'Unable to determine if HubSpot CLI is up to date.',
-            unableToDetermineSecondary: (command, link) => `Run ${command} to check your installed version; then visit the ${link} to validate whether you have the latest version`,
-            unableToDetermineSecondaryLink: 'npm HubSpot CLI version history',
+            unableToDetermineSecondary: (command, link) => `Run ${uiCommandReference(command)} to check your installed version; then visit the ${uiLink('npm HubSpot CLI version history', link)} to validate whether you have the latest version`,
         },
         projectDependenciesChecks: {
             missingDependencies: (dir) => `missing dependencies in ${chalk.bold(dir)}`,
-            missingDependenciesSecondary: (command) => `Run ${command} to install all project dependencies locally`,
+            missingDependenciesSecondary: (command) => `Run ${uiCommandReference(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.bold(filename)}`,
+            invalidJson: (filename) => `Invalid JSON in ${chalk.bold(filename)}`,
             validJson: 'JSON files valid',
         },
         port: {
             inUse: (port) => `Port ${port} is in use`,
-            inUseSecondary: (command) => `Make sure it is available before running ${command}`,
+            inUseSecondary: (command) => `Make sure it is available before running ${uiCommandReference(command)}`,
             available: (port) => `Port ${port} available for local development`,
         },
         diagnosis: {
@@ -3360,28 +3580,59 @@ export const lib = {
                 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`,
+                noConfigFileSecondary: (command) => `Run ${uiCommandReference(command)} and follow the prompts to create your CLI configuration file and connect it to your HubSpot account`,
+                settings: {
+                    httpUseLocalhost: `The setting ${chalk.bold('httpUseLocalhost')} is enabled`,
+                    httpUseLocalhostSecondary: 'This setting causes all CLI requests to route to localhost',
+                },
             },
             projectConfig: {
                 header: 'Project configuration',
                 projectDirSubHeader: (projectDir) => `Project dir: ${chalk.bold(projectDir)}`,
                 projectNameSubHeader: (projectName) => `Project name: ${chalk.bold(projectName)}`,
             },
+            defaultAccountOverrideFile: {
+                header: 'Default account override file path:',
+            },
             counts: {
                 errors: (count) => `${chalk.bold('Errors:')} ${count}`,
                 warnings: (count) => `${chalk.bold('Warning:')} ${count}`,
             },
         },
+        defaultAccountOverrideFileChecks: {
+            overrideActive: (defaultAccountOverrideFile) => `Default account override file is active: ${defaultAccountOverrideFile}`,
+            overrideAccountId: (overrideAccountId) => `Active account ID: ${overrideAccountId}`,
+        },
     },
     oauth: {
         missingClientId: 'Error building oauth URL: missing client ID.',
     },
+    validation: {
+        accountNotFoundInConfig: (userProvidedAccount) => `The account "${userProvidedAccount}" could not be found in the config`,
+        accountRequired: 'An account needs to be supplied either via "--account" or through setting a "defaultPortal"',
+        userProvidedAccount: 'Cannot specify an account when environment variables are supplied. Please unset the environment variables or do not use the "--account" flag.',
+        accountNotConfigured: (accountId) => `The account ${uiAccountDescription(accountId)} has not been configured`,
+        invalidAuthType: (authType, accountId, configPath, validValues) => `Invalid "authType" value "${authType}" for account "${uiAccountDescription(accountId)}" in config file: ${configPath}. Valid values are ${validValues}.`,
+        oauth2ConfigMissing: (accountId) => `The OAuth2 auth configuration for account ${uiAccountDescription(accountId)} is missing`,
+        oauth2ConfigIncorrect: (accountId) => `The OAuth2 configuration for account ${uiAccountDescription(accountId)} is incorrect \n Run ${uiCommandReference('hs auth --auth-type=oauth2')} to reauthenticate`,
+        oauth2AccessTokenNotFound: (accountId) => `The OAuth2 access token could not be found for accountId ${uiAccountDescription(accountId)}`,
+        personalAccessKeyMissing: (accountId) => `The account "${uiAccountDescription(accountId)}" is configured to use a access key for authentication and is missing a "personalAccessKey" in the configuration file`,
+        personalAccessKeyTokenRetrievalFailed: (accountId) => `An OAuth2 access token for account "${uiAccountDescription(accountId)} could not be retrieved using the "personalAccessKey" provided`,
+        authConfigurationMissing: (accountId) => `The accountId ${uiAccountDescription(accountId)} is missing authentication configuration`,
+        availableCMSModes: (modes) => `Available CMS publish modes are: ${modes}`,
+        invalidCmsPublishMode: (cmsPublishMode, modesMessage) => `The CMS publish mode "${cmsPublishMode}" is invalid. ${modesMessage}`,
+        missingCmsPublishMode: (modesMessage) => `The CMS publish mode option is missing. ${modesMessage}`,
+        pathNotFile: (path) => `The path "${path}" is not a path to a file`,
+        fileNotJson: (path) => `The file "${path}" must be a valid JSON file`,
+        fileInvalidJson: (path) => `The file "${path}" contains invalid JSON`,
+    },
     migrate: {
         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: 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')}`,
@@ -3408,7 +3659,7 @@ export const lib = {
             },
             noAppsEligible: (accountId, reasons) => `No apps in account ${accountId} are currently migratable${reasons.length ? `\n  - ${reasons.join('\n  - ')}` : ''}`,
             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.`,
+            invalidAccountTypeDescription: (useCommand) => `Only public apps created in a developer account can be converted to a project component. Select a connected developer account with ${useCommand} or ${uiAuthCommandReference()} and try again.`,
             appWithAppIdNotFound: (appId) => `Could not find an app with the id ${appId} `,
             noAppsForProject: (projectName) => `No apps associated with project ${projectName}`,
             migrationFailed: 'Migration Failed',