@hubspot/cli 5.1.4-beta.0 → 5.1.4-beta.1

package/commands/accounts/list.js

@@ -12,8 +12,15 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { getSandboxTypeAsString } = require('../../lib/sandboxes');
+const { isSandbox, getSandboxName } = require('../../lib/sandboxes');
+const {
+  isDeveloperTestAccount,
+  DEV_TEST_ACCOUNT_STRING,
+} = require('../../lib/developerTestAccounts');
 const { i18n } = require('../../lib/lang');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.commands.accounts.subcommands.list';
 
@@ -22,29 +29,32 @@ exports.describe = i18n(`${i18nKey}.describe`);
 
 const sortAndMapPortals = portals => {
   const mappedPortalData = {};
+  // Standard and app developer portals
   portals
-    .sort((a, b) => {
-      if (a.sandboxAccountType === null && b.sandboxAccountType !== null) {
-        return -1;
-      }
-      if (a.sandboxAccountType !== null && b.sandboxAccountType === null) {
-        return 1;
-      }
-      return 0;
-    })
+    .filter(p =>
+      p.accountType
+        ? p.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD ||
+          p.accountType === HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER
+        : p.sandboxAccountType === null
+    )
     .forEach(portal => {
-      if (
-        portal.sandboxAccountType !== undefined &&
-        portal.sandboxAccountType === null
-      ) {
-        mappedPortalData[portal.portalId] = [portal];
-      } else if (portal.sandboxAccountType && portal.parentAccountId) {
-        mappedPortalData[portal.parentAccountId] = [
-          ...(mappedPortalData[portal.parentAccountId] || []),
-          portal,
+      mappedPortalData[portal.portalId] = [portal];
+    });
+  // Non-standard portals (sandbox, developer test account)
+  portals
+    .filter(p =>
+      p.accountType
+        ? isSandbox(p) || isDeveloperTestAccount(p)
+        : p.sandboxAccountType !== null
+    )
+    .forEach(p => {
+      if (p.parentAccountId) {
+        mappedPortalData[p.parentAccountId] = [
+          ...(mappedPortalData[p.parentAccountId] || []),
+          p,
         ];
       } else {
-        mappedPortalData[portal.portalId] = [portal];
+        mappedPortalData[p.portalId] = [p];
       }
     });
   return mappedPortalData;
@@ -53,18 +63,20 @@ const sortAndMapPortals = portals => {
 const getPortalData = mappedPortalData => {
   const portalData = [];
   Object.values(mappedPortalData).forEach(set => {
-    set.forEach((portal, i) => {
-      if (i === 0) {
-        portalData.push([portal.name, portal.portalId, portal.authType]);
-      } else {
-        portalData.push([
-          `↳ ${portal.name} [${getSandboxTypeAsString(
-            portal.sandboxAccountType
-          )} sandbox]`,
-          portal.portalId,
-          portal.authType,
-        ]);
+    set.forEach(portal => {
+      let name = portal.name;
+      if (isSandbox(portal)) {
+        name = `${portal.name} ${getSandboxName(portal)}`;
+        if (set.length > 1) {
+          name = `↳ ${name}`;
+        }
+      } else if (isDeveloperTestAccount(portal)) {
+        name = `${portal.name} [${DEV_TEST_ACCOUNT_STRING}]`;
+        if (set.length > 1) {
+          name = `↳ ${name}`;
+        }
       }
+      portalData.push([name, portal.portalId, portal.authType]);
     });
   });
   return portalData;

package/commands/project/dev.js

@@ -40,15 +40,14 @@ const {
 const { confirmPrompt } = require('../../lib/prompts/promptUtils');
 const {
   selectTargetAccountPrompt,
-  confirmDefaultSandboxAccountPrompt,
+  confirmDefaultAccountPrompt,
 } = require('../../lib/prompts/projectDevTargetAccountPrompt');
 const SpinniesManager = require('../../lib/SpinniesManager');
 const LocalDevManager = require('../../lib/LocalDevManager');
-const { isSandbox } = require('../../lib/sandboxes');
+const { isSandbox, getSandboxTypeAsString } = require('../../lib/sandboxes');
 const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
   validateSandboxUsageLimits,
-  DEVELOPER_SANDBOX,
   getAvailableSyncTypes,
 } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
@@ -58,8 +57,8 @@ const {
   ERROR_TYPES,
 } = require('@hubspot/cli-lib/lib/constants');
 
-const { buildSandbox } = require('../../lib/sandbox-create');
-const { syncSandbox } = require('../../lib/sandbox-sync');
+const { buildSandbox } = require('../../lib/sandboxCreate');
+const { syncSandbox } = require('../../lib/sandboxSync');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   logApiErrorInstance,
@@ -70,6 +69,11 @@ const {
   isMissingScopeError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const {
+  isDeveloperTestAccount,
+  DEV_TEST_ACCOUNT_STRING,
+} = require('../../lib/developerTestAccounts');
+const { DEVELOPER_SANDBOX_TYPE } = require('../../lib/constants');
 
 const i18nKey = 'cli.commands.project.subcommands.dev';
 
@@ -99,19 +103,27 @@ exports.handler = async options => {
   let targetAccountId = options.account ? accountId : null;
   let createNewSandbox = false;
   const defaultAccountIsSandbox = isSandbox(accountConfig);
+  const defaultAccountIsDeveloperTestAccount = isDeveloperTestAccount(
+    accountConfig
+  );
 
-  if (!targetAccountId && defaultAccountIsSandbox) {
+  if (
+    !targetAccountId &&
+    (defaultAccountIsSandbox || defaultAccountIsDeveloperTestAccount)
+  ) {
     logger.log();
-    const useDefaultSandboxAccount = await confirmDefaultSandboxAccountPrompt(
+    const useDefaultAccount = await confirmDefaultAccountPrompt(
       accountConfig.name,
-      accountConfig.sandboxAccountType
+      defaultAccountIsSandbox
+        ? `${getSandboxTypeAsString(accountConfig.accountType)} sandbox`
+        : DEV_TEST_ACCOUNT_STRING
     );
 
-    if (useDefaultSandboxAccount) {
+    if (useDefaultAccount) {
       targetAccountId = accountId;
     } else {
       logger.log(
-        i18n(`${i18nKey}.logs.declineDefaultSandboxExplanation`, {
+        i18n(`${i18nKey}.logs.declineDefaultAccountExplanation`, {
           useCommand: uiCommandReference('hs accounts use'),
           devCommand: uiCommandReference('hs project dev'),
         })
@@ -138,7 +150,11 @@ exports.handler = async options => {
 
   if (createNewSandbox) {
     try {
-      await validateSandboxUsageLimits(accountConfig, DEVELOPER_SANDBOX, env);
+      await validateSandboxUsageLimits(
+        accountConfig,
+        DEVELOPER_SANDBOX_TYPE,
+        env
+      );
     } catch (err) {
       if (isMissingScopeError(err)) {
         logger.error(
@@ -160,7 +176,7 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.ERROR);
     }
     try {
-      const { name } = await sandboxNamePrompt(DEVELOPER_SANDBOX);
+      const { name } = await sandboxNamePrompt(DEVELOPER_SANDBOX_TYPE);
 
       trackCommandMetadataUsage(
         'sandbox-create',
@@ -170,7 +186,7 @@ exports.handler = async options => {
 
       const { result } = await buildSandbox({
         name,
-        type: DEVELOPER_SANDBOX,
+        type: DEVELOPER_SANDBOX_TYPE,
         accountConfig,
         env,
       });

package/commands/sandbox/create.js

@@ -9,13 +9,11 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
-const { buildSandbox } = require('../../lib/sandbox-create');
-const { uiFeatureHighlight } = require('../../lib/ui');
+const { buildSandbox } = require('../../lib/sandboxCreate');
+const { uiFeatureHighlight, uiAccountDescription } = require('../../lib/ui');
 const {
   sandboxTypeMap,
-  DEVELOPER_SANDBOX,
   getSandboxTypeAsString,
-  getAccountName,
   getAvailableSyncTypes,
   syncTypes,
   validateSandboxUsageLimits,
@@ -31,12 +29,13 @@ const {
   sandboxNamePrompt,
 } = require('../../lib/prompts/sandboxesPrompt');
 const { promptUser } = require('../../lib/prompts/promptUtils');
-const { syncSandbox } = require('../../lib/sandbox-sync');
+const { syncSandbox } = require('../../lib/sandboxSync');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const {
   isMissingScopeError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
+const { DEVELOPER_SANDBOX_TYPE } = require('../../lib/constants');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.create';
 
@@ -123,7 +122,7 @@ exports.handler = async options => {
         name: 'sandboxSyncPrompt',
         type: 'confirm',
         message: i18n(`${syncI18nKey}.confirm.createFlow.${sandboxType}`, {
-          parentAccountName: getAccountName(accountConfig),
+          parentAccountName: uiAccountDescription(accountId),
           sandboxName,
         }),
       },
@@ -192,7 +191,7 @@ exports.handler = async options => {
     }
 
     const highlightItems = ['accountsUseCommand', 'projectCreateCommand'];
-    if (sandboxType === DEVELOPER_SANDBOX) {
+    if (sandboxType === DEVELOPER_SANDBOX_TYPE) {
       highlightItems.push('projectDevCommand');
     } else {
       highlightItems.push('projectUploadCommand');

package/commands/sandbox/delete.js

@@ -22,7 +22,6 @@ const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
   getConfig,
   getEnv,
-  getAccountConfig,
   removeSandboxAccountFromConfig,
   updateDefaultAccount,
 } = require('@hubspot/local-dev-lib/config');
@@ -33,8 +32,8 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 
-const { getAccountName } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
+const { uiAccountDescription } = require('../../lib/ui');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.delete';
 
@@ -69,7 +68,6 @@ exports.handler = async options => {
   const sandboxAccountId = getAccountId({
     account: account || accountPrompt.account,
   });
-  const accountConfig = getAccountConfig(sandboxAccountId);
   const isDefaultAccount =
     sandboxAccountId === getAccountId(config.defaultPortal);
 
@@ -94,7 +92,6 @@ exports.handler = async options => {
     }
   }
 
-  const parentAccount = getAccountConfig(parentAccountId);
   const url = `${baseUrl}/sandboxes/${parentAccountId}`;
   const command = `hs auth ${
     getEnv(sandboxAccountId) === 'qa' ? '--qa' : ''
@@ -115,14 +112,14 @@ exports.handler = async options => {
 
   logger.debug(
     i18n(`${i18nKey}.debug.deleting`, {
-      account: getAccountName(accountConfig),
+      account: uiAccountDescription(sandboxAccountId),
     })
   );
 
   if (isDefaultAccount) {
     logger.info(
       i18n(`${i18nKey}.defaultAccountWarning`, {
-        account: getAccountName(accountConfig),
+        account: uiAccountDescription(sandboxAccountId),
       })
     );
     logger.log('');
@@ -135,7 +132,7 @@ exports.handler = async options => {
           name: 'confirmSandboxDeletePrompt',
           type: 'confirm',
           message: i18n(`${i18nKey}.confirm`, {
-            account: getAccountName(accountConfig),
+            account: uiAccountDescription(sandboxAccountId),
           }),
         },
       ]);
@@ -177,7 +174,7 @@ exports.handler = async options => {
       logger.log('');
       logger.error(
         i18n(`${i18nKey}.failure.invalidKey`, {
-          account: getAccountName(parentAccount),
+          account: uiAccountDescription(parentAccountId),
         })
       );
     } else if (
@@ -190,8 +187,8 @@ exports.handler = async options => {
       logger.log('');
       logger.error(
         i18n(`${i18nKey}.failure.invalidUser`, {
-          accountName: getAccountName(accountConfig),
-          parentAccountName: getAccountName(parentAccount),
+          accountName: uiAccountDescription(sandboxAccountId),
+          parentAccountName: uiAccountDescription(parentAccountId),
         })
       );
       logger.log('');
@@ -205,7 +202,7 @@ exports.handler = async options => {
       logger.log('');
       logger.warn(
         i18n(`${i18nKey}.failure.objectNotFound`, {
-          account: getAccountName(accountConfig),
+          account: uiAccountDescription(sandboxAccountId),
         })
       );
       logger.log('');

package/commands/sandbox/sync.js

@@ -13,19 +13,20 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { promptUser } = require('../../lib/prompts/promptUtils');
-const { uiLine } = require('../../lib/ui');
+const { uiLine, uiAccountDescription } = require('../../lib/ui');
 const {
-  getAccountName,
   sandboxTypeMap,
-  DEVELOPER_SANDBOX,
-  STANDARD_SANDBOX,
   getAvailableSyncTypes,
   getSyncTypesWithContactRecordsPrompt,
 } = require('../../lib/sandboxes');
-const { syncSandbox } = require('../../lib/sandbox-sync');
+const { syncSandbox } = require('../../lib/sandboxSync');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const {
+  DEVELOPER_SANDBOX_TYPE,
+  STANDARD_SANDBOX_TYPE,
+} = require('../../lib/constants');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.sync';
 
@@ -62,7 +63,7 @@ exports.handler = async options => {
     logger.log('');
     logger.error(
       i18n(`${i18nKey}.failure.missingParentPortal`, {
-        sandboxName: getAccountName(accountConfig),
+        sandboxName: uiAccountDescription(accountId),
       })
     );
     process.exit(EXIT_CODES.ERROR);
@@ -70,9 +71,9 @@ exports.handler = async options => {
 
   const parentAccountConfig = getAccountConfig(parentAccountId);
   const isDevelopmentSandbox =
-    sandboxTypeMap[accountConfig.sandboxAccountType] === DEVELOPER_SANDBOX;
+    sandboxTypeMap[accountConfig.sandboxAccountType] === DEVELOPER_SANDBOX_TYPE;
   const isStandardSandbox =
-    sandboxTypeMap[accountConfig.sandboxAccountType] === STANDARD_SANDBOX;
+    sandboxTypeMap[accountConfig.sandboxAccountType] === STANDARD_SANDBOX_TYPE;
 
   let availableSyncTasks;
   try {
@@ -90,7 +91,7 @@ exports.handler = async options => {
     ) {
       logger.error(
         i18n('cli.lib.sandbox.sync.failure.objectNotFound', {
-          account: getAccountName(accountConfig),
+          account: uiAccountDescription(accountId),
         })
       );
     } else {
@@ -103,8 +104,8 @@ exports.handler = async options => {
     logger.log(i18n(`${i18nKey}.info.developmentSandbox`));
     logger.log(
       i18n(`${i18nKey}.info.sync`, {
-        parentAccountName: getAccountName(parentAccountConfig),
-        sandboxName: getAccountName(accountConfig),
+        parentAccountName: uiAccountDescription(parentAccountId),
+        sandboxName: uiAccountDescription(accountId),
       })
     );
     uiLine();
@@ -119,8 +120,8 @@ exports.handler = async options => {
           name: 'confirmSandboxSyncPrompt',
           type: 'confirm',
           message: i18n(`${i18nKey}.confirm.developmentSandbox`, {
-            parentAccountName: getAccountName(parentAccountConfig),
-            sandboxName: getAccountName(accountConfig),
+            parentAccountName: uiAccountDescription(parentAccountId),
+            sandboxName: uiAccountDescription(accountId),
           }),
         },
       ]);
@@ -140,8 +141,8 @@ exports.handler = async options => {
     );
     logger.log(
       i18n(`${i18nKey}.info.sync`, {
-        parentAccountName: getAccountName(parentAccountConfig),
-        sandboxName: getAccountName(accountConfig),
+        parentAccountName: uiAccountDescription(parentAccountId),
+        sandboxName: uiAccountDescription(accountId),
       })
     );
     uiLine();
@@ -156,8 +157,8 @@ exports.handler = async options => {
           name: 'confirmSandboxSyncPrompt',
           type: 'confirm',
           message: i18n(`${i18nKey}.confirm.standardSandbox`, {
-            parentAccountName: getAccountName(parentAccountConfig),
-            sandboxName: getAccountName(accountConfig),
+            parentAccountName: uiAccountDescription(parentAccountId),
+            sandboxName: uiAccountDescription(accountId),
           }),
         },
       ]);

package/lang/en.lyaml

@@ -467,7 +467,7 @@ en:
               projectMustExistExplanation: "The project {{ projectName }} does not exist in the target account {{ accountIdentifier}}. This command requires the project to exist in the target account."
               choseNotToCreateProject: "Exiting because this command requires the project to exist in the target account."
               initialUploadMessage: "HubSpot Local Dev Server Startup"
-              declineDefaultSandboxExplanation: "To develop on a different account, run {{ useCommand }} to change your default account, then re-run {{ devCommand }}."
+              declineDefaultAccountExplanation: "To develop on a different account, run {{ useCommand }} to change your default account, then re-run {{ devCommand }}."
             status:
               creatingProject: "Creating project {{ projectName }} in {{ accountIdentifier }}"
               createdProject: "Created project {{ projectName }} in {{ accountIdentifier }}"
@@ -1029,7 +1029,7 @@ en:
           promptMessage: "[--account] Choose a sandbox under {{ accountIdentifier }} to test with:"
           sandboxLimit: "Your account reached the limit of {{ limit }} development sandboxes"
           sandboxLimitWithSuggestion: "Your account reached the limit of {{ limit }} development sandboxes. Run {{ authCommand }} to add an existing one to the config."
-          confirmDefaultSandboxAccount: "Continue testing on {{#bold}}{{ accountName }} ({{ accountType }}){{/bold}}? (Y/n)"
+          confirmDefaultAccount: "Continue testing on {{#bold}}{{ accountName }} ({{ accountType }}){{/bold}}? (Y/n)"
         projectLogsPrompt:
           projectName:
             message: "[--project] Enter the project name:"

package/lib/DevServerManager.js

@@ -9,6 +9,11 @@ const {
   stopPortManagerServer,
   requestPorts,
 } = require('@hubspot/local-dev-lib/portManager');
+const {
+  getHubSpotApiOrigin,
+  getHubSpotWebsiteOrigin,
+} = require('@hubspot/local-dev-lib/urls');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 
 const i18nKey = 'cli.lib.DevServerManager';
 
@@ -29,7 +34,6 @@ class DevServerManager {
         serverInterface: DevModeInterface,
       },
     };
-    this.debug = false;
   }
 
   async iterateDevServers(callback) {
@@ -62,19 +66,22 @@ class DevServerManager {
     }, {});
   }
 
-  async setup({ components, debug, onUploadRequired }) {
-    this.debug = debug;
+  async setup({ components, onUploadRequired, accountId }) {
     this.componentsByType = this.arrangeComponentsByType(components);
-
+    const { env } = getAccountConfig(accountId);
     await startPortManagerServer();
     await this.iterateDevServers(
       async (serverInterface, compatibleComponents) => {
         if (serverInterface.setup) {
           await serverInterface.setup({
             components: compatibleComponents,
-            debug,
             onUploadRequired,
             promptUser,
+            logger,
+            urls: {
+              api: getHubSpotApiOrigin(env),
+              web: getHubSpotWebsiteOrigin(env),
+            },
           });
         }
       }
@@ -89,7 +96,6 @@ class DevServerManager {
         if (serverInterface.start) {
           await serverInterface.start({
             accountId,
-            debug: this.debug,
             projectConfig,
             requestPorts,
           });

package/lib/LocalDevManager.js

@@ -322,8 +322,8 @@ class LocalDevManager {
     try {
       await DevServerManager.setup({
         components,
-        debug: this.debug,
         onUploadRequired: this.logUploadWarning.bind(this),
+        accountId: this.targetAccountId,
       });
       return true;
     } catch (e) {

package/lib/constants.js

@@ -2,7 +2,18 @@ const HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH =
   'HubSpot/hubspot-project-components';
 const DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 
+// Sandboxes
+const STANDARD_SANDBOX_TYPE = 'standard';
+const DEVELOPER_SANDBOX_TYPE = 'developer';
+
+const STANDARD_SANDBOX = 'STANDARD';
+const DEVELOPER_SANDBOX = 'DEVELOPER';
+
 module.exports = {
   HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
   DEFAULT_PROJECT_TEMPLATE_BRANCH,
+  STANDARD_SANDBOX_TYPE,
+  DEVELOPER_SANDBOX_TYPE,
+  STANDARD_SANDBOX,
+  DEVELOPER_SANDBOX,
 };

package/lib/developerTestAccounts.js

@@ -0,0 +1,14 @@
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
+
+const DEV_TEST_ACCOUNT_STRING = 'developer test account';
+
+const isDeveloperTestAccount = config =>
+  config.accountType &&
+  config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;
+
+module.exports = {
+  DEV_TEST_ACCOUNT_STRING,
+  isDeveloperTestAccount,
+};

package/lib/prompts/accountsPrompt.js

@@ -1,15 +1,13 @@
 const { updateDefaultAccount } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-const { getAccountName } = require('../sandboxes');
+const { uiAccountDescription } = require('../ui');
 
 const mapAccountChoices = portals =>
-  portals.map(p => {
-    return {
-      name: getAccountName(p),
-      value: p.name || p.portalId,
-    };
-  });
+  portals.map(p => ({
+    name: uiAccountDescription(p.portalId, false),
+    value: p.name || p.portalId,
+  }));
 
 const i18nKey = 'cli.commands.accounts.subcommands.use';
 

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -1,15 +1,16 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription, uiCommandReference } = require('../ui');
-const { isSandbox, getAccountName } = require('../sandboxes');
+const { isSandbox } = require('../sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { getSandboxUsageLimits } = require('@hubspot/local-dev-lib/sandboxes');
 const { logger } = require('@hubspot/cli-lib/logger');
+const { DEVELOPER_SANDBOX, STANDARD_SANDBOX } = require('../constants');
 
 const i18nKey = 'cli.lib.prompts.projectDevTargetAccountPrompt';
 
 const mapSandboxAccount = accountConfig => ({
-  name: getAccountName(accountConfig, false),
+  name: uiAccountDescription(accountConfig.portalId, false),
   value: {
     targetAccountId: getAccountId(accountConfig.name),
     createNewSandbox: false,
@@ -33,15 +34,18 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
     );
   let disabledMessage = false;
 
-  if (sandboxUsage['DEVELOPER'] && sandboxUsage['DEVELOPER'].available === 0) {
-    if (sandboxAccounts.length < sandboxUsage['DEVELOPER'].limit) {
+  if (
+    sandboxUsage[DEVELOPER_SANDBOX] &&
+    sandboxUsage[DEVELOPER_SANDBOX].available === 0
+  ) {
+    if (sandboxAccounts.length < sandboxUsage[DEVELOPER_SANDBOX].limit) {
       disabledMessage = i18n(`${i18nKey}.sandboxLimitWithSuggestion`, {
         authCommand: uiCommandReference('hs auth'),
-        limit: sandboxUsage['DEVELOPER'].limit,
+        limit: sandboxUsage[DEVELOPER_SANDBOX].limit,
       });
     } else {
       disabledMessage = i18n(`${i18nKey}.sandboxLimit`, {
-        limit: sandboxUsage['DEVELOPER'].limit,
+        limit: sandboxUsage[DEVELOPER_SANDBOX].limit,
       });
     }
   }
@@ -49,10 +53,10 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
   // Order choices by Developer Sandbox -> Standard Sandbox
   const choices = [
     ...sandboxAccounts
-      .filter(a => a.sandboxAccountType === 'DEVELOPER')
+      .filter(a => a.sandboxAccountType === DEVELOPER_SANDBOX)
       .map(mapSandboxAccount),
     ...sandboxAccounts
-      .filter(a => a.sandboxAccountType === 'STANDARD')
+      .filter(a => a.sandboxAccountType === STANDARD_SANDBOX)
       .map(mapSandboxAccount),
     {
       name: i18n(`${i18nKey}.createNewSandboxOption`),
@@ -85,12 +89,12 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
   return targetAccountInfo;
 };
 
-const confirmDefaultSandboxAccountPrompt = async (accountName, accountType) => {
+const confirmDefaultAccountPrompt = async (accountName, accountType) => {
   const { useDefaultAccount } = await promptUser([
     {
       name: 'useDefaultAccount',
       type: 'confirm',
-      message: i18n(`${i18nKey}.confirmDefaultSandboxAccount`, {
+      message: i18n(`${i18nKey}.confirmDefaultAccount`, {
         accountName,
         accountType,
       }),
@@ -101,5 +105,5 @@ const confirmDefaultSandboxAccountPrompt = async (accountName, accountType) => {
 
 module.exports = {
   selectTargetAccountPrompt,
-  confirmDefaultSandboxAccountPrompt,
+  confirmDefaultAccountPrompt,
 };

package/lib/prompts/sandboxesPrompt.js

@@ -1,11 +1,13 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
+const { uiAccountDescription } = require('../ui');
 const {
-  getSandboxTypeAsString,
-  STANDARD_SANDBOX,
   DEVELOPER_SANDBOX,
-} = require('../sandboxes');
-const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
+  STANDARD_SANDBOX,
+  STANDARD_SANDBOX_TYPE,
+  DEVELOPER_SANDBOX_TYPE,
+} = require('../constants');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 
@@ -13,11 +15,8 @@ const mapSandboxAccountChoices = portals =>
   portals
     .filter(p => p.sandboxAccountType && p.sandboxAccountType !== null)
     .map(p => {
-      const sandboxName = `[${getSandboxTypeAsString(
-        p.sandboxAccountType
-      )} sandbox] `;
       return {
-        name: `${p.name} ${sandboxName}(${p.portalId})`,
+        name: uiAccountDescription(p.portalId, false),
         value: p.name || p.portalId,
       };
     });
@@ -34,8 +33,8 @@ const mapNonSandboxAccountChoices = portals =>
       };
     });
 
-const sandboxNamePrompt = (type = STANDARD_SANDBOX) => {
-  const isDeveloperSandbox = type === DEVELOPER_SANDBOX;
+const sandboxNamePrompt = (type = STANDARD_SANDBOX_TYPE) => {
+  const isDeveloperSandbox = type === DEVELOPER_SANDBOX_TYPE;
   const namePromptMessage = isDeveloperSandbox
     ? `${i18nKey}.name.developmentSandboxMessage`
     : `${i18nKey}.name.message`;
@@ -61,11 +60,11 @@ const sandboxNamePrompt = (type = STANDARD_SANDBOX) => {
 const sandboxTypeChoices = [
   {
     name: i18n(`${i18nKey}.type.developer`),
-    value: 'DEVELOPER',
+    value: DEVELOPER_SANDBOX,
   },
   {
     name: i18n(`${i18nKey}.type.standard`),
-    value: 'STANDARD',
+    value: STANDARD_SANDBOX,
   },
 ];
 
@@ -77,7 +76,7 @@ const sandboxTypePrompt = () => {
       type: 'list',
       look: false,
       choices: sandboxTypeChoices,
-      default: 'DEVELOPER',
+      default: DEVELOPER_SANDBOX,
     },
   ]);
 };

package/lib/{sandbox-create.js → sandboxCreate.js}

@@ -2,10 +2,7 @@ const SpinniesManager = require('./SpinniesManager');
 const {
   getSandboxLimit,
   getHasSandboxesByType,
-  saveSandboxToConfig,
   sandboxApiTypeMap,
-  STANDARD_SANDBOX,
-  DEVELOPER_SANDBOX,
 } = require('./sandboxes');
 const { i18n } = require('./lang');
 const { logger } = require('@hubspot/cli-lib/logger');
@@ -21,9 +18,99 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { getEnv, getAccountId } = require('@hubspot/local-dev-lib/config');
 const { createSandbox } = require('@hubspot/local-dev-lib/sandboxes');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
+const {
+  getAccessToken,
+  updateConfigWithAccessToken,
+} = require('@hubspot/local-dev-lib/personalAccessKey');
+const { uiAccountDescription } = require('./ui');
+const {
+  DEVELOPER_SANDBOX_TYPE,
+  STANDARD_SANDBOX_TYPE,
+} = require('./constants');
+const {
+  personalAccessKeyPrompt,
+} = require('./prompts/personalAccessKeyPrompt');
+const { enterAccountNamePrompt } = require('./prompts/enterAccountNamePrompt');
+const {
+  accountNameExistsInConfig,
+  writeConfig,
+  updateAccountConfig,
+} = require('@hubspot/local-dev-lib/config');
 
 const i18nKey = 'cli.lib.sandbox.create';
 
+/**
+ * @param {String} env - Environment (QA/Prod)
+ * @param {Object} result - Sandbox instance returned from API
+ * @param {Boolean} force - Force flag to skip prompt
+ * @returns {String} validName saved into config
+ */
+const saveSandboxToConfig = async (env, result, force = false) => {
+  let personalAccessKey = result.personalAccessKey;
+  if (!personalAccessKey) {
+    const configData = await personalAccessKeyPrompt({
+      env,
+      account: result.sandbox.sandboxHubId,
+    });
+    personalAccessKey = configData.personalAccessKey;
+  }
+
+  let updatedConfig;
+
+  try {
+    const token = await getAccessToken(personalAccessKey, env);
+    updatedConfig = await updateConfigWithAccessToken(
+      token,
+      personalAccessKey,
+      env
+    );
+  } catch (e) {
+    logErrorInstance(e);
+  }
+
+  if (!updatedConfig) {
+    throw new Error('Failed to update config with personal access key.');
+  }
+
+  let validName = updatedConfig.name;
+  if (!updatedConfig.name) {
+    const nameForConfig = result.sandbox.name
+      .toLowerCase()
+      .split(' ')
+      .join('-');
+    validName = nameForConfig;
+    const invalidAccountName = accountNameExistsInConfig(nameForConfig);
+    if (invalidAccountName) {
+      if (!force) {
+        logger.log('');
+        logger.warn(
+          i18n(
+            `cli.lib.prompts.enterAccountNamePrompt.errors.accountNameExists`,
+            { name: nameForConfig }
+          )
+        );
+        const { name: promptName } = await enterAccountNamePrompt(
+          nameForConfig + `_${result.sandbox.sandboxHubId}`
+        );
+        validName = promptName;
+      } else {
+        // Basic invalid name handling when force flag is passed
+        validName = nameForConfig + `_${result.sandbox.sandboxHubId}`;
+      }
+    }
+  }
+  updateAccountConfig({
+    ...updatedConfig,
+    environment: updatedConfig.env,
+    tokenInfo: updatedConfig.auth.tokenInfo,
+    name: validName,
+  });
+  writeConfig();
+
+  logger.log('');
+  return validName;
+};
+
 /**
  * @param {String} name - Name of sandbox
  * @param {String} type - Sandbox type to be created (standard/developer)
@@ -75,14 +162,14 @@ const buildSandbox = async ({
     if (isMissingScopeError(err)) {
       logger.error(
         i18n(`${i18nKey}.failure.scopes.message`, {
-          accountName: accountConfig.name || accountId,
+          accountName: uiAccountDescription(accountId),
         })
       );
       const websiteOrigin = getHubSpotWebsiteOrigin(env);
       const url = `${websiteOrigin}/personal-access-key/${accountId}`;
       logger.info(
         i18n(`${i18nKey}.failure.scopes.instructions`, {
-          accountName: accountConfig.name || accountId,
+          accountName: uiAccountDescription(accountId),
           url,
         })
       );
@@ -97,7 +184,7 @@ const buildSandbox = async ({
       logger.error(
         i18n(`${i18nKey}.failure.invalidUser`, {
           accountName: name,
-          parentAccountName: accountConfig.name || accountId,
+          parentAccountName: uiAccountDescription(accountId),
         })
       );
       logger.log('');
@@ -112,7 +199,7 @@ const buildSandbox = async ({
       logger.error(
         i18n(`${i18nKey}.failure.403Gating`, {
           accountName: name,
-          parentAccountName: accountConfig.name || accountId,
+          parentAccountName: uiAccountDescription(accountId),
           accountId,
         })
       );
@@ -132,7 +219,7 @@ const buildSandbox = async ({
       const plural = devSandboxLimit !== 1;
       const hasDevelopmentSandboxes = getHasSandboxesByType(
         accountConfig,
-        DEVELOPER_SANDBOX
+        DEVELOPER_SANDBOX_TYPE
       );
       if (hasDevelopmentSandboxes) {
         logger.error(
@@ -141,7 +228,7 @@ const buildSandbox = async ({
               plural ? 'other' : 'one'
             }`,
             {
-              accountName: accountConfig.name || accountId,
+              accountName: uiAccountDescription(accountId),
               limit: devSandboxLimit,
             }
           )
@@ -152,7 +239,7 @@ const buildSandbox = async ({
           i18n(
             `${i18nKey}.failure.limit.developer.${plural ? 'other' : 'one'}`,
             {
-              accountName: accountConfig.name || accountId,
+              accountName: uiAccountDescription(accountId),
               limit: devSandboxLimit,
               link: `${baseUrl}/sandboxes-developer/${accountId}/development`,
             }
@@ -175,7 +262,7 @@ const buildSandbox = async ({
       const plural = standardSandboxLimit !== 1;
       const hasStandardSandboxes = getHasSandboxesByType(
         accountConfig,
-        STANDARD_SANDBOX
+        STANDARD_SANDBOX_TYPE
       );
       if (hasStandardSandboxes) {
         logger.error(
@@ -184,7 +271,7 @@ const buildSandbox = async ({
               plural ? 'other' : 'one'
             }`,
             {
-              accountName: accountConfig.name || accountId,
+              accountName: uiAccountDescription(accountId),
               limit: standardSandboxLimit,
             }
           )
@@ -195,7 +282,7 @@ const buildSandbox = async ({
           i18n(
             `${i18nKey}.failure.limit.standard.${plural ? 'other' : 'one'}`,
             {
-              accountName: accountConfig.name || accountId,
+              accountName: uiAccountDescription(accountId),
               limit: standardSandboxLimit,
               link: `${baseUrl}/sandboxes-developer/${accountId}/standard`,
             }

package/lib/{sandbox-sync.js → sandboxSync.js}

@@ -5,8 +5,6 @@ const { i18n } = require('./lang');
 const {
   getAvailableSyncTypes,
   pollSyncTaskStatus,
-  getAccountName,
-  DEVELOPER_SANDBOX,
   sandboxTypeMap,
   syncTypes,
 } = require('./sandboxes');
@@ -22,6 +20,7 @@ const {
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('./ui');
+const { DEVELOPER_SANDBOX_TYPE } = require('./constants');
 
 const i18nKey = 'cli.lib.sandbox.sync';
 
@@ -89,7 +88,8 @@ const syncSandbox = async ({
     });
     if (
       skipPolling &&
-      sandboxTypeMap[accountConfig.sandboxAccountType] === DEVELOPER_SANDBOX
+      sandboxTypeMap[accountConfig.sandboxAccountType] ===
+        DEVELOPER_SANDBOX_TYPE
     ) {
       if (syncTasks.some(t => t.type === syncTypes.OBJECT_RECORDS)) {
         logger.log(i18n(`${i18nKey}.loading.skipPollingWithContacts`));
@@ -109,7 +109,7 @@ const syncSandbox = async ({
     if (isMissingScopeError(err)) {
       logger.error(
         i18n(`${i18nKey}.failure.missingScopes`, {
-          accountName: getAccountName(parentAccountConfig),
+          accountName: uiAccountDescription(parentAccountId),
         })
       );
     } else if (
@@ -122,7 +122,7 @@ const syncSandbox = async ({
       logger.error(
         i18n(`${i18nKey}.failure.invalidUser`, {
           accountName: uiAccountDescription(accountId),
-          parentAccountName: getAccountName(parentAccountConfig),
+          parentAccountName: uiAccountDescription(parentAccountId),
         })
       );
     } else if (
@@ -147,7 +147,7 @@ const syncSandbox = async ({
       // This will only trigger if a user is not a super admin of the target account.
       logger.error(
         i18n(`${i18nKey}.failure.notSuperAdmin`, {
-          account: getAccountName(accountConfig),
+          account: uiAccountDescription(accountId),
         })
       );
     } else if (
@@ -159,7 +159,7 @@ const syncSandbox = async ({
     ) {
       logger.error(
         i18n(`${i18nKey}.failure.objectNotFound`, {
-          account: getAccountName(accountConfig),
+          account: uiAccountDescription(accountId),
         })
       );
     } else {

package/lib/sandboxes.js

@@ -1,49 +1,39 @@
-const chalk = require('chalk');
 const { i18n, MISSING_LANGUAGE_DATA_PREFIX } = require('./lang');
 const { handleExit, handleKeypress } = require('./process');
 const { logger } = require('@hubspot/cli-lib/logger');
-const {
-  getAccessToken,
-  updateConfigWithAccessToken,
-} = require('@hubspot/local-dev-lib/personalAccessKey');
 const { EXIT_CODES } = require('./enums/exitCodes');
-const { enterAccountNamePrompt } = require('./prompts/enterAccountNamePrompt');
 const {
   fetchTaskStatus,
   fetchTypes,
   getSandboxUsageLimits,
 } = require('@hubspot/local-dev-lib/sandboxes');
-const {
-  accountNameExistsInConfig,
-  getConfig,
-  writeConfig,
-  updateAccountConfig,
-  getAccountId,
-} = require('@hubspot/local-dev-lib/config');
+const { getConfig, getAccountId } = require('@hubspot/local-dev-lib/config');
 const CliProgressMultibarManager = require('./CliProgressMultibarManager');
 const { promptUser } = require('./prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
-  personalAccessKeyPrompt,
-} = require('./prompts/personalAccessKeyPrompt');
-const { logErrorInstance } = require('./errorHandlers/standardErrors');
-
-const STANDARD_SANDBOX = 'standard';
-const DEVELOPER_SANDBOX = 'developer';
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
+const {
+  STANDARD_SANDBOX_TYPE,
+  DEVELOPER_SANDBOX_TYPE,
+  DEVELOPER_SANDBOX,
+  STANDARD_SANDBOX,
+} = require('./constants');
 
 const syncTypes = {
   OBJECT_RECORDS: 'object-records',
 };
 
 const sandboxTypeMap = {
-  DEV: DEVELOPER_SANDBOX,
-  dev: DEVELOPER_SANDBOX,
-  DEVELOPER: DEVELOPER_SANDBOX,
-  developer: DEVELOPER_SANDBOX,
-  DEVELOPMENT: DEVELOPER_SANDBOX,
-  development: DEVELOPER_SANDBOX,
-  STANDARD: STANDARD_SANDBOX,
-  standard: STANDARD_SANDBOX,
+  DEV: DEVELOPER_SANDBOX_TYPE,
+  dev: DEVELOPER_SANDBOX_TYPE,
+  DEVELOPER: DEVELOPER_SANDBOX_TYPE,
+  developer: DEVELOPER_SANDBOX_TYPE,
+  DEVELOPMENT: DEVELOPER_SANDBOX_TYPE,
+  development: DEVELOPER_SANDBOX_TYPE,
+  STANDARD: STANDARD_SANDBOX_TYPE,
+  standard: STANDARD_SANDBOX_TYPE,
 };
 
 const sandboxApiTypeMap = {
@@ -51,23 +41,26 @@ const sandboxApiTypeMap = {
   developer: 2,
 };
 
-const getSandboxTypeAsString = type =>
-  type === 'DEVELOPER' ? 'development' : 'standard';
-
-const isSandbox = config =>
-  config.sandboxAccountType && config.sandboxAccountType !== null;
+const getSandboxTypeAsString = accountType => {
+  if (
+    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX ||
+    accountType === DEVELOPER_SANDBOX // remove line once sandboxAccountType is removed
+  ) {
+    return 'development'; // Only place we're using this specific name
+  }
+  return STANDARD_SANDBOX_TYPE;
+};
 
-function getAccountName(config, bold = true) {
-  const sandboxName = `[${getSandboxTypeAsString(
-    config.sandboxAccountType
+const getSandboxName = config =>
+  `[${getSandboxTypeAsString(
+    config.accountType || config.sandboxAccountType
   )} sandbox] `;
 
-  const message = `${config.name} ${isSandbox(config) ? sandboxName : ''}(${
-    config.portalId
-  })`;
-
-  return bold ? chalk.bold(message) : message;
-}
+const isSandbox = config =>
+  config.accountType
+    ? config.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
+      config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
+    : config.sandboxAccountType && config.sandboxAccountType !== null;
 
 function getHasSandboxesByType(parentAccountConfig, type) {
   const config = getConfig();
@@ -153,13 +146,13 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
   if (!usage) {
     throw new Error('Unable to fetch sandbox usage limits. Please try again.');
   }
-  if (sandboxType === DEVELOPER_SANDBOX) {
-    if (usage['DEVELOPER'].available === 0) {
-      const devSandboxLimit = usage['DEVELOPER'].limit;
+  if (sandboxType === DEVELOPER_SANDBOX_TYPE) {
+    if (usage[DEVELOPER_SANDBOX].available === 0) {
+      const devSandboxLimit = usage[DEVELOPER_SANDBOX].limit;
       const plural = devSandboxLimit !== 1;
       const hasDevelopmentSandboxes = getHasSandboxesByType(
         accountConfig,
-        DEVELOPER_SANDBOX
+        DEVELOPER_SANDBOX_TYPE
       );
       if (hasDevelopmentSandboxes) {
         throw new Error(
@@ -190,13 +183,13 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
       }
     }
   }
-  if (sandboxType === STANDARD_SANDBOX) {
-    if (usage['STANDARD'].available === 0) {
-      const standardSandboxLimit = usage['STANDARD'].limit;
+  if (sandboxType === STANDARD_SANDBOX_TYPE) {
+    if (usage[STANDARD_SANDBOX].available === 0) {
+      const standardSandboxLimit = usage[STANDARD_SANDBOX].limit;
       const plural = standardSandboxLimit !== 1;
       const hasStandardSandboxes = getHasSandboxesByType(
         accountConfig,
-        STANDARD_SANDBOX
+        STANDARD_SANDBOX_TYPE
       );
       if (hasStandardSandboxes) {
         throw new Error(
@@ -229,78 +222,6 @@ const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
   }
 };
 
-/**
- * @param {String} env - Environment (QA/Prod)
- * @param {Object} result - Sandbox instance returned from API
- * @param {Boolean} force - Force flag to skip prompt
- * @returns {String} validName saved into config
- */
-const saveSandboxToConfig = async (env, result, force = false) => {
-  let personalAccessKey = result.personalAccessKey;
-  if (!personalAccessKey) {
-    const configData = await personalAccessKeyPrompt({
-      env,
-      account: result.sandbox.sandboxHubId,
-    });
-    personalAccessKey = configData.personalAccessKey;
-  }
-
-  let updatedConfig;
-
-  try {
-    const token = await getAccessToken(personalAccessKey, env);
-    updatedConfig = await updateConfigWithAccessToken(
-      token,
-      personalAccessKey,
-      env
-    );
-  } catch (e) {
-    logErrorInstance(e);
-  }
-
-  if (!updatedConfig) {
-    throw new Error('Failed to update config with personal access key.');
-  }
-
-  let validName = updatedConfig.name;
-  if (!updatedConfig.name) {
-    const nameForConfig = result.sandbox.name
-      .toLowerCase()
-      .split(' ')
-      .join('-');
-    validName = nameForConfig;
-    const invalidAccountName = accountNameExistsInConfig(nameForConfig);
-    if (invalidAccountName) {
-      if (!force) {
-        logger.log('');
-        logger.warn(
-          i18n(
-            `cli.lib.prompts.enterAccountNamePrompt.errors.accountNameExists`,
-            { name: nameForConfig }
-          )
-        );
-        const { name: promptName } = await enterAccountNamePrompt(
-          nameForConfig + `_${result.sandbox.sandboxHubId}`
-        );
-        validName = promptName;
-      } else {
-        // Basic invalid name handling when force flag is passed
-        validName = nameForConfig + `_${result.sandbox.sandboxHubId}`;
-      }
-    }
-  }
-  updateAccountConfig({
-    ...updatedConfig,
-    environment: updatedConfig.env,
-    tokenInfo: updatedConfig.auth.tokenInfo,
-    name: validName,
-  });
-  writeConfig();
-
-  logger.log('');
-  return validName;
-};
-
 const ACTIVE_TASK_POLL_INTERVAL = 1000;
 
 const isTaskComplete = task => {
@@ -439,15 +360,12 @@ function pollSyncTaskStatus(
 }
 
 module.exports = {
-  STANDARD_SANDBOX,
-  DEVELOPER_SANDBOX,
   sandboxTypeMap,
   sandboxApiTypeMap,
   syncTypes,
   isSandbox,
+  getSandboxName,
   getSandboxTypeAsString,
-  getAccountName,
-  saveSandboxToConfig,
   getHasSandboxesByType,
   getSandboxLimit,
   validateSandboxUsageLimits,

package/lib/ui.js

@@ -4,6 +4,11 @@ const supportsColor = require('../lib/supportsColor');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { i18n } = require('./lang');
 const { logger } = require('@hubspot/cli-lib/logger');
+const { isSandbox, getSandboxName } = require('./sandboxes');
+const {
+  isDeveloperTestAccount,
+  DEV_TEST_ACCOUNT_STRING,
+} = require('./developerTestAccounts');
 
 const UI_COLORS = {
   SORBET: '#FF8F59',
@@ -65,16 +70,22 @@ const uiLink = (linkText, url) => {
 };
 
 /**
- * Returns formatted account name and ID
+ * Returns formatted account name, account type (if applicable), and ID
  *
  * @param {number} accountId
+ * @param {boolean} bold
  * @returns {string}
  */
-const uiAccountDescription = accountId => {
+const uiAccountDescription = (accountId, bold = true) => {
   const account = getAccountConfig(accountId);
-  return chalk.bold(
-    account.name ? `${account.name} (${account.portalId})` : account.portalId
-  );
+  let accountTypeString = '';
+  if (isSandbox(account)) {
+    accountTypeString = getSandboxName(account);
+  } else if (isDeveloperTestAccount(account)) {
+    accountTypeString = `[${DEV_TEST_ACCOUNT_STRING}] `;
+  }
+  const message = `${account.name} ${accountTypeString}(${account.portalId})`;
+  return bold ? chalk.bold(message) : message;
 };
 
 const uiInfoSection = (title, logContent) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.4-beta.0",
+  "version": "5.1.4-beta.1",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -9,8 +9,8 @@
   },
   "dependencies": {
     "@hubspot/cli-lib": "^9.0.0",
-    "@hubspot/local-dev-lib": "^0.3.3",
-    "@hubspot/serverless-dev-runtime": "5.1.4-beta.0",
+    "@hubspot/local-dev-lib": "^0.3.4",
+    "@hubspot/serverless-dev-runtime": "5.1.4-beta.1",
     "@hubspot/ui-extensions-dev-server": "0.8.9",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6c4b965fc42578b79a53bf3eb2e6aa2342802d93"
+  "gitHead": "8c66f7e80438c191d2e5148d9cc08e64dca7cf6e"
 }