@hubspot/cli 7.8.12-experimental.1 → 7.9.0-beta.1

package/lang/en.js

@@ -4,7 +4,7 @@ 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, uiAuthCommandReference, } from '../lib/ui/index.js';
-import { getProjectDetailUrl, getProjectSettingsUrl, getLocalDevUiUrl, getAppAllowlistUrl, } from '../lib/projects/urls.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';
@@ -329,8 +329,299 @@ export const commands = {
         },
     },
     cms: {
-        describe: 'Commands for working with the CMS.',
+        describe: 'Commands for managing CMS assets.',
         subcommands: {
+            template: {
+                describe: 'Commands for managing templates.',
+                subcommands: {
+                    create: {
+                        describe: 'Create a new CMS template.',
+                        errors: {
+                            unusablePath: (path) => `The "${path}" is not a usable path to a directory.`,
+                        },
+                        positionals: {
+                            name: 'Name of the new template.',
+                            dest: 'Destination folder for the new template.',
+                        },
+                        options: {
+                            templateType: 'Template type for template creation.',
+                        },
+                    },
+                },
+            },
+            webpack: {
+                describe: 'Commands for managing webpack.',
+                subcommands: {
+                    create: {
+                        describe: 'Create a new webpack bundle.',
+                        errors: {
+                            unusablePath: (path) => `The "${path}" is not a usable path to a directory.`,
+                        },
+                        positionals: {
+                            dest: 'Destination folder for the new webpack bundle.',
+                        },
+                    },
+                },
+            },
+            theme: {
+                describe: 'Commands for managing themes.',
+                subcommands: {
+                    create: {
+                        describe: 'Create a new theme.',
+                        errors: {
+                            unusablePath: (path) => `The "${path}" is not a usable path to a directory.`,
+                        },
+                        positionals: {
+                            dest: 'Destination folder for the new theme.',
+                        },
+                    },
+                    generateSelectors: {
+                        describe: 'Automatically generates an editor-preview.json file for the given theme. The selectors this command generates are not perfect, so please edit editor-preview.json after running.',
+                        errors: {
+                            invalidPath: (themePath) => `Could not find directory "${themePath}"`,
+                            fieldsNotFound: "Unable to find theme's fields.json.",
+                            noSelectorsFound: 'No selectors found.',
+                        },
+                        success: (themePath, selectorsPath) => `Selectors generated for ${themePath}, please double check the selectors generated at ${selectorsPath} before uploading the theme.`,
+                        positionals: {
+                            path: "The path of the theme you'd like to generate an editor-preview.json for.",
+                        },
+                    },
+                    marketplaceValidate: {
+                        describe: 'Validate a theme for the marketplace.',
+                        errors: {
+                            invalidPath: (path) => `The path "${path}" is not a path to a folder in the Design Manager`,
+                        },
+                        logs: {
+                            validatingTheme: (path) => `Validating theme "${path}" \n`,
+                        },
+                        results: {
+                            required: 'Required validation results:',
+                            recommended: 'Recommended validation results:',
+                            warnings: {
+                                file: (file) => `File: ${file}`,
+                                lineNumber: (line) => `Line number: ${line}`,
+                            },
+                            noErrors: 'No errors',
+                        },
+                        positionals: {
+                            path: {
+                                describe: 'Path to the theme within the Design Manager.',
+                            },
+                        },
+                    },
+                    preview: {
+                        describe: 'Upload and watch a theme directory on your computer for changes and start a local development server to preview theme changes on a site.',
+                        errors: {
+                            invalidPath: (path) => `The path "${path}" is not a path to a directory`,
+                            noThemeComponents: 'Your project has no theme components available to preview.',
+                            uploadFailed: (src, dest) => `Uploading file "${src}" to "${dest}" failed`,
+                        },
+                        positionals: {
+                            src: 'Path to the local directory your theme is in, relative to your current working directory',
+                            dest: 'Path in HubSpot Design Tools. Can be a net new path. If you wish to preview a site page using your theme changes it must match the path of the theme used by the site.',
+                        },
+                        options: {
+                            notify: 'Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file',
+                            noSsl: 'Disable HTTPS',
+                            port: 'The port on which to start the local server',
+                        },
+                        initialUploadProgressBar: {
+                            start: 'Starting...',
+                            uploading: 'Uploading...',
+                            finish: 'Complete!',
+                        },
+                        logs: {
+                            processExited: 'Stopping dev server...',
+                        },
+                    },
+                },
+            },
+            app: {
+                describe: 'Commands for managing CMS apps.',
+                subcommands: {
+                    create: {
+                        describe: 'Create a new CMS app.',
+                        errors: {
+                            unsupportedAssetType: (assetType, supportedAssetTypes) => `The asset type ${assetType} is not supported. Supported asset types are ${supportedAssetTypes}.`,
+                            unusablePath: (path) => `The "${path}" is not a usable path to a directory.`,
+                        },
+                        positionals: {
+                            type: 'Type of the new app.',
+                            name: 'Name of the new app.',
+                            dest: 'Destination folder for the new app.',
+                        },
+                    },
+                },
+            },
+            list: {
+                describe: 'List remote contents of a directory in the HubSpot CMS.',
+                gettingPathContents: (path) => `Getting contents of ${path}.`,
+                noFilesFoundAtPath: (path) => `No files found in ${path}.`,
+                positionals: {
+                    path: {
+                        describe: 'Remote directory to list contents',
+                    },
+                },
+            },
+            module: {
+                describe: 'Commands for working with modules, including marketplace validation with the marketplace-validate subcommand.',
+                subcommands: {
+                    create: {
+                        describe: 'Create a new CMS module.',
+                        errors: {
+                            unusablePath: (path) => `The "${path}" is not a usable path to a directory.`,
+                        },
+                        positionals: {
+                            name: 'Name of the new module.',
+                            dest: 'Destination folder for the new module.',
+                        },
+                        options: {
+                            moduleLabel: 'Label for the new module.',
+                            reactType: 'Whether to create a React module.',
+                            contentTypes: (contentTypes) => `Content types where the module can be used (${contentTypes.join(', ')}).`,
+                            global: 'Whether to create a global module.',
+                            availableForNewContent: 'Whether to create a module available for new content.',
+                        },
+                    },
+                    marketplaceValidate: {
+                        describe: 'Validate a module for the marketplace. Make sure to include the suffix .module in the path to the module within the Design Manager.',
+                        errors: {
+                            invalidPath: (path) => `The path "${path}" is not a path to a module within the Design Manager.`,
+                        },
+                        logs: {
+                            validatingModule: (path) => `Validating module "${path}" \n`,
+                        },
+                        results: {
+                            required: 'Required validation results:',
+                            recommended: 'Recommended validation results:',
+                            warnings: {
+                                file: (file) => `File: ${file}`,
+                                lineNumber: (line) => `Line number: ${line}`,
+                            },
+                            noErrors: 'No errors',
+                        },
+                        positionals: {
+                            src: 'Path to the module within the Design Manager.',
+                        },
+                    },
+                },
+            },
+            upload: {
+                describe: 'Upload a folder or file from your computer to the HubSpot CMS.',
+                errors: {
+                    destinationRequired: 'A destination path needs to be passed',
+                    fileIgnored: (path) => `The file "${path}" is being ignored via an .hsignore rule`,
+                    invalidPath: (path) => `The path "${path}" is not a path to a file or folder`,
+                    uploadFailed: (src, dest) => `Uploading file "${src}" to "${dest}" failed`,
+                    someFilesFailed: (dest) => `One or more files failed to upload to "${dest}" in the Design Manager`,
+                    deleteFailed: (path, accountId) => `Deleting "${path}" from account ${uiAccountDescription(accountId)} failed`,
+                },
+                options: {
+                    options: 'Options to pass to javascript fields files',
+                    saveOutput: "If true, saves all output from javascript fields files as 'fields.output.json'.",
+                    convertFields: 'If true, converts any javascript fields files contained in module folder or project root.',
+                    clean: 'Will delete the destination directory and its contents before uploading. This will also clear the global content associated with any global partial templates and modules.',
+                    force: 'Skips confirmation prompts when doing a clean upload.',
+                },
+                previewUrl: (previewUrl) => `To preview this theme, visit: ${previewUrl}`,
+                positionals: {
+                    src: 'Path to the local file, relative to your current working directory.',
+                    dest: 'Path in HubSpot Design Tools, can be a net new path.',
+                },
+                success: {
+                    fileUploaded: (src, dest, accountId) => `Uploaded file from "${src}" to "${dest}" in the Design Manager of account ${uiAccountDescription(accountId)}`,
+                    uploadComplete: (dest) => `Uploading files to "${dest}" in the Design Manager is complete`,
+                },
+                uploading: (src, dest, accountId) => `Uploading files from "${src}" to "${dest}" in the Design Manager of account ${uiAccountDescription(accountId)}`,
+                notUploaded: (src) => `There was an error processing "${src}". The file has not been uploaded.`,
+                cleaning: (filePath, accountId) => `Removing "${filePath}" from account ${uiAccountDescription(accountId)} and uploading local...`,
+                confirmCleanUpload: (filePath, accountId) => `You are about to delete the directory "${filePath}" and its contents on HubSpot account ${uiAccountDescription(accountId)} before uploading. This will also clear the global content associated with any global partial templates and modules. Are you sure you want to do this?`,
+            },
+            delete: {
+                describe: 'Delete a file or folder from the HubSpot CMS.',
+                deleted: (path, accountId) => `Deleted "${path}" from account ${uiAccountDescription(accountId)}`,
+                errors: {
+                    deleteFailed: (path, accountId) => `Deleting "${path}" from account ${uiAccountDescription(accountId)} failed`,
+                },
+                positionals: {
+                    path: 'Remote hubspot path',
+                },
+            },
+            watch: {
+                describe: 'Watch a directory on your computer for changes and upload the changed files to the HubSpot CMS.',
+                errors: {
+                    folderFailed: (src, dest, accountId) => `Initial uploading of folder "${src}" to "${dest}" in account ${uiAccountDescription(accountId)} had failures`,
+                    fileFailed: (file, dest, accountId) => `Upload of file "${file}" to "${dest}" in account ${uiAccountDescription(accountId)} failed`,
+                    destinationRequired: 'A destination directory needs to be passed',
+                    invalidPath: (path) => `The "${path}" is not a path to a directory`,
+                },
+                options: {
+                    disableInitial: 'Disable the initial upload when watching a directory (default)',
+                    initialUpload: 'Upload directory before watching for updates',
+                    notify: 'Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file',
+                    remove: 'Will cause watch to delete files in your HubSpot account that are not found locally.',
+                    convertFields: 'If true, converts any javascript fields files contained in module folder or project root.',
+                    saveOutput: "If true, saves all output from javascript fields files as 'fields.output.json'.",
+                    options: 'Options to pass to javascript fields files',
+                },
+                positionals: {
+                    src: 'Path to the local directory your files are in, relative to your current working directory',
+                    dest: 'Path in HubSpot Design Tools. Can be a net new path',
+                },
+                warnings: {
+                    disableInitial: `Passing the "${chalk.bold('--disable-initial')}" option is no longer necessary. Running "${uiCommandReference('hs watch')}" no longer uploads the watched directory by default.`,
+                    initialUpload: `To upload the directory run "${uiCommandReference('hs upload')}" beforehand or add the "${chalk.bold('--initial-upload')}" option when running "${uiCommandReference('hs watch')}".`,
+                    notUploaded: (path) => `The "${uiCommandReference('hs watch')}" command no longer uploads the watched directory when started. The directory "${path}" was not uploaded.`,
+                },
+            },
+            fetch: {
+                describe: 'Fetch a file, directory or module from HubSpot and write to a path on your computer.',
+                errors: {
+                    sourceRequired: 'A source to fetch is required.',
+                },
+                options: {
+                    staging: {
+                        describe: 'Retrieve staged changes for project',
+                    },
+                    assetVersion: {
+                        describe: 'Specify what version of a default asset to fetch',
+                    },
+                },
+                positionals: {
+                    dest: {
+                        describe: 'Local directory you would like the files to be placed in, relative to your current working directory',
+                    },
+                    src: {
+                        describe: 'Path in HubSpot Design Tools',
+                    },
+                },
+            },
+            lint: {
+                issuesFound: (count) => `${count} issues found.`,
+                groupName: (path) => `Linting ${path}`,
+                positionals: {
+                    path: {
+                        describe: 'Local folder to lint',
+                    },
+                },
+            },
+            mv: {
+                describe: 'Move a remote file or folder in HubSpot. This feature is currently in beta and the CLI contract is subject to change.',
+                errors: {
+                    sourcePathExists: (srcPath, destPath) => `The folder "${srcPath}" already exists in "${destPath}".`,
+                    moveFailed: (srcPath, destPath, accountId) => `Moving "${srcPath}" to "${destPath}" in account ${accountId} failed`,
+                },
+                move: (srcPath, destPath, accountId) => `Moved "${srcPath}" to "${destPath}" in account ${accountId}`,
+                positionals: {
+                    srcPath: {
+                        describe: 'Remote hubspot path',
+                    },
+                    destPath: {
+                        describe: 'Remote hubspot path',
+                    },
+                },
+            },
             lighthouseScore: {
                 describe: 'Score a theme using Google lighthouse.',
                 examples: {
@@ -387,6 +678,124 @@ export const commands = {
                     invalidName: 'Module not found with that name, please check the spelling of the module you are trying to download.',
                 },
             },
+            function: {
+                describe: 'Commands for managing CMS serverless functions.',
+                subcommands: {
+                    create: {
+                        describe: 'Create a new CMS serverless function.',
+                        errors: {
+                            unusablePath: (path) => `The "${path}" is not a usable path to a directory.`,
+                        },
+                        positionals: {
+                            name: 'Name of the function',
+                            dest: 'Destination folder for the function',
+                        },
+                        options: {
+                            functionsFolder: 'Folder to create functions in',
+                            filename: 'Filename for the function',
+                            endpointMethod: 'HTTP method for the function endpoint',
+                            endpointPath: 'API endpoint path for the function',
+                        },
+                    },
+                    logs: {
+                        describe: 'View logs for a CMS serverless function.',
+                        errors: {
+                            noLogsFound: (functionPath, accountId) => `No logs were found for the function path "${functionPath}" in account "${accountId}".`,
+                        },
+                        examples: {
+                            default: 'Get 5 most recent logs for function residing at /_hcms/api/my-endpoint',
+                            follow: 'Poll for and output logs for function residing at /_hcms/api/my-endpoint immediately upon new execution',
+                            limit: 'Get 10 most recent logs for function residing at /_hcms/api/my-endpoint',
+                        },
+                        endpointPrompt: 'Enter a serverless function endpoint:',
+                        gettingLogs: (latest, functionPath) => `Getting ${latest ? 'latest ' : ''}logs for function with path: ${functionPath}.`,
+                        options: {
+                            compact: {
+                                describe: 'output compact logs',
+                            },
+                            follow: {
+                                describe: 'follow logs',
+                            },
+                            latest: {
+                                describe: 'retrieve most recent log only',
+                            },
+                            limit: {
+                                describe: 'limit the number of logs to output',
+                            },
+                        },
+                        positionals: {
+                            endpoint: {
+                                describe: 'Serverless function endpoint',
+                            },
+                        },
+                        tailLogs: (functionPath, accountId) => `Waiting for log entries for "${functionPath}" on account "${accountId}".\n`,
+                    },
+                    deploy: {
+                        debug: {
+                            startingBuildAndDeploy: (functionPath) => `Starting build and deploy for .functions folder with path: ${functionPath}`,
+                        },
+                        errors: {
+                            buildError: (details) => `Build error: ${details}`,
+                            noPackageJson: (functionPath) => `Unable to find package.json for function ${functionPath}.`,
+                            notFunctionsFolder: (functionPath) => `Specified path ${functionPath} is not a .functions folder.`,
+                        },
+                        examples: {
+                            default: 'Build and deploy a new bundle for all functions within the myFunctionFolder.functions folder',
+                        },
+                        loading: (functionPath, account) => `Building and deploying bundle for "${functionPath}" on ${account}`,
+                        loadingFailed: (functionPath, account) => `Failed to build and deploy bundle for "${functionPath}" on ${account}`,
+                        positionals: {
+                            path: {
+                                describe: 'Path to the ".functions" folder',
+                            },
+                        },
+                        success: {
+                            deployed: (functionPath, accountId, buildTimeSeconds) => `Built and deployed bundle from package.json for ${functionPath} on account ${accountId} in ${buildTimeSeconds}s.`,
+                        },
+                    },
+                    list: {
+                        debug: {
+                            gettingFunctions: 'Getting currently deployed functions',
+                        },
+                        describe: 'List the currently deployed CMS serverless functions.',
+                        info: {
+                            noFunctions: 'No functions found',
+                        },
+                        options: {
+                            json: {
+                                describe: 'output raw json data',
+                            },
+                        },
+                    },
+                    server: {
+                        debug: {
+                            startingServer: (functionPath) => `Starting local test server for .functions folder with path: ${functionPath}`,
+                        },
+                        examples: {
+                            default: 'Run a local function test server.',
+                        },
+                        options: {
+                            contact: {
+                                describe: 'Pass contact data to the test function',
+                            },
+                            logOutput: {
+                                describe: 'Output the response body from the serverless function execution (It is suggested not to use this in production environments as it can reveal any secure data returned by the function in logs)',
+                            },
+                            port: {
+                                describe: 'Port to run the test server on',
+                            },
+                            watch: {
+                                describe: 'Watch the specified .functions folder for changes and restart the server',
+                            },
+                        },
+                        positionals: {
+                            path: {
+                                describe: 'Path to local .functions folder',
+                            },
+                        },
+                    },
+                },
+            },
         },
     },
     create: {
@@ -470,6 +879,9 @@ export const commands = {
         describe: 'Commands for managing custom objects.',
         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: {
+            schema: {
+                describe: 'Commands for managing custom object schemas.',
+            },
             create: {
                 describe: 'Create custom object instances.',
                 errors: {
@@ -492,122 +904,117 @@ export const commands = {
                 inputName: "[--name] Enter the name of the schema for the custom object(s) you'd like to create:",
                 inputPath: '[--path] Enter the path to the JSON file containing the object definitions:',
             },
-            schema: {
-                describe: 'Commands for managing custom object schemas.',
-                subcommands: {
-                    create: {
-                        describe: 'Create a custom object schema.',
-                        errors: {
-                            invalidSchema: 'The schema definition is invalid. Please check the schema and try again.',
-                            creationFailed: (definition) => `Schema creation from ${definition} failed`,
-                        },
-                        options: {
-                            definition: {
-                                describe: 'Local path to the JSON file containing the schema definition',
-                            },
-                        },
-                        success: {
-                            schemaCreated: (accountId) => `Your schema has been created in account "${accountId}"`,
-                            schemaViewable: (url) => `Schema can be viewed at ${url}`,
-                        },
+            createSchema: {
+                describe: 'Create a custom object schema.',
+                errors: {
+                    invalidSchema: 'The schema definition is invalid. Please check the schema and try again.',
+                    creationFailed: (definition) => `Schema creation from ${definition} failed`,
+                },
+                options: {
+                    definition: {
+                        describe: 'Local path to the JSON file containing the schema definition',
                     },
-                    delete: {
-                        describe: 'Delete a custom object schema.',
-                        errors: {
-                            delete: (name) => `Unable to delete ${name}`,
-                        },
-                        examples: {
-                            default: 'Delete "schemaName" schema',
-                        },
-                        positionals: {
-                            name: {
-                                describe: 'Name of the target schema',
-                            },
-                        },
-                        options: {
-                            force: {
-                                describe: 'Force the deletion of the schema.',
-                            },
-                        },
-                        success: {
-                            delete: (name) => `Successfully initiated deletion of ${name}`,
-                        },
-                        confirmDelete: (name) => `Are you sure you want to delete the schema "${name}"?`,
-                        deleteCancelled: (name) => `Deletion of schema "${name}" cancelled.`,
-                        selectSchema: 'Which schema would you like to delete?',
+                },
+                success: {
+                    schemaCreated: (accountId) => `Your schema has been created in account "${accountId}"`,
+                    schemaViewable: (url) => `Schema can be viewed at ${url}`,
+                },
+            },
+            deleteSchema: {
+                describe: 'Delete a custom object schema.',
+                errors: {
+                    delete: (name) => `Unable to delete ${name}`,
+                },
+                examples: {
+                    default: 'Delete "schemaName" schema',
+                },
+                positionals: {
+                    name: {
+                        describe: 'Name of the target schema',
                     },
-                    fetchAll: {
-                        describe: 'Fetch all custom object schemas for an account.',
-                        errors: {
-                            fetch: 'Unable to fetch schemas',
-                        },
-                        examples: {
-                            default: 'Fetch all schemas for an account and put them in the current working directory',
-                            specifyPath: 'Fetch all schemas for an account and put them in a directory named my/folder',
-                        },
-                        positionals: {
-                            dest: {
-                                describe: 'Local folder where schemas will be written',
-                            },
-                        },
-                        success: {
-                            fetch: (path) => `Saved schemas to ${path}`,
-                        },
-                        inputDest: 'Where would you like to save the schemas?',
+                },
+                options: {
+                    force: {
+                        describe: 'Force the deletion of the schema.',
                     },
-                    fetch: {
-                        describe: 'Fetch a custom object schema.',
-                        errors: {
-                            fetch: (name) => `Unable to fetch ${name}`,
-                        },
-                        examples: {
-                            default: 'Fetch "schemaId" schema and put it in the current working directory',
-                            specifyPath: 'Fetch "schemaId" schema and put it in a directory named my/folder',
-                        },
-                        positionals: {
-                            dest: {
-                                describe: 'Local folder where schema will be written',
-                            },
-                            name: {
-                                describe: 'Name of the target schema',
-                            },
-                        },
-                        selectSchema: 'Which schema would you like to fetch?',
-                        inputDest: 'What would you like to name the destination file?',
-                        success: {
-                            save: (name, path) => `The schema "${name}" has been saved to "${path}"`,
-                            savedToPath: (path) => `Saved schema to ${path}`,
-                        },
+                },
+                success: {
+                    delete: (name) => `Successfully initiated deletion of ${name}`,
+                },
+                confirmDelete: (name) => `Are you sure you want to delete the schema "${name}"?`,
+                deleteCancelled: (name) => `Deletion of schema "${name}" cancelled.`,
+                selectSchema: 'Which schema would you like to delete?',
+            },
+            fetchAllSchemas: {
+                describe: 'Fetch all custom object schemas for an account.',
+                errors: {
+                    fetch: 'Unable to fetch schemas',
+                },
+                examples: {
+                    default: 'Fetch all schemas for an account and put them in the current working directory',
+                    specifyPath: 'Fetch all schemas for an account and put them in a directory named my/folder',
+                },
+                positionals: {
+                    dest: {
+                        describe: 'Local folder where schemas will be written',
                     },
-                    list: {
-                        describe: 'List custom object schemas.',
-                        errors: {
-                            list: 'Unable to list schemas',
-                        },
+                },
+                success: {
+                    fetch: (path) => `Saved schemas to ${path}`,
+                },
+                inputDest: 'Where would you like to save the schemas?',
+            },
+            fetchSchema: {
+                describe: 'Fetch a custom object schema.',
+                errors: {
+                    fetch: (name) => `Unable to fetch ${name}`,
+                },
+                examples: {
+                    default: 'Fetch "schemaId" schema and put it in the current working directory',
+                    specifyPath: 'Fetch "schemaId" schema and put it in a directory named my/folder',
+                },
+                positionals: {
+                    dest: {
+                        describe: 'Local folder where schema will be written',
                     },
-                    update: {
-                        describe: 'Update an existing custom object schema.',
-                        errors: {
-                            invalidSchema: 'The schema definition is invalid. Please check the schema and try again.',
-                            update: (definition) => `Schema update from ${definition} failed`,
-                        },
-                        options: {
-                            path: {
-                                describe: 'Local path to the JSON file containing the schema definition',
-                            },
-                        },
-                        positionals: {
-                            name: {
-                                describe: 'Name of the target schema',
-                            },
-                        },
-                        success: {
-                            update: (accountId) => `Your schema has been updated in account "${accountId}"`,
-                            viewAtUrl: (url) => `Schema can be viewed at ${url}`,
-                        },
-                        selectSchema: 'Which schema would you like to update?',
+                    name: {
+                        describe: 'Name of the target schema',
+                    },
+                },
+                selectSchema: 'Which schema would you like to fetch?',
+                inputDest: 'What would you like to name the destination file?',
+                success: {
+                    save: (name, path) => `The schema "${name}" has been saved to "${path}"`,
+                    savedToPath: (path) => `Saved schema to ${path}`,
+                },
+            },
+            listSchemas: {
+                describe: 'List custom object schemas.',
+                errors: {
+                    list: 'Unable to list schemas',
+                },
+            },
+            updateSchema: {
+                describe: 'Update an existing custom object schema.',
+                errors: {
+                    invalidSchema: 'The schema definition is invalid. Please check the schema and try again.',
+                    update: (definition) => `Schema update from ${definition} failed`,
+                },
+                options: {
+                    path: {
+                        describe: 'Local path to the JSON file containing the schema definition',
+                    },
+                },
+                positionals: {
+                    name: {
+                        describe: 'Name of the target schema',
                     },
                 },
+                success: {
+                    update: (accountId) => `Your schema has been updated in account "${accountId}"`,
+                    viewAtUrl: (url) => `Schema can be viewed at ${url}`,
+                },
+                selectSchema: 'Which schema would you like to update?',
             },
         },
     },
@@ -622,28 +1029,6 @@ export const commands = {
         },
         outputWritten: (filename) => `Output written to ${chalk.bold(filename)}`,
     },
-    fetch: {
-        describe: 'Fetch a file, directory or module from HubSpot and write to a path on your computer.',
-        errors: {
-            sourceRequired: 'A source to fetch is required.',
-        },
-        options: {
-            staging: {
-                describe: 'Retrieve staged changes for project',
-            },
-            assetVersion: {
-                describe: 'Specify what version of a default asset to fetch',
-            },
-        },
-        positionals: {
-            dest: {
-                describe: 'Local directory you would like the files to be placed in, relative to your current working directory',
-            },
-            src: {
-                describe: 'Path in HubSpot Design Tools',
-            },
-        },
-    },
     filemanager: {
         describe: 'Commands for managing files in the File Manager.',
         subcommands: {
@@ -693,75 +1078,6 @@ export const commands = {
             },
         },
     },
-    function: {
-        describe: 'Commands for managing CMS serverless functions.',
-        subcommands: {
-            deploy: {
-                debug: {
-                    startingBuildAndDeploy: (functionPath) => `Starting build and deploy for .functions folder with path: ${functionPath}`,
-                },
-                errors: {
-                    buildError: (details) => `Build error: ${details}`,
-                    noPackageJson: (functionPath) => `Unable to find package.json for function ${functionPath}.`,
-                    notFunctionsFolder: (functionPath) => `Specified path ${functionPath} is not a .functions folder.`,
-                },
-                examples: {
-                    default: 'Build and deploy a new bundle for all functions within the myFunctionFolder.functions folder',
-                },
-                loading: (functionPath, account) => `Building and deploying bundle for "${functionPath}" on ${account}`,
-                loadingFailed: (functionPath, account) => `Failed to build and deploy bundle for "${functionPath}" on ${account}`,
-                positionals: {
-                    path: {
-                        describe: 'Path to the ".functions" folder',
-                    },
-                },
-                success: {
-                    deployed: (functionPath, accountId, buildTimeSeconds) => `Built and deployed bundle from package.json for ${functionPath} on account ${accountId} in ${buildTimeSeconds}s.`,
-                },
-            },
-            list: {
-                debug: {
-                    gettingFunctions: 'Getting currently deployed functions',
-                },
-                describe: 'List the currently deployed CMS serverless functions.',
-                info: {
-                    noFunctions: 'No functions found',
-                },
-                options: {
-                    json: {
-                        describe: 'output raw json data',
-                    },
-                },
-            },
-            server: {
-                debug: {
-                    startingServer: (functionPath) => `Starting local test server for .functions folder with path: ${functionPath}`,
-                },
-                examples: {
-                    default: 'Run a local function test server.',
-                },
-                options: {
-                    contact: {
-                        describe: 'Pass contact data to the test function',
-                    },
-                    logOutput: {
-                        describe: 'Output the response body from the serverless function execution (It is suggested not to use this in production environments as it can reveal any secure data returned by the function in logs)',
-                    },
-                    port: {
-                        describe: 'Port to run the test server on',
-                    },
-                    watch: {
-                        describe: 'Watch the specified .functions folder for changes and restart the server',
-                    },
-                },
-                positionals: {
-                    path: {
-                        describe: 'Path to local .functions folder',
-                    },
-                },
-            },
-        },
-    },
     hubdb: {
         describe: 'Commands for managing HubDB tables.',
         subcommands: {
@@ -877,58 +1193,6 @@ export const commands = {
             globalConfigFileExists: `You are using our new global configuration for account management, which is not compatible with this command. Please use ${uiCommandReference('hs account auth')} instead.`,
         },
     },
-    lint: {
-        issuesFound: (count) => `${count} issues found.`,
-        groupName: (path) => `Linting ${path}`,
-        positionals: {
-            path: {
-                describe: 'Local folder to lint',
-            },
-        },
-    },
-    list: {
-        describe: 'List remote contents of a directory.',
-        gettingPathContents: (path) => `Getting contents of ${path}.`,
-        noFilesFoundAtPath: (path) => `No files found in ${path}.`,
-        positionals: {
-            path: {
-                describe: 'Remote directory to list contents',
-            },
-        },
-    },
-    logs: {
-        describe: 'View logs for a CMS serverless function.',
-        errors: {
-            noLogsFound: (functionPath, accountId) => `No logs were found for the function path "${functionPath}" in account "${accountId}".`,
-        },
-        examples: {
-            default: 'Get 5 most recent logs for function residing at /_hcms/api/my-endpoint',
-            follow: 'Poll for and output logs for function residing at /_hcms/api/my-endpoint immediately upon new execution',
-            limit: 'Get 10 most recent logs for function residing at /_hcms/api/my-endpoint',
-        },
-        endpointPrompt: 'Enter a serverless function endpoint:',
-        gettingLogs: (latest, functionPath) => `Getting ${latest ? 'latest ' : ''}logs for function with path: ${functionPath}.`,
-        options: {
-            compact: {
-                describe: 'output compact logs',
-            },
-            follow: {
-                describe: 'follow logs',
-            },
-            latest: {
-                describe: 'retrieve most recent log only',
-            },
-            limit: {
-                describe: 'limit the number of logs to output',
-            },
-        },
-        positionals: {
-            endpoint: {
-                describe: 'Serverless function endpoint',
-            },
-        },
-        tailLogs: (functionPath, accountId) => `Waiting for log entries for "${functionPath}" on account "${accountId}".\n`,
-    },
     mcp: {
         describe: 'Commands for managing HubSpot MCP servers.',
         setup: {
@@ -988,14 +1252,6 @@ export const commands = {
             shuttingDown: 'Shutting down MCP server...',
         },
     },
-    mv: {
-        describe: 'Move a remote file or folder in HubSpot. This feature is currently in beta and the CLI contract is subject to change.',
-        errors: {
-            sourcePathExists: (srcPath, destPath) => `The folder "${srcPath}" already exists in "${destPath}".`,
-            moveFailed: (srcPath, destPath, accountId) => `Moving "${srcPath}" to "${destPath}" in account ${accountId} failed`,
-        },
-        move: (srcPath, destPath, accountId) => `Moved "${srcPath}" to "${destPath}" in account ${accountId}`,
-    },
     open: {
         describe: 'Open a HubSpot page in your browser.',
         options: {
@@ -1083,7 +1339,7 @@ export const commands = {
                 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://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')}`,
+                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`,
@@ -1100,7 +1356,8 @@ export const commands = {
                 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',
+                localDevAlreadyRunning: `Another ${uiCommandReference('hs project dev')} process is already running. To proceed with local development of this project, stop the existing process and re-run ${uiCommandReference('hs project dev')}.`,
             },
             examples: {
                 default: 'Start local dev for the current project',
@@ -1442,7 +1699,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}"`,
-                v3ApiError: (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')}`,
+                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: {
@@ -1523,15 +1780,16 @@ export const commands = {
                 },
             },
         },
-    },
-    remove: {
-        describe: 'Delete a file or folder from the HubSpot CMS.',
-        deleted: (path, accountId) => `Deleted "${path}" from account ${uiAccountDescription(accountId)}`,
-        errors: {
-            deleteFailed: (path, accountId) => `Deleting "${path}" from account ${uiAccountDescription(accountId)} failed`,
-        },
-        positionals: {
-            path: 'Remote hubspot path',
+        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)}`,
+            },
         },
     },
     sandbox: {
@@ -1791,155 +2049,6 @@ export const commands = {
             },
         },
     },
-    theme: {
-        describe: 'Commands for managing themes.',
-        subcommands: {
-            generateSelectors: {
-                describe: 'Automatically generates an editor-preview.json file for the given theme. The selectors this command generates are not perfect, so please edit editor-preview.json after running.',
-                errors: {
-                    invalidPath: (themePath) => `Could not find directory "${themePath}"`,
-                    fieldsNotFound: "Unable to find theme's fields.json.",
-                    noSelectorsFound: 'No selectors found.',
-                },
-                success: (themePath, selectorsPath) => `Selectors generated for ${themePath}, please double check the selectors generated at ${selectorsPath} before uploading the theme.`,
-                positionals: {
-                    path: "The path of the theme you'd like to generate an editor-preview.json for.",
-                },
-            },
-            marketplaceValidate: {
-                describe: 'Validate a theme for the marketplace.',
-                errors: {
-                    invalidPath: (path) => `The path "${path}" is not a path to a folder in the Design Manager`,
-                },
-                logs: {
-                    validatingTheme: (path) => `Validating theme "${path}" \n`,
-                },
-                results: {
-                    required: 'Required validation results:',
-                    recommended: 'Recommended validation results:',
-                    warnings: {
-                        file: (file) => `File: ${file}`,
-                        lineNumber: (line) => `Line number: ${line}`,
-                    },
-                    noErrors: 'No errors',
-                },
-                positionals: {
-                    path: {
-                        describe: 'Path to the theme within the Design Manager.',
-                    },
-                },
-            },
-            preview: {
-                describe: 'Upload and watch a theme directory on your computer for changes and start a local development server to preview theme changes on a site.',
-                errors: {
-                    invalidPath: (path) => `The path "${path}" is not a path to a directory`,
-                    noThemeComponents: 'Your project has no theme components available to preview.',
-                    uploadFailed: (src, dest) => `Uploading file "${src}" to "${dest}" failed`,
-                },
-                positionals: {
-                    src: 'Path to the local directory your theme is in, relative to your current working directory',
-                    dest: 'Path in HubSpot Design Tools. Can be a net new path. If you wish to preview a site page using your theme changes it must match the path of the theme used by the site.',
-                },
-                options: {
-                    notify: 'Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file',
-                    noSsl: 'Disable HTTPS',
-                    port: 'The port on which to start the local server',
-                },
-                initialUploadProgressBar: {
-                    start: 'Starting...',
-                    uploading: 'Uploading...',
-                    finish: 'Complete!',
-                },
-                logs: {
-                    processExited: 'Stopping dev server...',
-                },
-            },
-        },
-    },
-    module: {
-        describe: 'Commands for working with modules, including marketplace validation with the marketplace-validate subcommand.',
-        subcommands: {
-            marketplaceValidate: {
-                describe: 'Validate a module for the marketplace. Make sure to include the suffix .module in the path to the module within the Design Manager.',
-                errors: {
-                    invalidPath: (path) => `The path "${path}" is not a path to a module within the Design Manager.`,
-                },
-                logs: {
-                    validatingModule: (path) => `Validating module "${path}" \n`,
-                },
-                results: {
-                    required: 'Required validation results:',
-                    recommended: 'Recommended validation results:',
-                    warnings: {
-                        file: (file) => `File: ${file}`,
-                        lineNumber: (line) => `Line number: ${line}`,
-                    },
-                    noErrors: 'No errors',
-                },
-                positionals: {
-                    src: 'Path to the module within the Design Manager.',
-                },
-            },
-        },
-    },
-    upload: {
-        describe: 'Upload a folder or file from your computer to the HubSpot CMS.',
-        errors: {
-            destinationRequired: 'A destination path needs to be passed',
-            fileIgnored: (path) => `The file "${path}" is being ignored via an .hsignore rule`,
-            invalidPath: (path) => `The path "${path}" is not a path to a file or folder`,
-            uploadFailed: (src, dest) => `Uploading file "${src}" to "${dest}" failed`,
-            someFilesFailed: (dest) => `One or more files failed to upload to "${dest}" in the Design Manager`,
-            deleteFailed: (path, accountId) => `Deleting "${path}" from account ${uiAccountDescription(accountId)} failed`,
-        },
-        options: {
-            options: 'Options to pass to javascript fields files',
-            saveOutput: "If true, saves all output from javascript fields files as 'fields.output.json'.",
-            convertFields: 'If true, converts any javascript fields files contained in module folder or project root.',
-            clean: 'Will delete the destination directory and its contents before uploading. This will also clear the global content associated with any global partial templates and modules.',
-            force: 'Skips confirmation prompts when doing a clean upload.',
-        },
-        previewUrl: (previewUrl) => `To preview this theme, visit: ${previewUrl}`,
-        positionals: {
-            src: 'Path to the local file, relative to your current working directory.',
-            dest: 'Path in HubSpot Design Tools, can be a net new path.',
-        },
-        success: {
-            fileUploaded: (src, dest, accountId) => `Uploaded file from "${src}" to "${dest}" in the Design Manager of account ${uiAccountDescription(accountId)}`,
-            uploadComplete: (dest) => `Uploading files to "${dest}" in the Design Manager is complete`,
-        },
-        uploading: (src, dest, accountId) => `Uploading files from "${src}" to "${dest}" in the Design Manager of account ${uiAccountDescription(accountId)}`,
-        notUploaded: (src) => `There was an error processing "${src}". The file has not been uploaded.`,
-        cleaning: (filePath, accountId) => `Removing "${filePath}" from account ${uiAccountDescription(accountId)} and uploading local...`,
-        confirmCleanUpload: (filePath, accountId) => `You are about to delete the directory "${filePath}" and its contents on HubSpot account ${uiAccountDescription(accountId)} before uploading. This will also clear the global content associated with any global partial templates and modules. Are you sure you want to do this?`,
-    },
-    watch: {
-        describe: 'Watch a directory on your computer for changes and upload the changed files to the HubSpot CMS.',
-        errors: {
-            folderFailed: (src, dest, accountId) => `Initial uploading of folder "${src}" to "${dest}" in account ${uiAccountDescription(accountId)} had failures`,
-            fileFailed: (file, dest, accountId) => `Upload of file "${file}" to "${dest}" in account ${uiAccountDescription(accountId)} failed`,
-            destinationRequired: 'A destination directory needs to be passed',
-            invalidPath: (path) => `The "${path}" is not a path to a directory`,
-        },
-        options: {
-            disableInitial: 'Disable the initial upload when watching a directory (default)',
-            initialUpload: 'Upload directory before watching for updates',
-            notify: 'Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file',
-            remove: 'Will cause watch to delete files in your HubSpot account that are not found locally.',
-            convertFields: 'If true, converts any javascript fields files contained in module folder or project root.',
-            saveOutput: "If true, saves all output from javascript fields files as 'fields.output.json'.",
-            options: 'Options to pass to javascript fields files',
-        },
-        positionals: {
-            src: 'Path to the local directory your files are in, relative to your current working directory',
-            dest: 'Path in HubSpot Design Tools. Can be a net new path',
-        },
-        warnings: {
-            disableInitial: `Passing the "${chalk.bold('--disable-initial')}" option is no longer necessary. Running "${uiCommandReference('hs watch')}" no longer uploads the watched directory by default.`,
-            initialUpload: `To upload the directory run "${uiCommandReference('hs upload')}" beforehand or add the "${chalk.bold('--initial-upload')}" option when running "${uiCommandReference('hs watch')}".`,
-            notUploaded: (path) => `The "${uiCommandReference('hs watch')}" command no longer uploads the watched directory when started. The directory "${path}" was not uploaded.`,
-        },
-    },
     convertFields: {
         describe: 'Converts a specific JavaScript fields file of a module or theme to JSON.',
         positionals: {
@@ -2041,6 +2150,7 @@ export const commands = {
             options: {
                 name: 'The name of the test account (in your CLI config) to delete',
                 id: 'The id of the test account',
+                force: 'Skips all confirmation prompts when deleting a test account.',
             },
             examples: {
                 withPositionalID: (testAccountToDelete) => `Delete a test account with id "${testAccountToDelete}" using positional argument`,
@@ -2695,10 +2805,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)}`,
@@ -2708,6 +2822,14 @@ 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`,
+        },
+        appDataNotFound: 'An error occurred while fetching data for your app.',
+        oauthAppRedirectUrlError: (redirectUrl) => `${chalk.bold('No reponse from your OAuth service:')} ${redirectUrl}\nYour app needs a valid OAuth2 service to be installed for local dev. ${uiLink('Learn more', 'https://developers.hubspot.com/docs/apps/developer-platform/build-apps/authentication/oauth/working-with-oauth')}`,
     },
     LocalDevWebsocketServer: {
         errors: {
@@ -2791,7 +2913,7 @@ export const lib = {
     },
     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}'))}`,
         },
@@ -3011,7 +3133,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',
         },
@@ -3075,6 +3197,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?',
@@ -3320,7 +3457,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?',