@hubspot/cli 5.2.1-beta.8 → 5.2.1-beta.9

package/commands/auth.js

@@ -31,9 +31,7 @@ const {
   personalAccessKeyPrompt,
   OAUTH_FLOW,
 } = require('../lib/prompts/personalAccessKeyPrompt');
-const {
-  enterAccountNamePrompt,
-} = require('../lib/prompts/enterAccountNamePrompt');
+const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
 const {
   setAsDefaultAccountPrompt,
 } = require('../lib/prompts/setAsDefaultAccountPrompt');
@@ -129,7 +127,7 @@ exports.handler = async options => {
       validName = updatedConfig.name;
 
       if (!validName) {
-        const { name: namePrompt } = await enterAccountNamePrompt(defaultName);
+        const { name: namePrompt } = await cliAccountNamePrompt(defaultName);
         validName = namePrompt;
       }
 

package/commands/init.js

@@ -40,9 +40,7 @@ const {
   OAUTH_FLOW,
   personalAccessKeyPrompt,
 } = require('../lib/prompts/personalAccessKeyPrompt');
-const {
-  enterAccountNamePrompt,
-} = require('../lib/prompts/enterAccountNamePrompt');
+const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
 const { logDebugInfo } = require('../lib/debugInfo');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
@@ -63,7 +61,7 @@ const personalAccessKeyConfigCreationFlow = async (env, account) => {
   try {
     const token = await getAccessToken(personalAccessKey, env);
     const defaultName = token.hubName ? toKebabCase(token.hubName) : null;
-    const { name } = await enterAccountNamePrompt(defaultName);
+    const { name } = await cliAccountNamePrompt(defaultName);
 
     updatedConfig = updateConfigWithAccessToken(
       token,

package/commands/module/marketplace-validate.js

@@ -48,7 +48,7 @@ exports.handler = async options => {
     accountId,
     validationId
   );
-  processValidationErrors(validationResults);
+  processValidationErrors(i18nKey, validationResults);
   displayValidationResults(i18nKey, validationResults);
 
   process.exit();

package/commands/project/migrateApp.js

@@ -32,6 +32,7 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { isAppDeveloperAccount } = require('../../lib/accountTypes');
 const { ensureProjectExists } = require('../../lib/projects');
+const { handleKeypress } = require('../../lib/process');
 const {
   migrateApp,
   checkMigrationStatus,
@@ -58,14 +59,15 @@ exports.handler = async options => {
   trackCommandUsage('migrate-app', {}, accountId);
 
   if (!isAppDeveloperAccount(accountConfig)) {
-    logger.error(
-      i18n(`${i18nKey}.errors.invalidAccountType`, {
-        accountName,
-        accountType: accountConfig.accountType,
+    uiLine();
+    logger.error(i18n(`${i18nKey}.errors.invalidAccountTypeTitle`));
+    logger.log(
+      i18n(`${i18nKey}.errors.invalidAccountTypeDescription`, {
         useCommand: uiCommandReference('hs accounts use'),
         authCommand: uiCommandReference('hs auth'),
       })
     );
+    uiLine();
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -75,12 +77,13 @@ exports.handler = async options => {
       : await selectPublicAppPrompt({
           accountId,
           accountName,
-          options,
           migrateApp: true,
         });
 
   const publicApps = await fetchPublicAppOptions(accountId, accountName);
-  if (!publicApps.find(a => a.id === appId)) {
+  const selectedApp = publicApps.find(a => a.id === appId);
+  const appName = selectedApp ? selectedApp.name : 'app';
+  if (!selectedApp) {
     logger.error(i18n(`${i18nKey}.errors.invalidAppId`, { appId }));
     process.exit(EXIT_CODES.ERROR);
   }
@@ -106,7 +109,7 @@ exports.handler = async options => {
 
   logger.log('');
   uiLine();
-  logger.log(uiBetaTag(i18n(`${i18nKey}.warning.title`), false));
+  logger.log(uiBetaTag(i18n(`${i18nKey}.warning.title`, { appName }), false));
   logger.log(i18n(`${i18nKey}.warning.projectConversion`));
   logger.log(i18n(`${i18nKey}.warning.appConfig`));
   logger.log('');
@@ -122,6 +125,7 @@ exports.handler = async options => {
     type: 'confirm',
     message: i18n(`${i18nKey}.createAppPrompt`),
   });
+  process.stdin.resume();
 
   if (!shouldCreateApp) {
     process.exit(EXIT_CODES.SUCCESS);
@@ -134,6 +138,14 @@ exports.handler = async options => {
       text: i18n(`${i18nKey}.migrationStatus.inProgress`),
     });
 
+    handleKeypress(async key => {
+      if ((key.ctrl && key.name === 'c') || key.name === 'q') {
+        SpinniesManager.remove('migrateApp');
+        logger.log(i18n(`${i18nKey}.migrationInterrupted`));
+        process.exit(EXIT_CODES.SUCCESS);
+      }
+    });
+
     const migrateResponse = await migrateApp(accountId, appId, projectName);
     const { id } = migrateResponse;
     const pollResponse = await poll(checkMigrationStatus, accountId, id);
@@ -173,10 +185,11 @@ exports.handler = async options => {
       text: i18n(`${i18nKey}.migrationStatus.failure`),
       failColor: 'white',
     });
-    logApiErrorInstance(
-      error.error || error,
-      new ApiErrorContext({ accountId })
-    );
+    if (error.errors) {
+      error.errors.forEach(logApiErrorInstance);
+    } else {
+      logApiErrorInstance(error, new ApiErrorContext({ accountId }));
+    }
 
     process.exit(EXIT_CODES.ERROR);
   }

package/commands/sandbox/create.js

@@ -22,10 +22,7 @@ const {
   trackCommandUsage,
   trackCommandMetadataUsage,
 } = require('../../lib/usageTracking');
-const {
-  sandboxTypePrompt,
-  sandboxNamePrompt,
-} = require('../../lib/prompts/sandboxesPrompt');
+const { sandboxTypePrompt } = require('../../lib/prompts/sandboxesPrompt');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { syncSandbox } = require('../../lib/sandboxSync');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
@@ -38,6 +35,9 @@ const {
   HUBSPOT_ACCOUNT_TYPE_STRINGS,
 } = require('@hubspot/local-dev-lib/constants/config');
 const { buildNewAccount } = require('../../lib/buildAccount');
+const {
+  hubspotAccountNamePrompt,
+} = require('../../lib/prompts/accountNamePrompt');
 
 const i18nKey = 'commands.sandbox.subcommands.create';
 
@@ -112,7 +112,7 @@ exports.handler = async options => {
 
   if (!name) {
     if (!force) {
-      namePrompt = await sandboxNamePrompt(sandboxType);
+      namePrompt = await hubspotAccountNamePrompt({ accountType: sandboxType });
     } else {
       logger.error(i18n(`${i18nKey}.failure.optionMissing.name`));
       process.exit(EXIT_CODES.ERROR);

package/commands/theme/marketplace-validate.js

@@ -48,7 +48,7 @@ exports.handler = async options => {
     accountId,
     validationId
   );
-  processValidationErrors(validationResults);
+  processValidationErrors(i18nKey, validationResults);
   displayValidationResults(i18nKey, validationResults);
 
   process.exit();

package/lang/en.lyaml

@@ -514,18 +514,18 @@ en:
             done: "Converting app configuration to public-app.json component definition ... DONE"
             failure: "Converting app configuration to public-app.json component definition ... FAILED"
           warning:
-            title: "{{#bold}}Migrate an app to the projects framework?{{/bold}}"
-            projectConversion: "{{#bold}}The selected app will be permanently converted to a project component.{{/bold}}"
+            title: "{{#bold}}Migrate {{appName}} to the projects framework?{{/bold}}"
+            projectConversion: "{{#bold}}The selected app will be converted to a project component.{{/bold}}"
             appConfig: "All supported app configuration will be moved to the {{#bold}}public-app.json{{/bold}} component definition file. Future updates to those features must be made through the project build and deploy pipeline, not the developer account UI."
             buildAndDeploy: "This will create a new project with a single app component and immediately build and deploy it to your developer account (build #1)."
             existingApps: "{{#bold}}This will not affect existing app users or installs.{{/bold}}"
             copyApp: "We strongly recommend making a copy of your app to test this process in a development app before replacing production."
-          createAppPrompt: "Proceed with migrating this app to a project component?"
+          migrationInterrupted: "\nThe command is terminated, but app migration is still in progress. Please check your account to ensure that the project and associated app have been created successfully."
+          createAppPrompt: "Proceed with migrating this app to a project component (this process can't be aborted)?"
           projectDetailsLink: "View project details in your developer account"
           errors:
-            invalidAccountType: "Public apps must be migrated within an app developer account. Your current account {{#bold}}{{ accountName }}{{/bold}} is a {{ accountType }}.
-              \n- Run {{ useCommand }} to switch your default account to an app developer account.
-              \n- Run {{ authCommand }} to connect an app developer account to the HubSpot CLI.\n"
+            invalidAccountTypeTitle: "{{#bold}}Developer account not targeted{{/bold}}"
+            invalidAccountTypeDescription: "Only public apps created in a developer account can be converted to a project component. Select a connected developer account with {{useCommand}} or {{authCommand}} and try again."
             projectAlreadyExists: "A project with name {{ projectName }} already exists. Please choose another name."
             invalidAppId: "[--appId] Could not find appId {{ appId }}. Please choose another public app."
         add:
@@ -959,7 +959,8 @@ en:
       learnMoreLocalDevServer: "Learn more about the projects local dev server"
       running: "Running {{#bold}}{{ projectName }}{{/bold}} locally on {{ accountIdentifier }}, waiting for changes ..."
       quitHelper: "Press {{#bold}}'q'{{/bold}} to stop the local dev server"
-      viewInHubSpotLink: "View project in HubSpot"
+      viewProjectLink: "View project in HubSpot"
+      viewTestAccountLink: "View developer test account in HubSpot"
       exitingStart: "Stopping local dev server ..."
       exitingSucceed: "Successfully exited"
       exitingFail: "Failed to cleanup before exiting"
@@ -968,17 +969,15 @@ en:
         appLabel: "[App]"
         uiExtensionLabel: "[UI Extension]"
         missingComponents: "Couldn't find the following components in the deployed build for this project: {{#bold}}'{{ missingComponents }}'{{/bold}}. This may cause issues in local development."
-        defaultWarning: "Changing project configuration requires a new project build."
-        defaultPublicAppWarning: "Changing project configuration requires a new project build. This will affect existing users of your public app. If your app has users in production, we strongly recommend creating a copy of this app to test your changes before proceding."
+        defaultWarning: "{{#bold}}Changing project configuration requires a new project build.{{/bold}}"
+        defaultPublicAppWarning: "{{#bold}}Changing project configuration requires a new project build.{{/bold}}\n\nThis will affect your public app's {{#bold}}{{ installCount }} existing {{ installText }}{{/bold}}. If your app has users in production, we strongly recommend creating a copy of this app to test your changes before proceding."
         header: "{{ warning }} To reflect these changes and continue testing:"
         stopDev: "  * Stop {{ command }}"
         runUpload: "  * Run {{ command }}"
         restartDev: "  * Re-run {{ command }}"
         pushToGithub: "  * Commit and push your changes to GitHub"
       activeInstallWarning:
-        installCount: "{{#bold}}The app {{ appName }} has {{ installCount }} production installs{{/bold}}"
-        genericHeader: "{{#bold}}Local development can affect existing installs of your public app.{{/bold}}"
-        genericExplanation: "Some changes made during local development may need to be synced to HubSpot, which will impact users with existing installs. You will always be asked to confirm these changes before uploading them. If your app has any production installs, we strongly recommend creating a copy of this app to develop on instead."
+        installCount: "{{#bold}}The app {{ appName }} has {{ installCount }} production {{ installText }}{{/bold}}"
         explanation: "Some changes made during local development may need to be synced to HubSpot, which will impact those existing installs. We strongly recommend creating a copy of this app to use instead."
         confirmation: "You will always be asked to confirm any permanent changes to your app’s configuration before uploading them."
       devServer:
@@ -1143,8 +1142,13 @@ en:
         setAsDefaultAccountMessage: "Set this account as the default?"
         setAsDefaultAccount: "Account \"{{ accountName }}\" set as the default account"
         keepingCurrentDefault: "Account \"{{ accountName }}\" will continue to be the default account"
-      enterAccountNamePrompt:
+      accountNamePrompt:
         enterAccountName: "Enter a unique name to reference this account in the CLI:"
+        enterDeveloperTestAccountName: "Name your developer test account:"
+        enterStandardSandboxName: "Name your standard sandbox:"
+        enterDevelopmentSandboxName: "Name your development sandbox:"
+        sandboxDefaultName: "New {{ sandboxType }} sandbox"
+        developerTestAccountDefaultName: "Developer test account {{ count }}"
         errors:
           invalidName: "You entered an invalid name. Please try again."
           nameRequired: "The name may not be blank. Please try again."
@@ -1217,13 +1221,7 @@ en:
           noAppsMessage: "The selected developer account {{#bold}}{{ accountName }}{{/bold}} doesn't have any apps that can be migrated to the projects framework."
           errorFetchingApps: "There was an error fetching public apps."
           invalidAppId: "[--appId] Could not find appId {{ appId }}. Please choose another public app."
-      developerTestAccountPrompt:
-        name:
-          message: "Name your developer test account"
-          errors:
-            invalidName: "You entered an invalid name. Please try again."
-            nameRequired: "The name may not be blank. Please try again."
-            accountNameExists: "Account with name \"{{ name }}\" already exists in the CLI config, please enter a different name."
+          marketplaceApp: "Marketplace app"
       downloadProjectPrompt:
         selectProject: "Select a project to download:"
         errors:
@@ -1239,15 +1237,8 @@ en:
         errors:
           invalidValue: "You entered an invalid value. Please try again."
       sandboxesPrompt:
-        name:
-          message: "Name your sandbox"
-          developmentSandboxMessage: "Name your development sandbox"
-          errors:
-            invalidName: "You entered an invalid name. Please try again."
-            nameRequired: "The name may not be blank. Please try again."
-            accountNameExists: "Account with name \"{{ name }}\" already exists in the CLI config, please enter a different name."
-          selectAccountName: "Select the sandbox account you want to delete"
-          selectParentAccountName: "Select the account that the sandbox belongs to"
+        selectAccountName: "Select the sandbox account you want to delete"
+        selectParentAccountName: "Select the account that the sandbox belongs to"
         type:
           message: "What type of sandbox would you like to create?"
           developer: "Development sandbox (Isolated environment for developers)"
@@ -1289,6 +1280,8 @@ en:
         explanation: "Local development requires this app to be installed in the target test account"
         prompt: "Open hubspot.com to install this app?"
         decline: "To continue local development of this app, install it in your target test account and re-run {{#bold}}`hs project dev`{{/bold}}"
+      activeInstallConfirmationPrompt:
+        message: "Proceed with local development of this {{#bold}}production{{/bold}} app?"
     convertFields:
       positionals:
         src:

package/lib/LocalDevManager.js

@@ -9,6 +9,7 @@ const {
 } = require('@hubspot/local-dev-lib/api/localDevAuth');
 const {
   fetchPublicAppsForPortal,
+  fetchPublicAppDeveloperTestAccountInstallData,
 } = require('@hubspot/local-dev-lib/api/appsDev');
 const {
   getAccountId,
@@ -19,6 +20,7 @@ const SpinniesManager = require('./ui/SpinniesManager');
 const DevServerManager = require('./DevServerManager');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { getProjectDetailUrl } = require('./projects');
+const { getAccountHomeUrl } = require('./localDev');
 const {
   CONFIG_FILES,
   COMPONENT_TYPES,
@@ -34,6 +36,9 @@ const {
 } = require('./ui');
 const { logErrorInstance } = require('./errorHandlers/standardErrors');
 const { installPublicAppPrompt } = require('./prompts/installPublicAppPrompt');
+const {
+  activeInstallConfirmationPrompt,
+} = require('./prompts/activeInstallConfirmationPrompt');
 
 const WATCH_EVENTS = {
   add: 'add',
@@ -62,6 +67,7 @@ class LocalDevManager {
     this.activeApp = null;
     this.activePublicAppData = null;
     this.env = options.env;
+    this.publicAppActiveInstalls = null;
 
     this.projectSourceDir = path.join(
       this.projectDir,
@@ -132,20 +138,44 @@ class LocalDevManager {
       ({ sourceId }) => sourceId === this.activeApp.config.uid
     );
 
+    const {
+      testPortalInstallCount,
+    } = await fetchPublicAppDeveloperTestAccountInstallData(
+      activePublicAppData.id,
+      this.targetProjectAccountId
+    );
+
     this.activePublicAppData = activePublicAppData;
+    this.publicAppActiveInstalls =
+      activePublicAppData.publicApplicationInstallCounts
+        .uniquePortalInstallCount - testPortalInstallCount;
   }
 
   async checkActivePublicAppInstalls() {
-    // TODO: Add check for installs once we have that info
-    if (!this.activePublicAppData) {
+    if (
+      !this.activePublicAppData ||
+      !this.publicAppActiveInstalls ||
+      this.publicAppActiveInstalls < 1
+    ) {
       return;
     }
     uiLine();
-    // TODO: Replace with final copy
 
-    logger.warn(i18n(`${i18nKey}.activeInstallWarning.genericHeader`));
-    logger.log(i18n(`${i18nKey}.activeInstallWarning.genericExplanation`));
+    logger.warn(
+      i18n(`${i18nKey}.activeInstallWarning.installCount`, {
+        appName: this.activePublicAppData.name,
+        installCount: this.publicAppActiveInstalls,
+        installText:
+          this.publicAppActiveInstalls === 1 ? 'install' : 'installs',
+      })
+    );
+    logger.log(i18n(`${i18nKey}.activeInstallWarning.explanation`));
     uiLine();
+    const proceed = await activeInstallConfirmationPrompt();
+
+    if (!proceed) {
+      process.exit(EXIT_CODES.SUCCESS);
+    }
   }
 
   async start() {
@@ -193,13 +223,23 @@ class LocalDevManager {
     );
     logger.log(
       uiLink(
-        i18n(`${i18nKey}.viewInHubSpotLink`),
+        i18n(`${i18nKey}.viewProjectLink`),
         getProjectDetailUrl(
           this.projectConfig.name,
           this.targetProjectAccountId
         )
       )
     );
+
+    if (this.activeApp.type === COMPONENT_TYPES.publicApp) {
+      logger.log(
+        uiLink(
+          i18n(`${i18nKey}.viewTestAccountLink`),
+          getAccountHomeUrl(this.targetAccountId)
+        )
+      );
+    }
+
     logger.log();
     logger.log(i18n(`${i18nKey}.quitHelper`));
     uiLine();
@@ -294,8 +334,13 @@ class LocalDevManager {
     let warning = reason;
     if (!reason) {
       warning =
-        this.activeApp.type === COMPONENT_TYPES.publicApp
-          ? i18n(`${i18nKey}.uploadWarning.defaultPublicAppWarning`)
+        this.activeApp.type === COMPONENT_TYPES.publicApp &&
+        this.publicAppActiveInstalls > 0
+          ? i18n(`${i18nKey}.uploadWarning.defaultPublicAppWarning`, {
+              installCount: this.publicAppActiveInstalls,
+              installText:
+                this.publicAppActiveInstalls === 1 ? 'install' : 'installs',
+            })
           : i18n(`${i18nKey}.uploadWarning.defaultWarning`);
     }
 

package/lib/buildAccount.js

@@ -13,7 +13,7 @@ const {
 } = require('@hubspot/local-dev-lib/config');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('./lang');
-const { enterAccountNamePrompt } = require('./prompts/enterAccountNamePrompt');
+const { cliAccountNamePrompt } = require('./prompts/accountNamePrompt');
 const SpinniesManager = require('./ui/SpinniesManager');
 const {
   debugErrorAndContext,
@@ -65,11 +65,11 @@ async function saveAccountToConfig({
       if (!force) {
         logger.log('');
         logger.warn(
-          i18n(`lib.prompts.enterAccountNamePrompt.errors.accountNameExists`, {
+          i18n(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
             name: nameForConfig,
           })
         );
-        const { name: promptName } = await enterAccountNamePrompt(
+        const { name: promptName } = await cliAccountNamePrompt(
           nameForConfig + `_${accountId}`
         );
         validName = promptName;

package/lib/localDev.js

@@ -8,18 +8,17 @@ const {
   isSpecifiedError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
+const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
 const { createProject } = require('@hubspot/local-dev-lib/api/projects');
+const {
+  ENVIRONMENTS,
+} = require('@hubspot/local-dev-lib/constants/environments');
 const {
   confirmDefaultAccountPrompt,
   selectSandboxTargetAccountPrompt,
   selectDeveloperTestTargetAccountPrompt,
   confirmUseExistingDeveloperTestAccountPrompt,
 } = require('./prompts/projectDevTargetAccountPrompt');
-const { sandboxNamePrompt } = require('./prompts/sandboxesPrompt');
-const {
-  developerTestAccountNamePrompt,
-} = require('./prompts/developerTestAccountNamePrompt');
 const { confirmPrompt } = require('./prompts/promptUtils');
 const {
   validateSandboxUsageLimits,
@@ -56,6 +55,7 @@ const {
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
 } = require('@hubspot/local-dev-lib/constants/auth');
 const { buildNewAccount, saveAccountToConfig } = require('./buildAccount');
+const { hubspotAccountNamePrompt } = require('./prompts/accountNamePrompt');
 
 const i18nKey = 'lib.localDev';
 
@@ -163,9 +163,9 @@ const createSandboxForLocalDev = async (accountId, accountConfig, env) => {
     process.exit(EXIT_CODES.ERROR);
   }
   try {
-    const { name } = await sandboxNamePrompt(
-      HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
-    );
+    const { name } = await hubspotAccountNamePrompt({
+      accountType: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+    });
 
     trackCommandMetadataUsage(
       'sandbox-create',
@@ -242,7 +242,10 @@ const createDeveloperTestAccountForLocalDev = async (
   }
 
   try {
-    const { name } = await developerTestAccountNamePrompt(currentPortalCount);
+    const { name } = await hubspotAccountNamePrompt({
+      currentPortalCount,
+      accountType: HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
+    });
     trackCommandMetadataUsage(
       'developer-test-account-create',
       { step: 'project-dev' },
@@ -427,6 +430,13 @@ const createInitialBuildForNewProject = async (
   return initialUploadResult.buildResult;
 };
 
+const getAccountHomeUrl = accountId => {
+  const baseUrl = getHubSpotWebsiteOrigin(
+    getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
+  );
+  return `${baseUrl}/home?portalId=${accountId}`;
+};
+
 module.exports = {
   confirmDefaultAccountIsTarget,
   checkIfAppDeveloperAccount,
@@ -437,4 +447,5 @@ module.exports = {
   useExistingDevTestAccount,
   createNewProjectForLocalDev,
   createInitialBuildForNewProject,
+  getAccountHomeUrl,
 };

package/lib/marketplace-validate.js

@@ -57,12 +57,20 @@ const fetchValidationResults = async (accountId, validationId) => {
   }
 };
 
-const processValidationErrors = validationResults => {
+const processValidationErrors = (i18nKey, validationResults) => {
   if (validationResults.errors.length) {
-    const { errors } = validationResults;
+    const { assetPath, errors } = validationResults;
 
     errors.forEach(err => {
-      logger.error(`${err.context}`);
+      if (err.failureReasonType === 'DOWNLOAD_EMPTY') {
+        logger.error(
+          i18n(`${i18nKey}.errors.invalidPath`, {
+            path: assetPath,
+          })
+        );
+      } else {
+        logger.error(`${err.context}`);
+      }
     });
     process.exit(EXIT_CODES.ERROR);
   }

package/lib/prompts/accountNamePrompt.js

@@ -0,0 +1,81 @@
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
+const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
+
+const i18nKey = 'lib.prompts.accountNamePrompt';
+
+const getCliAccountNamePromptConfig = defaultName => ({
+  name: 'name',
+  message: i18n(`${i18nKey}.enterAccountName`),
+  default: defaultName,
+  validate(val) {
+    if (typeof val !== 'string') {
+      return i18n(`${i18nKey}.errors.invalidName`);
+    } else if (!val.length) {
+      return i18n(`${i18nKey}.errors.nameRequired`);
+    } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
+      return i18n(`${i18nKey}.errors.spacesInName`);
+    }
+    return accountNameExistsInConfig(val)
+      ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
+      : true;
+  },
+});
+
+const cliAccountNamePrompt = defaultName => {
+  return promptUser(getCliAccountNamePromptConfig(defaultName));
+};
+
+const hubspotAccountNamePrompt = ({ accountType, currentPortalCount = 0 }) => {
+  const isDevelopmentSandbox =
+    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
+  const isSandbox =
+    accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX ||
+    isDevelopmentSandbox;
+  const isDeveloperTestAccount =
+    accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;
+
+  let promptMessageString;
+  let defaultName;
+  if (isSandbox) {
+    promptMessageString = isDevelopmentSandbox
+      ? i18n(`${i18nKey}.enterDevelopmentSandboxName`)
+      : i18n(`${i18nKey}.enterStandardSandboxName`);
+    defaultName = i18n(`${i18nKey}.sandboxDefaultName`, {
+      sandboxType: isDevelopmentSandbox ? 'development' : 'standard',
+    });
+  } else if (isDeveloperTestAccount) {
+    promptMessageString = i18n(`${i18nKey}.enterDeveloperTestAccountName`);
+    defaultName = i18n(`${i18nKey}.developerTestAccountDefaultName`, {
+      count: currentPortalCount + 1,
+    });
+  }
+
+  return promptUser([
+    {
+      name: 'name',
+      message: promptMessageString,
+      validate(val) {
+        if (typeof val !== 'string') {
+          return i18n(`${i18nKey}.errors.invalidName`);
+        } else if (!val.length) {
+          return i18n(`${i18nKey}.errors.nameRequired`);
+        }
+        return accountNameExistsInConfig(val)
+          ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
+          : true;
+      },
+      default: defaultName,
+    },
+  ]);
+};
+
+module.exports = {
+  getCliAccountNamePromptConfig,
+  cliAccountNamePrompt,
+  hubspotAccountNamePrompt,
+};

package/lib/prompts/activeInstallConfirmationPrompt.js

@@ -0,0 +1,20 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+
+const i18nKey = 'lib.prompts.activeInstallConfirmationPrompt';
+
+const activeInstallConfirmationPrompt = async () => {
+  const { proceed } = await promptUser([
+    {
+      name: 'proceed',
+      message: i18n(`${i18nKey}.message`),
+      type: 'confirm',
+      default: false,
+    },
+  ]);
+  return proceed;
+};
+
+module.exports = {
+  activeInstallConfirmationPrompt,
+};

package/lib/prompts/personalAccessKeyPrompt.js

@@ -7,7 +7,7 @@ const { deleteEmptyConfigFile } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { promptUser } = require('./promptUtils');
-const { accountNamePrompt } = require('./enterAccountNamePrompt');
+const { getCliAccountNamePromptConfig } = require('./accountNamePrompt');
 const { i18n } = require('../lang');
 const { uiInfoSection } = require('../ui');
 const { EXIT_CODES } = require('../enums/exitCodes');
@@ -124,7 +124,7 @@ const SCOPES = {
 };
 
 const OAUTH_FLOW = [
-  accountNamePrompt(),
+  getCliAccountNamePromptConfig(),
   ACCOUNT_ID,
   CLIENT_ID,
   CLIENT_SECRET,

package/lib/prompts/sandboxesPrompt.js

@@ -1,6 +1,5 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('../ui');
 const {
   HUBSPOT_ACCOUNT_TYPES,
@@ -29,42 +28,6 @@ const mapNonSandboxAccountChoices = portals =>
       };
     });
 
-const sandboxNamePrompt = (type = HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) => {
-  const isDevelopmentSandbox =
-    type === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
-  const namePromptMessage = isDevelopmentSandbox
-    ? `${i18nKey}.name.developmentSandboxMessage`
-    : `${i18nKey}.name.message`;
-  return promptUser([
-    {
-      name: 'name',
-      message: i18n(namePromptMessage),
-      validate(val) {
-        if (typeof val !== 'string') {
-          return i18n(`${i18nKey}.name.errors.invalidName`);
-        } else if (!val.length) {
-          return i18n(`${i18nKey}.name.errors.nameRequired`);
-        }
-        return accountNameExistsInConfig(val)
-          ? i18n(`${i18nKey}.name.errors.accountNameExists`, { name: val })
-          : true;
-      },
-      default: `New ${isDevelopmentSandbox ? 'development ' : ''}sandbox`,
-    },
-  ]);
-};
-
-const sandboxTypeChoices = [
-  {
-    name: i18n(`${i18nKey}.type.developer`),
-    value: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
-  },
-  {
-    name: i18n(`${i18nKey}.type.standard`),
-    value: HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
-  },
-];
-
 const sandboxTypePrompt = () => {
   return promptUser([
     {
@@ -72,7 +35,16 @@ const sandboxTypePrompt = () => {
       message: i18n(`${i18nKey}.type.message`),
       type: 'list',
       look: false,
-      choices: sandboxTypeChoices,
+      choices: [
+        {
+          name: i18n(`${i18nKey}.type.developer`),
+          value: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
+        },
+        {
+          name: i18n(`${i18nKey}.type.standard`),
+          value: HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
+        },
+      ],
       default: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
     },
   ]);
@@ -90,8 +62,8 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
       name: 'account',
       message: i18n(
         promptParentAccount
-          ? `${i18nKey}.name.selectParentAccountName`
-          : `${i18nKey}.name.selectAccountName`
+          ? `${i18nKey}.selectParentAccountName`
+          : `${i18nKey}.selectAccountName`
       ),
       type: 'list',
       look: false,
@@ -103,7 +75,6 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
 };
 
 module.exports = {
-  sandboxNamePrompt,
   sandboxTypePrompt,
   deleteSandboxPrompt,
 };

package/lib/prompts/selectPublicAppPrompt.js

@@ -35,7 +35,6 @@ const fetchPublicAppOptions = async (accountId, accountName) => {
 const selectPublicAppPrompt = async ({
   accountId,
   accountName,
-  promptOptions = {},
   migrateApp = false,
 }) => {
   const publicApps = await fetchPublicAppOptions(accountId, accountName);
@@ -44,21 +43,17 @@ const selectPublicAppPrompt = async ({
   return promptUser([
     {
       name: 'appId',
-      message: () => {
-        return promptOptions.appId &&
-          !publicApps.find(a => a.id === promptOptions.appId)
-          ? i18n(`${i18nKey}.errors.invalidAppId`, {
-              appId: promptOptions.appId,
-            })
-          : i18n(`${i18nKey}.${translationKey}`, {
-              accountName,
-            });
-      },
-      when:
-        !promptOptions.appId ||
-        !publicApps.find(a => a.id === promptOptions.appId),
+      message: i18n(`${i18nKey}.${translationKey}`, {
+        accountName,
+      }),
       type: 'list',
       choices: publicApps.map(app => {
+        if (app.listingInfo) {
+          return {
+            name: `${app.name} (${app.id})`,
+            disabled: i18n(`${i18nKey}.errors.marketplaceApp`),
+          };
+        }
         return {
           name: `${app.name} (${app.id})`,
           value: app.id,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.2.1-beta.8",
+  "version": "5.2.1-beta.9",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/local-dev-lib": "1.4.0",
-    "@hubspot/serverless-dev-runtime": "5.2.1-beta.7",
+    "@hubspot/local-dev-lib": "1.5.0",
+    "@hubspot/serverless-dev-runtime": "5.2.1-beta.9",
     "@hubspot/theme-preview-dev-server": "0.0.7",
     "@hubspot/ui-extensions-dev-server": "0.8.20",
     "archiver": "^5.3.0",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d36fbe19c7daae6e47b6cb421f4c90ea935d9c9e"
+  "gitHead": "3b67796a5b4eee5dd8d78fd7407d5b44e81cd3da"
 }

package/lib/prompts/developerTestAccountNamePrompt.js

@@ -1,29 +0,0 @@
-const { promptUser } = require('./promptUtils');
-const { i18n } = require('../lang');
-const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
-
-const i18nKey = 'lib.prompts.developerTestAccountPrompt';
-
-const developerTestAccountNamePrompt = currentPortalCount => {
-  return promptUser([
-    {
-      name: 'name',
-      message: i18n(`${i18nKey}.name.message`),
-      validate(val) {
-        if (typeof val !== 'string') {
-          return i18n(`${i18nKey}.name.errors.invalidName`);
-        } else if (!val.length) {
-          return i18n(`${i18nKey}.name.errors.nameRequired`);
-        }
-        return accountNameExistsInConfig(val)
-          ? i18n(`${i18nKey}.name.errors.accountNameExists`, { name: val })
-          : true;
-      },
-      default: `Developer test account ${currentPortalCount + 1}`,
-    },
-  ]);
-};
-
-module.exports = {
-  developerTestAccountNamePrompt,
-};

package/lib/prompts/enterAccountNamePrompt.js

@@ -1,33 +0,0 @@
-const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
-const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
-const { promptUser } = require('./promptUtils');
-const { i18n } = require('../lang');
-
-const i18nKey = 'lib.prompts.enterAccountNamePrompt';
-
-const accountNamePrompt = defaultName => ({
-  name: 'name',
-  message: i18n(`${i18nKey}.enterAccountName`),
-  default: defaultName,
-  validate(val) {
-    if (typeof val !== 'string') {
-      return i18n(`${i18nKey}.errors.invalidName`);
-    } else if (!val.length) {
-      return i18n(`${i18nKey}.errors.nameRequired`);
-    } else if (!STRING_WITH_NO_SPACES_REGEX.test(val)) {
-      return i18n(`${i18nKey}.errors.spacesInName`);
-    }
-    return accountNameExistsInConfig(val)
-      ? i18n(`${i18nKey}.errors.accountNameExists`, { name: val })
-      : true;
-  },
-});
-
-const enterAccountNamePrompt = defaultName => {
-  return promptUser(accountNamePrompt(defaultName));
-};
-
-module.exports = {
-  accountNamePrompt,
-  enterAccountNamePrompt,
-};