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

package/lib/app/migrate_legacy.js

@@ -1,5 +1,5 @@
 import { fetchPublicAppMetadata } from '@hubspot/local-dev-lib/api/appsDev';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { checkMigrationStatus, downloadProject, migrateApp as migrateNonProjectApp_v2023_2, } from '@hubspot/local-dev-lib/api/projects';
 import path from 'path';
 import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
@@ -9,7 +9,7 @@ import { promptUser } from '../prompts/promptUtils.js';
 import { ApiErrorContext, logError } from '../errorHandlers/index.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import { uiAccountDescription, uiLine, uiLink } from '../ui/index.js';
-import { i18n } from '../lang.js';
+import { commands } from '../../lang/en.js';
 import { isAppDeveloperAccount, isUnifiedAccount } from '../accountTypes.js';
 import { selectPublicAppForMigrationPrompt } from '../prompts/selectPublicAppForMigrationPrompt.js';
 import { projectNameAndDestPrompt } from '../prompts/projectNameAndDestPrompt.js';
@@ -42,9 +42,7 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
         const preventProjectMigrations = selectedApp.preventProjectMigrations;
         const listingInfo = selectedApp.listingInfo;
         if (preventProjectMigrations && listingInfo) {
-            logger.error(i18n(`commands.project.subcommands.migrateApp.errors.invalidApp`, {
-                appId,
-            }));
+            uiLogger.error(commands.project.migrateApp.errors.invalidApp(appId));
             return process.exit(EXIT_CODES.ERROR);
         }
     }
@@ -58,24 +56,22 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
         noLogs: true,
     });
     if (projectExists) {
-        throw new Error(i18n(`commands.project.subcommands.migrateApp.errors.projectAlreadyExists`, {
-            projectName,
-        }));
+        throw new Error(commands.project.migrateApp.errors.projectAlreadyExists(projectName));
     }
     await trackCommandMetadataUsage('migrate-app', { step: 'STARTED' }, derivedAccountId);
-    logger.log('');
+    uiLogger.log('');
     uiLine();
