@hubspot/cli 7.7.16-experimental.1 → 7.7.16-experimental.3

package/commands/account/auth.js

@@ -98,9 +98,9 @@ async function handleConfigMigration() {
 const describe = en_1.commands.account.subcommands.auth.describe;
 const command = 'auth';
 async function handler(args) {
-    const { providedAccountId, disableTracking, personalAccessKey: providedPersonalAccessKey, } = args;
+    const { disableTracking, personalAccessKey: providedPersonalAccessKey, derivedAccountId, } = args;
     if (!disableTracking) {
-        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, providedAccountId);
+        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, derivedAccountId);
         await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
     }
     const configMigrationSuccess = await handleConfigMigration();
@@ -114,7 +114,7 @@ async function handler(args) {
     }
     (0, config_1.loadConfig)('');
     (0, process_1.handleExit)(config_1.deleteEmptyConfigFile);
-    const updatedConfig = await updateConfigWithNewAccount(args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, providedAccountId);
+    const updatedConfig = await updateConfigWithNewAccount(args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, derivedAccountId);
     if (!updatedConfig) {
         if (!disableTracking) {
             await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);

package/commands/auth.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const git_1 = require("../lib/ui/git");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
-const lang_1 = require("../lib/lang");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const config_2 = require("@hubspot/local-dev-lib/config");
 const text_1 = require("@hubspot/local-dev-lib/text");
@@ -21,6 +19,8 @@ const exitCodes_1 = require("../lib/enums/exitCodes");
 const ui_1 = require("../lib/ui");
 const index_1 = require("../lib/errorHandlers/index");
 const en_1 = require("../lang/en");
+const logger_1 = require("../lib/ui/logger");
+const parsing_1 = require("../lib/parsing");
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -32,9 +32,19 @@ const ALLOWED_AUTH_METHODS = [
 ];
 const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = (0, text_1.commaSeparatedValues)(ALLOWED_AUTH_METHODS);
 const command = 'auth';
-const describe = (0, lang_1.i18n)('commands.auth.describe');
+const describe = en_1.commands.auth.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, personalAccessKey: providedPersonalAccessKey, } = args;
+    const { authType: authTypeFlagValue, config: configFlagValue, qa, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, } = args;
+    let parsedUserProvidedAccountId;
+    try {
+        if (userProvidedAccount) {
+            parsedUserProvidedAccountId = (0, parsing_1.parseStringToNumber)(userProvidedAccount);
+        }
+    }
+    catch (err) {
+        (0, index_1.logError)(en_1.commands.auth.errors.invalidAccountIdProvided);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     (0, commonOpts_1.setLogLevel)(args);
@@ -46,13 +56,11 @@ async function handler(args) {
         (0, git_1.checkAndWarnGitInclusion)(configPath);
     }
     if ((0, config_2.configFileExists)(true)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.auth.errors.globalConfigFileExists`, {
-            accountAuthCommand: (0, ui_1.uiCommandReference)('hs account auth'),
-        }));
+        logger_1.uiLogger.error(en_1.commands.auth.errors.globalConfigFileExists('hs account auth'));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, usageTracking_1.trackCommandUsage)('auth');
-    (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.STARTED, providedAccountId);
+    (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     let configData;
     let updatedConfig;
     let validName;
@@ -73,7 +81,7 @@ async function handler(args) {
                 ? { personalAccessKey: providedPersonalAccessKey }
                 : await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
                     env,
-                    account: providedAccountId,
+                    account: parsedUserProvidedAccountId,
                 });
             try {
                 token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
@@ -101,24 +109,17 @@ async function handler(args) {
             successAuthMethod = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
             break;
         default:
-            logger_1.logger.error((0, lang_1.i18n)('commands.auth.errors.unsupportedAuthType', {
-                supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
-                type: authType,
-            }));
+            logger_1.uiLogger.error(en_1.commands.auth.errors.unsupportedAuthType(authType, SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT));
             break;
     }
     if (!successAuthMethod) {
-        await (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.ERROR, providedAccountId);
+        await (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const nameFromConfigData = configData && 'name' in configData ? configData.name : undefined;
     const accountName = (updatedConfig && updatedConfig.name) || validName || nameFromConfigData;
     await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(accountName);
-    logger_1.logger.success((0, lang_1.i18n)('commands.auth.success.configFileUpdated', {
-        configFilename: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-        authType: successAuthMethod,
-        accountName,
-    }));
+    logger_1.uiLogger.success(en_1.commands.auth.success.configFileUpdated(accountName, config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, successAuthMethod));
     (0, ui_1.uiFeatureHighlight)([
         'accountsUseCommand',
         'accountOption',
@@ -131,7 +132,7 @@ async function handler(args) {
 function authBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)('commands.auth.options.authType.describe'),
+            describe: en_1.commands.auth.options.authType.describe,
             type: 'string',
             choices: [
                 `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
@@ -140,7 +141,7 @@ function authBuilder(yargs) {
             default: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         },
         account: {
-            describe: (0, lang_1.i18n)('commands.auth.options.account.describe'),
+            describe: en_1.commands.auth.options.account.describe,
             type: 'string',
             alias: 'a',
         },
@@ -153,10 +154,7 @@ function authBuilder(yargs) {
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, command, (0, lang_1.i18n)('commands.auth.verboseDescribe', {
-    authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-    configName: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-}), {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, command, en_1.commands.auth.verboseDescribe(auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value, config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME), {
     useGlobalOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,

package/commands/init.js

@@ -13,13 +13,11 @@ const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const text_1 = require("@hubspot/local-dev-lib/text");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const commonOpts_1 = require("../lib/commonOpts");
 const yargsUtils_1 = require("../lib/yargsUtils");
 const process_1 = require("../lib/process");
 const index_1 = require("../lib/errorHandlers/index");
-const lang_1 = require("../lib/lang");
 const usageTracking_1 = require("../lib/usageTracking");
 const promptUtils_1 = require("../lib/prompts/promptUtils");
 const personalAccessKeyPrompt_1 = require("../lib/prompts/personalAccessKeyPrompt");
@@ -27,6 +25,9 @@ const accountNamePrompt_1 = require("../lib/prompts/accountNamePrompt");
 const oauth_1 = require("../lib/oauth");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const ui_1 = require("../lib/ui");
+const logger_1 = require("../lib/ui/logger");
+const en_1 = require("../lang/en");
+const parsing_1 = require("../lib/parsing");
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -61,9 +62,19 @@ const AUTH_TYPE_NAMES = {
     [auth_1.OAUTH_AUTH_METHOD.value]: auth_1.OAUTH_AUTH_METHOD.name,
 };
 const command = 'init';
-const describe = (0, lang_1.i18n)(`commands.init.describe`);
+const describe = en_1.commands.init.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = args;
+    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, useHiddenConfig, userProvidedAccount, } = args;
+    let parsedUserProvidedAccountId;
+    try {
+        if (userProvidedAccount) {
+            parsedUserProvidedAccountId = (0, parsing_1.parseStringToNumber)(userProvidedAccount);
+        }
+    }
+    catch (err) {
+        logger_1.uiLogger.error(en_1.commands.init.errors.invalidAccountIdProvided);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     const configPath = (configFlagValue && path_1.default.join((0, path_2.getCwd)(), configFlagValue)) ||
@@ -76,28 +87,24 @@ async function handler(args) {
     }
     const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
     if ((0, config_1.configFileExists)(true)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.globalConfigFileExists`, {
-            accountAuthCommand: (0, ui_1.uiCommandReference)('hs account auth'),
-        }));
+        logger_1.uiLogger.error(en_1.commands.init.errors.globalConfigFileExists);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (fs_extra_1.default.existsSync(configPath)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.configFileExists`, {
-            configPath: configPath,
-        }));
-        logger_1.logger.info((0, lang_1.i18n)(`commands.init.logs.updateConfig`));
+        logger_1.uiLogger.error(en_1.commands.init.errors.configFileExists(configPath));
+        logger_1.uiLogger.info(en_1.commands.init.logs.updateConfig);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
-        await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
+        await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     }
     const doesOtherConfigFileExist = (0, config_1.configFileExists)(!useHiddenConfig);
     if (doesOtherConfigFileExist) {
         const path = (0, config_1.getConfigPath)('', !useHiddenConfig);
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.bothConfigFilesNotAllowed`, { path: path }));
+        logger_1.uiLogger.error(en_1.commands.init.errors.bothConfigFilesNotAllowed(path));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
+    (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     (0, config_1.createEmptyConfigFile)({ path: configPath }, useHiddenConfig);
     //Needed to load deprecated config
     (0, config_1.loadConfig)(configPath, args);
@@ -106,7 +113,7 @@ async function handler(args) {
         let accountId;
         let name;
         if (authType === auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
-            const personalAccessKeyResult = await personalAccessKeyConfigCreationFlow(env, providedAccountId);
+            const personalAccessKeyResult = await personalAccessKeyConfigCreationFlow(env, parsedUserProvidedAccountId);
             if (personalAccessKeyResult) {
                 accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(personalAccessKeyResult);
                 name = personalAccessKeyResult.name;
@@ -124,14 +131,9 @@ async function handler(args) {
         catch (e) {
             (0, index_1.debugError)(e);
         }
-        logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileCreated`, {
-            configPath: configPath,
-        }));
-        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileUpdated`, {
-            authType: AUTH_TYPE_NAMES[authType],
-            account: name || accountId,
-        }));
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.success(en_1.commands.init.success.configFileCreated(configPath));
+        logger_1.uiLogger.success(en_1.commands.init.success.configFileUpdated(AUTH_TYPE_NAMES[authType], name || accountId));
         (0, ui_1.uiFeatureHighlight)([
             'getStartedCommand',
             'helpCommand',
@@ -146,7 +148,7 @@ async function handler(args) {
     catch (err) {
         (0, index_1.logError)(err);
         if (!disableTracking) {
-            await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.ERROR, providedAccountId);
+            await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
         }
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
@@ -154,7 +156,7 @@ async function handler(args) {
 function initBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)(`commands.init.options.authType.describe`),
+            describe: en_1.commands.init.options.authType.describe,
             type: 'string',
             choices: [
                 `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
@@ -163,7 +165,7 @@ function initBuilder(yargs) {
             default: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         },
         account: {
-            describe: (0, lang_1.i18n)(`commands.init.options.account.describe`),
+            describe: en_1.commands.init.options.account.describe,
             type: 'string',
             alias: 'a',
         },
@@ -176,11 +178,7 @@ function initBuilder(yargs) {
     yargs.conflicts('use-hidden-config', 'config');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, command, (0, lang_1.i18n)(`commands.init.verboseDescribe`, {
-    command: (0, ui_1.uiCommandReference)('hs auth'),
-    configName: config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-    authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-}), {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, command, en_1.commands.init.verboseDescribe(config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, (0, ui_1.uiCommandReference)('hs auth'), auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value), {
     useGlobalOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,

package/commands/project/dev/deprecatedFlow.js

@@ -19,7 +19,7 @@ const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
 const ensureProjectExists_1 = require("../../../lib/projects/ensureProjectExists");
 async function deprecatedProjectDevFlow({ args, accountId, projectConfig, projectDir, }) {
-    const { providedAccountId, derivedAccountId } = args;
+    const { userProvidedAccount, derivedAccountId } = args;
     const env = (0, environment_1.getValidEnv)((0, config_1.getEnv)(derivedAccountId));
     const components = await (0, structure_1.findProjectComponents)(projectDir);
     const runnableComponents = components.filter(component => component.runnable);
@@ -65,11 +65,11 @@ async function deprecatedProjectDevFlow({ args, accountId, projectConfig, projec
     }
     // targetProjectAccountId and targetTestingAccountId are set to null if --account flag is not provided.
     // By setting them to null, we can later check if they need to be assigned based on the default account configuration and the type of app.
-    let targetProjectAccountId = providedAccountId ? derivedAccountId : null;
+    let targetProjectAccountId = userProvidedAccount ? derivedAccountId : null;
     // The account that we are locally testing against
-    let targetTestingAccountId = providedAccountId ? derivedAccountId : null;
+    let targetTestingAccountId = userProvidedAccount ? derivedAccountId : null;
     // Check that the default account or flag option is valid for the type of app in this project
-    if (providedAccountId) {
+    if (userProvidedAccount) {
         (0, helpers_1.checkIfAccountFlagIsSupported)(accountConfig, hasPublicApps);
         if (hasPublicApps) {
             targetProjectAccountId = accountConfig.parentAccountId || null;

package/commands/project/dev/index.js

@@ -15,19 +15,19 @@ const en_1 = require("../../../lang/en");
 const logger_1 = require("../../../lib/ui/logger");
 const command = 'dev';
 const describe = (0, ui_1.uiBetaTag)(en_1.commands.project.dev.describe, false);
-function validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3) {
+function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV3) {
     // Legacy projects do not support targetTestingAccount and targetProjectAccount
     if (testingAccount && projectAccount && !useV3) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagLegacy);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    if (providedAccountId && useV3) {
+    if (userProvidedAccount && useV3) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagV3);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
 async function handler(args) {
-    const { derivedAccountId, providedAccountId, testingAccount, projectAccount, } = args;
+    const { derivedAccountId, userProvidedAccount, testingAccount, projectAccount, } = args;
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     (0, config_2.validateProjectConfig)(projectConfig, projectDir);
     const useV3 = (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion);
@@ -35,9 +35,9 @@ async function handler(args) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.noProjectConfig);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3);
+    validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV3);
     let targetProjectAccountId = (projectAccount && (0, config_1.getAccountId)(projectAccount)) ||
-        (providedAccountId && derivedAccountId);
+        (userProvidedAccount && derivedAccountId);
     let profile;
     if (!targetProjectAccountId && (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
         if (args.profile) {

package/commands/sandbox/delete.js

@@ -19,10 +19,10 @@ const yargsUtils_1 = require("../../lib/yargsUtils");
 const command = 'delete';
 const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.describe`), false);
 async function handler(args) {
-    const { providedAccountId, force } = args;
-    (0, usageTracking_1.trackCommandUsage)('sandbox-delete', {}, providedAccountId);
+    const { userProvidedAccount, derivedAccountId, force } = args;
+    (0, usageTracking_1.trackCommandUsage)('sandbox-delete', {}, derivedAccountId);
     let accountPrompt;
-    if (!providedAccountId) {
+    if (!userProvidedAccount) {
         if (!force) {
             accountPrompt = await (0, sandboxesPrompt_1.deleteSandboxPrompt)();
         }
@@ -40,7 +40,7 @@ async function handler(args) {
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
-    const sandboxAccountId = (0, config_1.getAccountId)(providedAccountId || accountPrompt.account);
+    const sandboxAccountId = (0, config_1.getAccountId)(userProvidedAccount || accountPrompt.account);
     if (!sandboxAccountId) {
         logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noSandboxAccountId`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -114,7 +114,7 @@ async function handler(args) {
             : `commands.sandbox.subcommands.delete.success.delete`;
         logger_1.logger.log('');
         logger_1.logger.success((0, lang_1.i18n)(deleteKey, {
-            account: providedAccountId || accountPrompt.account,
+            account: userProvidedAccount || accountPrompt.account,
             sandboxHubId: sandboxAccountId || '',
         }));
         logger_1.logger.log('');

package/commands/testAccount/create.js

@@ -15,6 +15,9 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const validation_1 = require("../../lib/validation");
 const en_1 = require("../../lang/en");
 const createDeveloperTestAccountConfigPrompt_1 = require("../../lib/prompts/createDeveloperTestAccountConfigPrompt");
+const errorHandlers_1 = require("../../lib/errorHandlers");
+const polling_1 = require("../../lib/polling");
+const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const command = 'create';
 const describe = en_1.commands.testAccount.create.describe;
 async function handler(args) {
@@ -62,6 +65,13 @@ async function handler(args) {
         testAccountConfig = await (0, createDeveloperTestAccountConfigPrompt_1.createDeveloperTestAccountConfigPrompt)();
     }
     const jsonOutput = {};
+    let testAccountId;
+    SpinniesManager_1.default.init({
+        succeedColor: 'white',
+    });
+    SpinniesManager_1.default.add('createTestAccount', {
+        text: en_1.commands.testAccount.create.polling.start(testAccountConfig.accountName),
+    });
     try {
         const { data } = await (0, developerTestAccounts_1.createDeveloperTestAccount)(derivedAccountId, testAccountConfig);
         if (formatOutputAsJson) {
@@ -69,12 +79,27 @@ async function handler(args) {
             jsonOutput.accountId = data.id;
             jsonOutput.personalAccessKey = data.personalAccessKey;
         }
-        logger_1.uiLogger.success(en_1.commands.testAccount.create.success.configFileUpdated(data.accountName, data.id));
+        testAccountId = data.id;
     }
     catch (err) {
-        logger_1.uiLogger.error(en_1.commands.testAccount.create.errors.failedToCreate);
+        (0, errorHandlers_1.logError)(err);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    SpinniesManager_1.default.update('createTestAccount', {
+        text: en_1.commands.testAccount.create.polling.syncing,
+    });
+    try {
+        await (0, polling_1.poll)(() => (0, developerTestAccounts_1.fetchDeveloperTestAccountGateSyncStatus)(derivedAccountId, testAccountId), {
+            successStates: ['SUCCESS'],
+            errorStates: [],
+        });
+    }
+    catch (err) {
+        (0, errorHandlers_1.logError)(err);
+    }
+    SpinniesManager_1.default.succeed('createTestAccount', {
+        text: en_1.commands.testAccount.create.polling.success(testAccountConfig.accountName, testAccountId),
+    });
     if (formatOutputAsJson) {
         logger_1.uiLogger.json(jsonOutput);
     }

package/lang/en.d.ts

@@ -189,8 +189,11 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
         };
     };
     readonly auth: {
-        readonly describe: (configName: string) => string;
+        readonly describe: "Configure authentication for your HubSpot account.";
+        readonly verboseDescribe: (configName: string, authMethod: string) => string;
         readonly errors: {
+            readonly invalidAccountIdProvided: "--account must be a number.";
+            readonly globalConfigFileExists: (accountAuthCommand: string) => string;
             readonly noConfigFileFound: "No config file was found. To create a new config file, use the \"hs init\" command.";
             readonly unsupportedAuthType: (type: string, supportedProtocols: string) => string;
         };
@@ -735,7 +738,8 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
         };
     };
     readonly init: {
-        readonly describe: (configName: string) => string;
+        readonly describe: "Create a CLI config file and configure authentication for your HubSpot account.";
+        readonly verboseDescribe: (configName: string, command: string, authMethod: string) => string;
         readonly options: {
             readonly authType: {
                 readonly describe: "Authentication mechanism";
@@ -750,14 +754,16 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
         };
         readonly success: {
             readonly configFileCreated: (configPath: string) => string;
-            readonly configFileUpdated: (account: string, authType: string) => string;
+            readonly configFileUpdated: (authType: string, account: string | number) => string;
         };
         readonly logs: {
             readonly updateConfig: "To update an existing config file, use the \"hs auth\" command.";
         };
         readonly errors: {
+            readonly invalidAccountIdProvided: "--account must be a number.";
             readonly configFileExists: (configPath: string) => string;
             readonly bothConfigFilesNotAllowed: (path: string) => string;
+            readonly globalConfigFileExists: `You are using our new global configuration for account management, which is not compatible with this command. Please use ${string} instead.`;
         };
     };
     readonly lint: {
@@ -1796,10 +1802,11 @@ ${string}`;
             readonly errors: {
                 readonly configFileNotFound: (configPath: string) => string;
                 readonly configFileParseFailed: (configPath: string) => string;
-                readonly failedToCreate: "Failed to create test account";
             };
-            readonly success: {
-                readonly configFileUpdated: (testAccountName: string, testAccountId: number) => string;
+            readonly polling: {
+                readonly start: (testAccountName: string) => string;
+                readonly syncing: "Test account created! Syncing account data... (may take a few minutes - you can exit and the sync will continue)";
+                readonly success: (testAccountName: string, testAccountId: number) => string;
             };
             readonly options: {
                 readonly configPath: "The path to the test account config";
@@ -2426,6 +2433,12 @@ ${string}`;
     };
 };
 export declare const lib: {
+    readonly parsing: {
+        readonly unableToParseStringToNumber: "Unable to parse string to number";
+    };
+    readonly configMiddleWare: {
+        readonly invalidAccountIdEnvironmentVariable: "Unable to parse `HUBSPOT_ACCOUNT_ID` environment variable into a number";
+    };
     readonly process: {
         readonly exitDebug: (signal: string) => string;
     };

package/lang/en.js

@@ -196,8 +196,11 @@ exports.commands = {
         },
     },
     auth: {
-        describe: (configName) => `Configure authentication for your HubSpot account. This will update the ${configName} file that stores your account information.`,
+        describe: 'Configure authentication for your HubSpot account.',
+        verboseDescribe: (configName, authMethod) => `Configure authentication for a HubSpot account. This will update the ${configName} file that stores your account information.\n\nThe recommended authentication method is ${chalk_1.default.bold(authMethod)}, which uses an access token tied to a specific user account.`,
         errors: {
+            invalidAccountIdProvided: `--account must be a number.`,
+            globalConfigFileExists: (accountAuthCommand) => `You are using our new global configuration for account management, which is not compatible with this command. Please use ${(0, ui_1.uiCommandReference)(accountAuthCommand)} instead.`,
             noConfigFileFound: 'No config file was found. To create a new config file, use the "hs init" command.',
             unsupportedAuthType: (type, supportedProtocols) => `Unsupported auth type: ${type}. The only supported authentication protocols are ${supportedProtocols}.`,
         },
@@ -744,7 +747,8 @@ exports.commands = {
         },
     },
     init: {
-        describe: (configName) => `Configure authentication for your HubSpot account. This will create a ${configName} file to store your account information.`,
+        describe: 'Create a CLI config file and configure authentication for your HubSpot account.',
+        verboseDescribe: (configName, command, authMethod) => `Configure authentication for a HubSpot account. This will create a ${configName} file to store your account information. To configure authentication for additional accounts, run ${command}.\n\nThe recommended authentication method is ${chalk_1.default.bold(authMethod)}, which uses an access token tied to a specific user account.`,
         options: {
             authType: {
                 describe: 'Authentication mechanism',
@@ -759,14 +763,16 @@ exports.commands = {
         },
         success: {
             configFileCreated: (configPath) => `Created config file "${configPath}"`,
-            configFileUpdated: (account, authType) => `Connected account "${account}" using "${authType}" and set it as the default account`,
+            configFileUpdated: (authType, account) => `Connected account "${account}" using "${authType}" and set it as the default account`,
         },
         logs: {
             updateConfig: 'To update an existing config file, use the "hs auth" command.',
         },
         errors: {
+            invalidAccountIdProvided: `--account must be a number.`,
             configFileExists: (configPath) => `The config file ${configPath} already exists.`,
             bothConfigFilesNotAllowed: (path) => `Unable to create config file, because there is an existing one at "${path}". To create a new config file, delete the existing one and try again.`,
+            globalConfigFileExists: `You are using our new global configuration for account management, which is not compatible with this command. Please use ${(0, ui_1.uiCommandReference)('hs account auth')} instead.`,
         },
     },
     lint: {
@@ -1794,10 +1800,11 @@ exports.commands = {
             errors: {
                 configFileNotFound: (configPath) => `No test account config file exists at ${configPath}. Create a test account config file with the ${(0, ui_1.uiCommandReference)('hs test-account create-config')} command.`,
                 configFileParseFailed: (configPath) => `Failed to parse test account config file at ${configPath}`,
-                failedToCreate: 'Failed to create test account',
             },
-            success: {
-                configFileUpdated: (testAccountName, testAccountId) => `Test account "${testAccountName}" successfully created with id ${testAccountId}`,
+            polling: {
+                start: (testAccountName) => `Creating test account "${chalk_1.default.bold(testAccountName)}"...`,
+                syncing: 'Test account created! Syncing account data... (may take a few minutes - you can exit and the sync will continue)',
+                success: (testAccountName, testAccountId) => `Test account "${chalk_1.default.bold(testAccountName)}" successfully created with id: ${chalk_1.default.bold(testAccountId)}`,
             },
             options: {
                 configPath: 'The path to the test account config',
@@ -2424,6 +2431,12 @@ exports.commands = {
     },
 };
 exports.lib = {
+    parsing: {
+        unableToParseStringToNumber: 'Unable to parse string to number',
+    },
+    configMiddleWare: {
+        invalidAccountIdEnvironmentVariable: 'Unable to parse `HUBSPOT_ACCOUNT_ID` environment variable into a number',
+    },
     process: {
         exitDebug: (signal) => `Attempting to gracefully exit. Triggered by ${signal}`,
     },

package/lib/commonOpts.js

@@ -136,7 +136,7 @@ async function addCustomHelpOutput(yargs, command, describe) {
 function setLogLevel(options) {
     const { debug, networkDebug, json } = options;
     if (json) {
-        (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.NONE);
+        (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.ERROR);
     }
     else if (debug) {
         (0, logger_1.setLogLevel)(logger_1.LOG_LEVEL.DEBUG);

package/lib/middleware/__test__/configMiddleware.test.js

@@ -109,7 +109,7 @@ describe('lib/middleware/configMiddleware', () => {
                 $0: 'hs',
             };
             await (0, configMiddleware_1.injectAccountIdMiddleware)(argv);
-            expect(argv.providedAccountId).toBeUndefined();
+            expect(argv.userProvidedAccount).toBeUndefined();
             expect(argv.derivedAccountId).toBe(123);
             expect(getAccountIdSpy).not.toHaveBeenCalled();
             process.env = originalEnv;
@@ -123,7 +123,7 @@ describe('lib/middleware/configMiddleware', () => {
                 $0: 'hs',
             };
             await (0, configMiddleware_1.injectAccountIdMiddleware)(argv);
-            expect(argv.providedAccountId).toBe('test-account');
+            expect(argv.userProvidedAccount).toBe('test-account');
             expect(argv.derivedAccountId).toBe(456);
             expect(getAccountIdSpy).toHaveBeenCalledWith('test-account');
         });

package/lib/middleware/configMiddleware.js

@@ -11,6 +11,9 @@ const exitCodes_1 = require("../enums/exitCodes");
 const lang_1 = require("../lang");
 const ui_1 = require("../ui");
 const utils_1 = require("./utils");
+const parsing_1 = require("../parsing");
+const logger_2 = require("../ui/logger");
+const en_1 = require("../../lang/en");
 function handleDeprecatedEnvVariables(argv) {
     // HUBSPOT_PORTAL_ID is deprecated, but we'll still support it for now
     // The HubSpot GH Deploy Action still uses HUBSPOT_PORTAL_ID
@@ -29,9 +32,14 @@ function handleDeprecatedEnvVariables(argv) {
 async function injectAccountIdMiddleware(argv) {
     const { account } = argv;
     // Preserves the original --account flag for certain commands.
-    argv.providedAccountId = account;
+    argv.userProvidedAccount = account;
     if (argv.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
-        argv.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
+        try {
+            argv.derivedAccountId = (0, parsing_1.parseStringToNumber)(process.env.HUBSPOT_ACCOUNT_ID);
+        }
+        catch (err) {
+            logger_2.uiLogger.error(en_1.lib.configMiddleWare.invalidAccountIdEnvironmentVariable);
+        }
     }
     else {
         argv.derivedAccountId = (0, config_1.getAccountId)(account);

package/lib/parsing.d.ts

@@ -0,0 +1 @@
+export declare function parseStringToNumber(maybeNumber: string): number;

package/lib/parsing.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseStringToNumber = parseStringToNumber;
+const en_1 = require("../lang/en");
+function parseStringToNumber(maybeNumber) {
+    const result = parseInt(maybeNumber, 10);
+    if (Number.isNaN(result) || !/^-?\d+$/.test(maybeNumber)) {
+        throw new Error(en_1.lib.parsing.unableToParseStringToNumber);
+    }
+    return result;
+}

package/lib/prompts/personalAccessKeyPrompt.js

@@ -29,7 +29,7 @@ async function personalAccessKeyPrompt({ env, account, }) {
         if (account) {
             url = `${websiteOrigin}/personal-access-key/${account}`;
         }
-        const { personalAcessKeyBrowserOpenPrep: choice } = await (0, promptUtils_1.promptUser)([
+        const { personalAccessKeyBrowserOpenPrep: choice } = await (0, promptUtils_1.promptUser)([
             PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP,
         ]);
         if (!choice) {
@@ -94,7 +94,7 @@ const CLIENT_SECRET = {
     },
 };
 const PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP = {
-    name: 'personalAcessKeyBrowserOpenPrep',
+    name: 'personalAccessKeyBrowserOpenPrep',
     type: 'list',
     message: 'Choose your preferred method of authentication',
     choices: Object.values(en_1.lib.prompts.personalAccessKeyPrompt.personalAccessKeyPromptChoices),

package/lib/validation.d.ts

@@ -4,7 +4,7 @@ export declare function validateAccount(options: Arguments<{
     account?: string;
     accountId?: string;
     derivedAccountId?: number;
-    providedAccountId?: string;
+    userProvidedAccount?: string;
 }>): Promise<boolean>;
 export declare function validateCmsPublishMode(options: Arguments<{
     cmsPublishMode?: CmsPublishMode;

package/lib/validation.js

@@ -50,18 +50,18 @@ const path_1 = require("@hubspot/local-dev-lib/path");
 const commonOpts_1 = require("./commonOpts");
 const index_1 = require("./errorHandlers/index");
 async function validateAccount(options) {
-    const { derivedAccountId, providedAccountId } = options;
+    const { derivedAccountId, userProvidedAccount } = options;
     const accountId = (0, config_1.getAccountId)(derivedAccountId);
     if (!accountId) {
-        if (providedAccountId) {
-            logger_1.logger.error(`The account "${providedAccountId}" could not be found in the config`);
+        if (userProvidedAccount) {
+            logger_1.logger.error(`The account "${userProvidedAccount}" could not be found in the config`);
         }
         else {
             logger_1.logger.error('An account needs to be supplied either via "--account" or through setting a "defaultPortal"');
         }
         return false;
     }
-    if (providedAccountId && (0, config_1.loadConfigFromEnvironment)()) {
+    if (userProvidedAccount && (0, config_1.loadConfigFromEnvironment)()) {
         throw new Error('Cannot specify an account when environment variables are supplied. Please unset the environment variables or do not use the "--account" flag.');
     }
     const accountConfig = (0, config_1.getAccountConfig)(accountId);

package/mcp-server/tools/project/CreateProjectTool.d.ts

@@ -14,17 +14,17 @@ declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: string;
     destination: string;
     auth?: "oauth" | "static" | undefined;
-    name?: string | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+    name?: string | undefined;
 }, {
     projectBase: "app" | "empty";
     absoluteCurrentWorkingDirectory: string;
     destination: string;
     auth?: "oauth" | "static" | undefined;
-    name?: string | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+    name?: string | undefined;
 }>;
 export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class CreateProjectTool extends Tool<CreateProjectInputSchema> {

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.16-experimental.1",
+    "version": "7.7.16-experimental.3",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
-        "@hubspot/local-dev-lib": "3.10.0-beta.0",
+        "@hubspot/local-dev-lib": "3.11.0",
         "@hubspot/project-parsing-lib": "0.3.2",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",

package/types/Yargs.d.ts

@@ -2,7 +2,7 @@ import { Options, CommandModule, Argv } from 'yargs';
 import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
 export type CommonArgs = {
     derivedAccountId: number;
-    providedAccountId?: number;
+    userProvidedAccount?: string;
     d: boolean;
     debug: boolean;
 };