-    logger.warn(`${i18n(`commands.project.subcommands.migrateApp.warning.title`)}\n`);
-    logger.log(i18n(`commands.project.subcommands.migrateApp.warning.projectConversion`));
-    logger.log(`${i18n(`commands.project.subcommands.migrateApp.warning.appConfig`)}\n`);
-    logger.log(`${i18n(`commands.project.subcommands.migrateApp.warning.buildAndDeploy`)}\n`);
-    logger.log(`${i18n(`commands.project.subcommands.migrateApp.warning.existingApps`)}\n`);
-    logger.log(i18n(`commands.project.subcommands.migrateApp.warning.copyApp`));
+    uiLogger.warn(commands.project.migrateApp.warning.title);
+    uiLogger.log(commands.project.migrateApp.warning.projectConversion);
+    uiLogger.log(commands.project.migrateApp.warning.appConfig);
+    uiLogger.log(commands.project.migrateApp.warning.buildAndDeploy);
+    uiLogger.log(commands.project.migrateApp.warning.existingApps);
+    uiLogger.log(commands.project.migrateApp.warning.copyApp);
     uiLine();
     const { shouldCreateApp } = await promptUser({
         name: 'shouldCreateApp',
         type: 'confirm',
-        message: i18n(`commands.project.subcommands.migrateApp.createAppPrompt`),
+        message: commands.project.migrateApp.createAppPrompt,
     });
     process.stdin.resume();
     if (!shouldCreateApp) {
@@ -84,12 +80,12 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
     try {
         SpinniesManager.init();
         SpinniesManager.add('migrateApp', {
-            text: i18n(`commands.project.subcommands.migrateApp.migrationStatus.inProgress`),
+            text: commands.project.migrateApp.migrationStatus.inProgress(),
         });
         handleKeypress(async (key) => {
             if ((key.ctrl && key.name === 'c') || key.name === 'q') {
                 SpinniesManager.remove('migrateApp');
-                logger.log(i18n(`commands.project.subcommands.migrateApp.migrationInterrupted`));
+                uiLogger.log(commands.project.migrateApp.migrationInterrupted);
                 return process.exit(EXIT_CODES.SUCCESS);
             }
         });
@@ -104,20 +100,20 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
             const { data: zippedProject } = await downloadProject(derivedAccountId, projectName, 1);
             await extractZipArchive(zippedProject, sanitizeFileName(projectName), path.resolve(absoluteDestPath), { includesRootDir: true, hideLogs: true });
             SpinniesManager.succeed('migrateApp', {
-                text: i18n(`commands.project.subcommands.migrateApp.migrationStatus.done`),
+                text: commands.project.migrateApp.migrationStatus.done(),
                 succeedColor: 'white',
             });
-            logger.log('');
+            uiLogger.log('');
             uiLine();
-            logger.success(i18n(`commands.project.subcommands.migrateApp.migrationStatus.success`));
-            logger.log('');
-            logger.log(uiLink(i18n(`commands.project.subcommands.migrateApp.projectDetailsLink`), `${baseUrl}/developer-projects/${derivedAccountId}/project/${encodeURIComponent(project.name)}`));
+            uiLogger.success(commands.project.migrateApp.migrationStatus.success());
+            uiLogger.log('');
+            uiLogger.log(uiLink(commands.project.migrateApp.projectDetailsLink, `${baseUrl}/developer-projects/${derivedAccountId}/project/${encodeURIComponent(project.name)}`));
             process.exit(EXIT_CODES.SUCCESS);
         }
     }
     catch (error) {
         SpinniesManager.fail('migrateApp', {
-            text: i18n(`commands.project.subcommands.migrateApp.migrationStatus.failure`),
+            text: commands.project.migrateApp.migrationStatus.failure(),
             failColor: 'white',
         });
         throw error;

package/lib/buildAccount.d.ts

@@ -4,12 +4,12 @@ import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { SandboxResponse, V2Sandbox } from '@hubspot/local-dev-lib/types/Sandbox';
 import { SandboxAccountType } from '../types/Sandboxes.js';
 export declare function saveAccountToConfig(accountId: number | undefined, accountName: string, env: Environment, personalAccessKey?: string, force?: boolean): Promise<string>;
-export declare function createDeveloperTestAccountV3(parentAccountId: number, testAccountConfig: DeveloperTestAccountConfig): Promise<{
+export declare function createDeveloperTestAccountV2(parentAccountId: number, testAccountConfig: DeveloperTestAccountConfig): Promise<{
     accountName: string;
     accountId?: number;
     personalAccessKey?: string;
 }>;
-export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number, useV3?: boolean): Promise<number>;
+export declare function buildDeveloperTestAccount(testAccountName: string, parentAccountConfig: CLIAccount, env: Environment, portalLimit: number, useV2?: boolean): Promise<number>;
 type SandboxAccount = SandboxResponse & {
     name: string;
 };

package/lib/buildAccount.js

@@ -1,13 +1,12 @@
 import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
 import { accountNameExistsInConfig, updateAccountConfig, writeConfig, getAccountId, } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from './ui/logger.js';
 import { createDeveloperTestAccount, fetchDeveloperTestAccountGateSyncStatus, generateDeveloperTestAccountPersonalAccessKey, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { createSandbox, createV2Sandbox, getSandboxPersonalAccessKey, } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { personalAccessKeyPrompt } from './prompts/personalAccessKeyPrompt.js';
 import { createDeveloperTestAccountConfigPrompt } from './prompts/createDeveloperTestAccountConfigPrompt.js';
-import { i18n } from './lang.js';
 import { cliAccountNamePrompt } from './prompts/accountNamePrompt.js';
 import SpinniesManager from './ui/SpinniesManager.js';
 import { debugError, logError } from './errorHandlers/index.js';
@@ -32,10 +31,8 @@ export async function saveAccountToConfig(accountId, accountName, env, personalA
         const invalidAccountName = accountNameExistsInConfig(nameForConfig);
         if (invalidAccountName) {
             if (!force) {
-                logger.log('');
-                logger.warn(i18n(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
-                    name: nameForConfig,
-                }));
+                uiLogger.log('');
+                uiLogger.warn(lib.prompts.accountNamePrompt.errors.accountNameExists(nameForConfig));
                 const { name: promptName } = await cliAccountNamePrompt(nameForConfig + `_${accountId}`);
                 validName = promptName;
             }
@@ -52,10 +49,10 @@ export async function saveAccountToConfig(accountId, accountName, env, personalA
         name: validName,
     });
     writeConfig();
-    logger.log('');
+    uiLogger.log('');
     return validName;
 }
-export async function createDeveloperTestAccountV3(parentAccountId, testAccountConfig) {
+export async function createDeveloperTestAccountV2(parentAccountId, testAccountConfig) {
     const result = {
         accountName: testAccountConfig.accountName,
     };
@@ -69,7 +66,7 @@ export async function createDeveloperTestAccountV3(parentAccountId, testAccountC
     }
     catch (err) {
         debugError(err);
-        throw new Error(lib.buildAccount.createDeveloperTestAccountV3.syncFailure);
+        throw new Error(lib.buildAccount.createDeveloperTestAccountV2.syncFailure);
     }
     // HACK: The status endpoint sometimes returns an early success status.
     // Sleep for an extra 5 seconds to make sure the sync is actually complete.
@@ -81,20 +78,20 @@ export async function createDeveloperTestAccountV3(parentAccountId, testAccountC
     }
     catch (err) {
         debugError(err);
-        throw new Error(lib.buildAccount.createDeveloperTestAccountV3.pakFailure);
+        throw new Error(lib.buildAccount.createDeveloperTestAccountV2.pakFailure);
     }
     return result;
 }
-export async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit, useV3 = false) {
+export async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit, useV2 = false) {
     const id = getAccountIdentifier(parentAccountConfig);
     const parentAccountId = getAccountId(id);
     let testAccountConfig = {
         accountName: testAccountName,
     };
     if (!parentAccountId) {
-        throw new Error(i18n(`lib.developerTestAccount.create.loading.fail`));
+        throw new Error(lib.developerTestAccount.create.loading.fail(''));
     }
-    if (useV3) {
+    if (useV2) {
         testAccountConfig = await createDeveloperTestAccountConfigPrompt({
             name: testAccountConfig.accountName,
             description: 'Test Account created by the HubSpot CLI',
@@ -103,17 +100,15 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
     SpinniesManager.init({
         succeedColor: 'white',
     });
-    logger.log('');
+    uiLogger.log('');
     SpinniesManager.add('buildDeveloperTestAccount', {
-        text: i18n(`lib.developerTestAccount.create.loading.add`, {
-            accountName: testAccountName,
-        }),
+        text: lib.developerTestAccount.create.loading.add(testAccountName),
     });
     let developerTestAccountId;
     let developerTestAccountPersonalAccessKey;
     try {
-        if (useV3) {
-            const result = await createDeveloperTestAccountV3(parentAccountId, testAccountConfig);
+        if (useV2) {
+            const result = await createDeveloperTestAccountV2(parentAccountId, testAccountConfig);
             developerTestAccountId = result.accountId;
             developerTestAccountPersonalAccessKey = result.personalAccessKey;
         }
@@ -123,18 +118,13 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
             developerTestAccountPersonalAccessKey = data.personalAccessKey;
         }
         SpinniesManager.succeed('buildDeveloperTestAccount', {
-            text: i18n(`lib.developerTestAccount.create.loading.succeed`, {
-                accountName: testAccountName,
-                accountId: developerTestAccountId,
-            }),
+            text: lib.developerTestAccount.create.loading.succeed(testAccountName, developerTestAccountId.toString()),
         });
     }
     catch (e) {
         debugError(e);
         SpinniesManager.fail('buildDeveloperTestAccount', {
-            text: i18n(`lib.developerTestAccount.create.loading.fail`, {
-                accountName: testAccountName,
-            }),
+            text: lib.developerTestAccount.create.loading.fail(testAccountName),
         });
         handleDeveloperTestAccountCreateError(e, parentAccountId, env, portalLimit);
     }
@@ -148,26 +138,20 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
     return developerTestAccountId;
 }
 export async function buildSandbox(sandboxName, parentAccountConfig, sandboxType, env, force = false) {
-    let i18nKey;
-    if (sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
-        i18nKey = 'lib.sandbox.create.loading.standard';
-    }
-    else {
-        i18nKey = 'lib.sandbox.create.loading.developer';
-    }
+    const sandboxTypeKey = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
+        ? 'standard'
+        : 'developer';
     const id = getAccountIdentifier(parentAccountConfig);
     const parentAccountId = getAccountId(id);
     if (!parentAccountId) {
-        throw new Error(i18n(`${i18nKey}.fail`));
+        throw new Error(lib.sandbox.create[sandboxTypeKey].loading.fail(''));
     }
     SpinniesManager.init({
         succeedColor: 'white',
     });
-    logger.log('');
+    uiLogger.log('');
     SpinniesManager.add('buildSandbox', {
-        text: i18n(`${i18nKey}.add`, {
-            accountName: sandboxName,
-        }),
+        text: lib.sandbox.create[sandboxTypeKey].loading.add(sandboxName),
     });
     let sandbox;
     try {
@@ -175,18 +159,13 @@ export async function buildSandbox(sandboxName, parentAccountConfig, sandboxType
         const { data } = await createSandbox(parentAccountId, sandboxName, sandboxApiType);
         sandbox = { name: sandboxName, ...data };
         SpinniesManager.succeed('buildSandbox', {
-            text: i18n(`${i18nKey}.succeed`, {
-                accountName: sandboxName,
-                accountId: sandbox.sandbox.sandboxHubId,
-            }),
+            text: lib.sandbox.create[sandboxTypeKey].loading.succeed(sandboxName, sandbox.sandbox.sandboxHubId.toString()),
         });
     }
     catch (e) {
         debugError(e);
         SpinniesManager.fail('buildSandbox', {
-            text: i18n(`${i18nKey}.fail`, {
-                accountName: sandboxName,
-            }),
+            text: lib.sandbox.create[sandboxTypeKey].loading.fail(sandboxName),
         });
         handleSandboxCreateError(e, env, sandboxName, parentAccountId);
     }
@@ -200,26 +179,20 @@ export async function buildSandbox(sandboxName, parentAccountConfig, sandboxType
     return sandbox;
 }
 export async function buildV2Sandbox(sandboxName, parentAccountConfig, sandboxType, syncObjectRecords, env, force = false) {
-    let i18nKey;
-    if (sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
-        i18nKey = 'lib.sandbox.create.loading.standard';
-    }
-    else {
-        i18nKey = 'lib.sandbox.create.loading.developer';
-    }
+    const sandboxTypeKey = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
+        ? 'standard'
+        : 'developer';
     const id = getAccountIdentifier(parentAccountConfig);
     const parentAccountId = getAccountId(id);
     if (!parentAccountId) {
-        throw new Error(i18n(`${i18nKey}.fail`));
+        throw new Error(lib.sandbox.create[sandboxTypeKey].loading.fail(''));
     }
     SpinniesManager.init({
         succeedColor: 'white',
     });
-    logger.log('');
+    uiLogger.log('');
     SpinniesManager.add('buildV2Sandbox', {
-        text: i18n(`${i18nKey}.add`, {
-            accountName: sandboxName,
-        }),
+        text: lib.sandbox.create[sandboxTypeKey].loading.add(sandboxName),
     });
     let sandbox;
     let pak;
@@ -230,18 +203,13 @@ export async function buildV2Sandbox(sandboxName, parentAccountConfig, sandboxTy
         const { data: { personalAccessKey }, } = await getSandboxPersonalAccessKey(parentAccountId, sandbox.sandboxHubId);
         pak = personalAccessKey.encodedOAuthRefreshToken;
         SpinniesManager.succeed('buildV2Sandbox', {
-            text: i18n(`${i18nKey}.succeed`, {
-                accountName: sandboxName,
-                accountId: sandbox.sandboxHubId,
-            }),
+            text: lib.sandbox.create[sandboxTypeKey].loading.succeed(sandboxName, sandbox.sandboxHubId.toString()),
         });
     }
     catch (e) {
         debugError(e);
         SpinniesManager.fail('buildV2Sandbox', {
-            text: i18n(`${i18nKey}.fail`, {
-                accountName: sandboxName,
-            }),
+            text: lib.sandbox.create[sandboxTypeKey].loading.fail(sandboxName),
         });
         handleSandboxCreateError(e, env, sandboxName, parentAccountId);
     }

package/lib/commonOpts.d.ts

@@ -13,7 +13,7 @@ export declare function addTestingOptions(yargs: Argv): Argv;
 export declare function addUseEnvironmentOptions(yargs: Argv): Argv;
 export declare function addJSONOutputOptions(yargs: Argv): Argv;
 export declare function addCustomHelpOutput(yargs: Argv, command: string | string[], describe?: string): Promise<void>;
-export declare function setLogLevel(options: Arguments<{
+export declare function setCLILogLevel(options: Arguments<{
     debug?: boolean;
     networkDebug?: boolean;
     json?: boolean;

package/lib/commonOpts.js

@@ -1,19 +1,21 @@
 import chalk from 'chalk';
 import yargsParser from 'yargs-parser';
-import { LOG_LEVEL, logger, setLogLevel as setLoggerLogLevel, } from '@hubspot/local-dev-lib/logger';
+import { LOG_LEVEL, setLogLevel } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from './ui/logger.js';
 import { DEFAULT_CMS_PUBLISH_MODE, CMS_PUBLISH_MODE, } from '@hubspot/local-dev-lib/constants/files';
 import { getAccountConfig, getAndLoadConfigIfNeeded, } from '@hubspot/local-dev-lib/config';
 import { debugError } from './errorHandlers/index.js';
 import { EXIT_CODES } from './enums/exitCodes.js';
 import { uiCommandReference } from './ui/index.js';
-import { i18n } from './lang.js';
+import { lib } from '../lang/en.js';
 import { getTerminalUISupport, UI_COLORS } from './ui/index.js';
+import SpinniesManager from './ui/SpinniesManager.js';
 export function addGlobalOptions(yargs) {
     yargs.version(false);
     yargs.option('debug', {
         alias: 'd',
         default: false,
-        describe: i18n('lib.commonOpts.options.debug.describe'),
+        describe: lib.commonOpts.options.debug,
         type: 'boolean',
     });
     yargs.option('network-debug', {
@@ -26,21 +28,21 @@ export function addGlobalOptions(yargs) {
 export function addAccountOptions(yargs) {
     return yargs.option('account', {
         alias: 'a',
-        describe: i18n('lib.commonOpts.options.account.describe'),
+        describe: lib.commonOpts.options.account,
         type: 'string',
     });
 }
 export function addConfigOptions(yargs) {
     return yargs.option('config', {
         alias: 'c',
-        describe: i18n('lib.commonOpts.options.config.describe'),
+        describe: lib.commonOpts.options.config,
         type: 'string',
     });
 }
 export function addOverwriteOptions(yargs) {
     return yargs.option('overwrite', {
         alias: 'o',
-        describe: i18n('lib.commonOpts.options.overwrite.describe'),
+        describe: lib.commonOpts.options.overwrite,
         type: 'boolean',
         default: false,
     });
@@ -49,13 +51,13 @@ export function addCmsPublishModeOptions(yargs, { read, write }) {
     const cmsPublishModes = `<${Object.values(CMS_PUBLISH_MODE).join(' | ')}>`;
     return yargs.option('cms-publish-mode', {
         alias: 'm',
-        describe: i18n(`lib.commonOpts.options.modes.describe.${read ? 'read' : write ? 'write' : 'default'}`, { modes: cmsPublishModes }),
+        describe: lib.commonOpts.options.modes[read ? 'read' : write ? 'write' : 'default'](cmsPublishModes),
         type: 'string',
     });
 }
 export function addTestingOptions(yargs) {
     return yargs.option('qa', {
-        describe: i18n('lib.commonOpts.options.qa.describe'),
+        describe: lib.commonOpts.options.qa,
         type: 'boolean',
         default: false,
         hidden: true,
@@ -63,7 +65,7 @@ export function addTestingOptions(yargs) {
 }
 export function addUseEnvironmentOptions(yargs) {
     yargs.option('use-env', {
-        describe: i18n('lib.commonOpts.options.useEnv.describe'),
+        describe: lib.commonOpts.options.useEnv,
         type: 'boolean',
     });
     yargs.conflicts('use-env', 'account');
@@ -72,7 +74,7 @@ export function addUseEnvironmentOptions(yargs) {
 export function addJSONOutputOptions(yargs) {
     return yargs.option('json', {
         alias: 'format-output-as-json',
-        describe: i18n('lib.commonOpts.options.jsonOutput.describe'),
+        describe: lib.commonOpts.options.jsonOutput,
         type: 'boolean',
         hidden: true,
     });
@@ -80,27 +82,27 @@ export function addJSONOutputOptions(yargs) {
 // Remove this once we've upgraded to yargs 18.0.0
 function uiBetaTagWithColor(message) {
     const terminalUISupport = getTerminalUISupport();
-    const tag = i18n(`lib.ui.betaTagWithStyle`);
+    const tag = lib.ui.betaTagWithStyle;
     const result = `${terminalUISupport.color ? chalk.hex(UI_COLORS.SORBET)(tag) : tag} ${message}`;
     return result;
 }
 // Remove this once we've upgraded to yargs 18.0.0
 function uiDeprecatedTagWithColor(message) {
     const terminalUISupport = getTerminalUISupport();
-    const tag = i18n(`lib.ui.deprecatedTagWithStyle`);
+    const tag = lib.ui.deprecatedTagWithStyle;
     const result = `${terminalUISupport.color ? chalk.yellow(tag) : tag} ${message}`;
     return result;
 }
 export async function addCustomHelpOutput(yargs, command, describe) {
     try {
         // Remove this once we've upgraded to yargs 18.0.0
-        if (describe && describe.includes(i18n(`lib.ui.betaTag`))) {
-            describe = describe.replace(i18n(`lib.ui.betaTag`) + ' ', '');
+        if (describe && describe.includes(lib.ui.betaTag)) {
+            describe = describe.replace(lib.ui.betaTag + ' ', '');
             describe = uiBetaTagWithColor(describe);
         }
         // Remove this once we've upgraded to yargs 18.0.0
-        if (describe && describe.includes(i18n(`lib.ui.deprecatedTag`))) {
-            describe = describe.replace(i18n(`lib.ui.deprecatedTag`) + ' ', '');
+        if (describe && describe.includes(lib.ui.deprecatedTag)) {
+            describe = describe.replace(lib.ui.deprecatedTag + ' ', '');
             describe = uiDeprecatedTagWithColor(describe);
         }
         const parsedArgv = yargsParser(process.argv.slice(2));
@@ -132,7 +134,7 @@ export async function addCustomHelpOutput(yargs, command, describe) {
             if (commandHelp.startsWith('\n')) {
                 commandHelp = commandHelp.slice(1);
             }
-            logger.log(`${uiCommandReference(fullCommand, false)}\n\n${describe ? `${describe}\n\n` : ''}${commandHelp}`);
+            uiLogger.log(`${uiCommandReference(fullCommand, false)}\n\n${describe ? `${describe}\n\n` : ''}${commandHelp}`);
             process.exit(EXIT_CODES.SUCCESS);
         }
     }
@@ -141,20 +143,21 @@ export async function addCustomHelpOutput(yargs, command, describe) {
         debugError(e);
     }
 }
-export function setLogLevel(options) {
+export function setCLILogLevel(options) {
     const { debug, networkDebug, json } = options;
     if (json) {
-        setLoggerLogLevel(LOG_LEVEL.ERROR);
+        setLogLevel(LOG_LEVEL.ERROR);
+        SpinniesManager.setDisableOutput(true);
     }
     else if (debug) {
-        setLoggerLogLevel(LOG_LEVEL.DEBUG);
+        setLogLevel(LOG_LEVEL.DEBUG);
     }
     else {
-        setLoggerLogLevel(LOG_LEVEL.LOG);
+        setLogLevel(LOG_LEVEL.LOG);
     }
     if (networkDebug) {
         process.env.HUBSPOT_NETWORK_LOGGING = 'true';
-        setLoggerLogLevel(LOG_LEVEL.DEBUG);
+        setLogLevel(LOG_LEVEL.DEBUG);
     }
 }
 export function getCommandName(argv) {

package/lib/configMigrate.js

@@ -3,6 +3,37 @@ import { ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME } from '@hubspot/local-dev-lib/c
 import { promptUser } from './prompts/promptUtils.js';
 import { lib } from '../lang/en.js';
 import { uiLogger } from './ui/logger.js';
+async function promptRenameOrOmitAccount(accountName, accountId) {
+    const { shouldRename } = await promptUser({
+        name: 'shouldRename',
+        type: 'confirm',
+        message: lib.configMigrate.handleAccountNameConflicts.prompts.renameOrOmitAccountPrompt(accountName, accountId),
+    });
+    return shouldRename;
+}
+async function promptNewAccountName(account, globalConfig, renamedAccounts) {
+    const { newAccountName } = await promptUser({
+        name: 'newAccountName',
+        type: 'input',
+        default: `${account.name}_${account.portalId}`,
+        message: lib.configMigrate.handleAccountNameConflicts.prompts.newAccountNamePrompt(account.name, account.portalId),
+        validate: value => {
+            if (!value) {
+                return lib.configMigrate.handleAccountNameConflicts.errors.nameRequired;
+            }
+            if (value === account.name) {
+                return lib.configMigrate.handleAccountNameConflicts.errors.sameName;
+            }
+            const existingAccount = globalConfig.accounts.some(acc => acc.name === value);
+            const renamedAccount = renamedAccounts.some(acc => acc.name === value);
+            if (existingAccount || renamedAccount) {
+                return lib.configMigrate.handleAccountNameConflicts.errors.nameAlreadyInConfig(value);
+            }
+            return true;
+        },
+    });
+    return newAccountName;
+}
 export async function handleMigration(deprecatedConfigPath, hideWarning) {
     if (!hideWarning) {
         uiLogger.warn(lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || getConfigPath(undefined, false)));
@@ -47,20 +78,67 @@ async function handleMergeConfigProperties(globalConfig, deprecatedConfig, force
     }
     return initialConfig;
 }
+async function handleAccountNameConflicts(globalConfig, deprecatedConfig, force) {
+    if (!deprecatedConfig.portals?.length || !globalConfig.accounts?.length) {
+        return deprecatedConfig;
+    }
+    const accountsWithConflictsToRemove = new Set();
+    const renamedAccounts = [];
+    const accountsNotYetInGlobal = deprecatedConfig.portals.filter(portal => portal.portalId &&
+        !globalConfig.accounts.some(acc => acc.accountId === portal.portalId));
+    const accountsWithConflicts = accountsNotYetInGlobal.filter(localAccount => globalConfig.accounts.some(globalAccount => globalAccount.name === localAccount.name));
+    if (accountsWithConflicts.length > 0) {
+        uiLogger.log('');
+        uiLogger.warn(lib.configMigrate.handleAccountNameConflicts.warnings.accountNameConflictMessage(accountsWithConflicts.length));
+        if (force) {
+            const renameDetails = [];
+            for (const account of accountsWithConflicts) {
+                accountsWithConflictsToRemove.add(account);
+                const newAccountName = `${account.name}_${account.portalId}`;
+                renamedAccounts.push({
+                    ...account,
+                    name: newAccountName,
+                });
+                renameDetails.push(`  "${account.name}" → "${newAccountName}" (ID: ${account.portalId})`);
+            }
+            uiLogger.warn(lib.configMigrate.handleAccountNameConflicts.warnings.forceFlagDetected(accountsWithConflicts.length, renameDetails.join('\n')));
+            uiLogger.log('');
+        }
+        else {
+            for (const account of accountsWithConflicts) {
+                uiLogger.log('');
+                const shouldRename = await promptRenameOrOmitAccount(account.name, account.portalId);
+                accountsWithConflictsToRemove.add(account);
+                if (shouldRename) {
+                    const newAccountName = await promptNewAccountName(account, globalConfig, renamedAccounts);
+                    renamedAccounts.push({
+                        ...account,
+                        name: newAccountName,
+                    });
+                }
+            }
+        }
+        deprecatedConfig.portals.push(...renamedAccounts);
+    }
+    const cleanedPortals = deprecatedConfig.portals.filter(portal => !accountsWithConflictsToRemove.has(portal));
+    return { ...deprecatedConfig, portals: cleanedPortals };
+}
 export async function handleMerge(deprecatedConfigPath, force, hideWarning) {
     if (!hideWarning) {
         uiLogger.warn(lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || getConfigPath(undefined, false)));
         uiLogger.log('');
     }
     uiLogger.log(lib.configMigrate.handleMerge.description(ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME));
-    uiLogger.log('');
-    const { shouldMergeConfigs } = await promptUser({
-        name: 'shouldMergeConfigs',
-        type: 'confirm',
-        message: lib.configMigrate.handleMerge.confirmPrompt,
-    });
-    if (!shouldMergeConfigs) {
-        return false;
+    if (!force) {
+        uiLogger.log('');
+        const { shouldMergeConfigs } = await promptUser({
+            name: 'shouldMergeConfigs',
+            type: 'confirm',
+            message: lib.configMigrate.handleMerge.confirmPrompt,
+        });
+        if (shouldMergeConfigs === false) {
+            return true; // exit with "true" so the user is shown a success message instead of an error
+        }
     }
     const deprecatedConfig = getDeprecatedConfig(deprecatedConfigPath);
     const globalConfig = getGlobalConfig();
@@ -68,7 +146,8 @@ export async function handleMerge(deprecatedConfigPath, force, hideWarning) {
         return true;
     }
     const mergedConfig = await handleMergeConfigProperties(globalConfig, deprecatedConfig, force);
-    const { skippedAccountIds } = mergeExistingConfigs(mergedConfig, deprecatedConfig);
+    const cleanedDeprecatedConfig = await handleAccountNameConflicts(mergedConfig, deprecatedConfig, force);
+    const { skippedAccountIds } = mergeExistingConfigs(mergedConfig, cleanedDeprecatedConfig);
     if (skippedAccountIds.length > 0) {
         uiLogger.log('');
         uiLogger.log(lib.configMigrate.handleMerge.skippedExistingAccounts(skippedAccountIds));

package/lib/configOptions.js

@@ -79,6 +79,13 @@ async function enterTimeout() {
             message: lib.configOptions.setHttpTimeout.promptMessage,
             type: 'input',
             default: 30000,
+            validate: (timeout) => {
+                const timeoutNum = parseInt(timeout, 10);
+                if (isNaN(timeoutNum) || timeoutNum < 3000) {
+                    return lib.configOptions.setHttpTimeout.error(timeout);
+                }
+                return true;
+            },
         },
     ]);
     return timeout;