@hubspot/cli 7.5.2-experimental.0 → 7.5.4-experimental.0

package/api/migrate.d.ts

@@ -50,11 +50,10 @@ export interface MigrationSuccess extends MigrationBaseStatus {
 }
 export interface MigrationFailed extends MigrationBaseStatus {
     status: typeof MIGRATION_STATUS.FAILURE;
-    projectErrorDetail: string;
+    projectErrorsDetail?: string;
     componentErrorDetails: Record<string, string>;
 }
 export type MigrationStatus = MigrationInProgress | MigrationInputRequired | MigrationSuccess | MigrationFailed;
-export declare function isMigrationStatus(error: unknown): error is MigrationStatus;
 export declare function listAppsForMigration(accountId: number): HubSpotPromise<ListAppsResponse>;
 export declare function initializeMigration(accountId: number, applicationId: number, platformVersion: string): HubSpotPromise<InitializeMigrationResponse>;
 export declare function continueMigration(portalId: number, migrationId: number, componentUids: Record<string, string>, projectName: string): HubSpotPromise<ContinueMigrationResponse>;

package/api/migrate.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isMigrationStatus = isMigrationStatus;
 exports.listAppsForMigration = listAppsForMigration;
 exports.initializeMigration = initializeMigration;
 exports.continueMigration = continueMigration;
@@ -8,12 +7,6 @@ exports.checkMigrationStatusV2 = checkMigrationStatusV2;
 const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
 const http_1 = require("@hubspot/local-dev-lib/http");
 const MIGRATIONS_API_PATH_V2 = 'dfs/migrations/v2';
-function isMigrationStatus(error) {
-    return (typeof error === 'object' &&
-        error !== null &&
-        'id' in error &&
-        'status' in error);
-}
 async function listAppsForMigration(accountId) {
     return http_1.http.get(accountId, {
         url: `${MIGRATIONS_API_PATH_V2}/list-apps`,

package/bin/cli.js

@@ -11,6 +11,7 @@ const { notifyAboutUpdates, } = require('../lib/middleware/notificationsMiddlewa
 const { checkAndWarnGitInclusionMiddleware, } = require('../lib/middleware/gitMiddleware');
 const { performChecks } = require('../lib/middleware/yargsChecksMiddleware');
 const { setRequestHeaders } = require('../lib/middleware/requestMiddleware');
+const { checkFireAlarms } = require('../lib/middleware/fireAlarmMiddleware');
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
 const logsCommand = require('../commands/logs');
@@ -72,6 +73,7 @@ const argv = yargs
     injectAccountIdMiddleware,
     checkAndWarnGitInclusionMiddleware,
     validateAccountOptions,
+    checkFireAlarms,
 ])
     .exitProcess(false)
     .fail(handleFailure)

package/commands/account/auth.d.ts

@@ -0,0 +1,10 @@
+import { Argv, ArgumentsCamelCase } from 'yargs';
+import { CommonArgs, ConfigArgs } from '../../types/Yargs';
+export declare const describe: string;
+export declare const command = "auth";
+type AccountAuthArgs = CommonArgs & ConfigArgs & {
+    disableTracking?: boolean;
+};
+export declare function handler(args: ArgumentsCamelCase<AccountAuthArgs>): Promise<void>;
+export declare function builder(yargs: Argv): Argv<AccountAuthArgs>;
+export {};

package/commands/account/auth.js

@@ -0,0 +1,168 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = exports.describe = void 0;
+exports.handler = handler;
+exports.builder = builder;
+const config_1 = require("@hubspot/local-dev-lib/config");
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
+const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
+const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
+const text_1 = require("@hubspot/local-dev-lib/text");
+const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
+const commonOpts_1 = require("../../lib/commonOpts");
+const configMigrate_1 = require("../../lib/configMigrate");
+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 personalAccessKeyPrompt_1 = require("../../lib/prompts/personalAccessKeyPrompt");
+const accountNamePrompt_1 = require("../../lib/prompts/accountNamePrompt");
+const setAsDefaultAccountPrompt_1 = require("../../lib/prompts/setAsDefaultAccountPrompt");
+const index_2 = require("../../lib/errorHandlers/index");
+const usageTracking_2 = require("../../lib/usageTracking");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const ui_1 = require("../../lib/ui");
+const TRACKING_STATUS = {
+    STARTED: 'started',
+    ERROR: 'error',
+    COMPLETE: 'complete',
+};
+async function updateConfig(env, doesConfigExist, disableTracking, authType, account) {
+    try {
+        const { personalAccessKey } = await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
+            env,
+            account,
+        });
+        const token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
+        const defaultName = token.hubName ? (0, text_1.toKebabCase)(token.hubName) : undefined;
+        const name = doesConfigExist
+            ? undefined
+            : (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultName)).name;
+        const updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, personalAccessKey, env, name, !doesConfigExist);
+        if (!updatedConfig)
+            return null;
+        if (doesConfigExist && !updatedConfig.name) {
+            updatedConfig.name = (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultName)).name;
+            (0, config_1.updateAccountConfig)({
+                ...updatedConfig,
+            });
+            (0, config_1.writeConfig)();
+        }
+        return updatedConfig;
+    }
+    catch (e) {
+        if (!disableTracking) {
+            await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
+        }
+        (0, index_1.debugError)(e);
+        return null;
+    }
+}
+exports.describe = (0, lang_1.i18n)('commands.account.subcommands.auth.describe');
+exports.command = 'auth';
+async function handler(args) {
+    const { providedAccountId, disableTracking } = args;
+    const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+    const deprecatedConfigExists = (0, migrate_1.configFileExists)(false);
+    const globalConfigExists = (0, migrate_1.configFileExists)(true);
+    if (deprecatedConfigExists) {
+        if (globalConfigExists) {
+            try {
+                await (0, configMigrate_1.handleMerge)(providedAccountId);
+            }
+            catch (error) {
+                (0, index_2.logError)(error);
+                (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
+                    command: 'hs account auth',
+                    type: 'Merge configs',
+                    successful: false,
+                }, providedAccountId);
+                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            }
+        }
+        else {
+            try {
+                await (0, configMigrate_1.handleMigration)(providedAccountId);
+            }
+            catch (error) {
+                (0, index_2.logError)(error);
+                (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
+                    command: 'hs account auth',
+                    type: 'Migrate a single config',
+                    successful: false,
+                }, providedAccountId);
+                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            }
+        }
+    }
+    if (!disableTracking) {
+        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, providedAccountId);
+        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
+    }
+    const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
+    const configAlreadyExists = (0, migrate_1.configFileExists)(true);
+    if (!configAlreadyExists) {
+        (0, config_1.createEmptyConfigFile)({}, true);
+    }
+    (0, config_1.loadConfig)('');
+    (0, process_1.handleExit)(config_1.deleteEmptyConfigFile);
+    const updatedConfig = await updateConfig(env, configAlreadyExists, disableTracking, authType, providedAccountId);
+    if (!updatedConfig) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.auth.errors.failedToUpdateConfig'));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const { name } = updatedConfig;
+    const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(updatedConfig);
+    // If the config file was just created, we don't need to prompt the user to set as default
+    if (!configAlreadyExists) {
+        logger_1.logger.log('');
+        logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.auth.success.configFileCreated', {
+            configPath: (0, config_1.getConfigPath)('', true),
+        }));
+        logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.auth.success.configFileUpdated', {
+            account: name || accountId || '',
+        }));
+    }
+    else {
+        const setAsDefault = await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(name);
+        logger_1.logger.log('');
+        if (setAsDefault) {
+            logger_1.logger.success((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
+                accountName: name,
+            }));
+        }
+        else {
+            logger_1.logger.info((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
+                accountName: (0, config_1.getConfigDefaultAccount)(),
+            }));
+        }
+    }
+    (0, ui_1.uiFeatureHighlight)([
+        'helpCommand',
+        'accountAuthCommand',
+        'accountsListCommand',
+    ]);
+    if (!disableTracking) {
+        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.COMPLETE, accountId);
+    }
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function builder(yargs) {
+    yargs.options({
+        account: {
+            describe: (0, lang_1.i18n)('commands.account.subcommands.auth.options.account.describe'),
+            type: 'string',
+            alias: 'a',
+        },
+        'disable-tracking': {
+            type: 'boolean',
+            hidden: true,
+            default: false,
+        },
+    });
+    (0, commonOpts_1.addTestingOptions)(yargs);
+    (0, commonOpts_1.addGlobalOptions)(yargs);
+    return yargs;
+}

package/commands/account/clean.js

@@ -6,19 +6,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.describe = exports.command = void 0;
 exports.handler = handler;
 exports.builder = builder;
+const fs_1 = __importDefault(require("fs"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const config_2 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const commonOpts_1 = require("../../lib/commonOpts");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const table_1 = require("../../lib/ui/table");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const ui_1 = require("../../lib/ui");
+const errorHandlers_1 = require("../../lib/errorHandlers");
 exports.command = 'clean';
 exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.clean.describe`);
 async function handler(args) {
@@ -69,25 +73,54 @@ async function handler(args) {
         logger_1.logger.log((0, table_1.getTableContents)(accountsToRemove.map(p => [
             (0, ui_1.uiAccountDescription)((0, getAccountIdentifier_1.getAccountIdentifier)(p)),
         ]), { border: { bodyLeft: '  ' } }));
+        let promptMessage = (0, lang_1.i18n)(oneAccountFound
+            ? `commands.account.subcommands.clean.confirm.one`
+            : `commands.account.subcommands.clean.confirm.other`, {
+            count: accountsToRemove.length,
+        });
+        const accountOverride = (0, config_2.getCWDAccountOverride)();
+        const overrideFilePath = (0, config_2.getDefaultAccountOverrideFilePath)();
+        const accountOverrideMatches = accountsToRemove.some(account => account.name === accountOverride ||
+            // @ts-expect-error: Default account override files can only exist with global config
+            account.accountId === accountOverride);
+        if (overrideFilePath && accountOverride && accountOverrideMatches) {
+            promptMessage = `${promptMessage}${(0, lang_1.i18n)(`commands.account.subcommands.clean.defaultAccountOverride`, {
+                overrideFilePath,
+            })}`;
+        }
         const { accountsCleanPrompt } = await (0, promptUtils_1.promptUser)([
             {
                 name: 'accountsCleanPrompt',
                 type: 'confirm',
-                message: (0, lang_1.i18n)(oneAccountFound
-                    ? `commands.account.subcommands.clean.confirm.one`
-                    : `commands.account.subcommands.clean.confirm.other`, {
-                    count: accountsToRemove.length,
-                }),
+                message: promptMessage,
             },
         ]);
         if (accountsCleanPrompt) {
             logger_1.logger.log('');
+            try {
+                if (overrideFilePath) {
+                    fs_1.default.unlinkSync(overrideFilePath);
+                }
+            }
+            catch (error) {
+                (0, errorHandlers_1.logError)(error);
+            }
             for (const accountToRemove of accountsToRemove) {
                 await (0, config_1.deleteAccount)(accountToRemove.name);
                 logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.clean.removeSuccess`, {
                     accountName: accountToRemove.name,
                 }));
             }
+            // Get updated version of the config
+            (0, config_1.loadConfig)((0, config_1.getConfigPath)());
+            const defaultAccount = (0, config_1.getConfigDefaultAccount)();
+            if (defaultAccount &&
+                accountsToRemove.some(p => p.name === defaultAccount)) {
+                logger_1.logger.log();
+                logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.clean.replaceDefaultAccount`));
+                const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
+                (0, config_1.updateDefaultAccount)(newDefaultAccount);
+            }
         }
     }
     else {

package/commands/account/createOverride.d.ts

@@ -0,0 +1,10 @@
+import { Argv, ArgumentsCamelCase } from 'yargs';
+import { CommonArgs } from '../../types/Yargs';
+export declare const describe: string;
+export declare const command = "create-override [account]";
+type AccountCreateOverrideArgs = CommonArgs & {
+    account: string | number;
+};
+export declare function handler(args: ArgumentsCamelCase<AccountCreateOverrideArgs>): Promise<void>;
+export declare function builder(yargs: Argv): Argv<AccountCreateOverrideArgs>;
+export {};

package/commands/account/createOverride.js

@@ -0,0 +1,104 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = exports.describe = void 0;
+exports.handler = handler;
+exports.builder = builder;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const path_2 = require("@hubspot/local-dev-lib/path");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const config_1 = require("@hubspot/local-dev-lib/constants/config");
+const config_2 = require("@hubspot/local-dev-lib/config");
+const lang_1 = require("../../lib/lang");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const usageTracking_1 = require("../../lib/usageTracking");
+const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
+const index_1 = require("../../lib/errorHandlers/index");
+exports.describe = (0, lang_1.i18n)('commands.account.subcommands.createOverride.describe', {
+    hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+});
+exports.command = 'create-override [account]';
+async function handler(args) {
+    let overrideDefaultAccount = args.account;
+    const accountOverride = (0, config_2.getCWDAccountOverride)();
+    const overrideFilePath = (0, config_2.getDefaultAccountOverrideFilePath)();
+    if (accountOverride && overrideFilePath) {
+        logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.createOverride.accountOverride', {
+            accountOverride,
+            overrideFilePath,
+        }));
+        const { replaceOverrideFile } = await (0, promptUtils_1.promptUser)({
+            type: 'confirm',
+            name: 'replaceOverrideFile',
+            message: (0, lang_1.i18n)('commands.account.subcommands.createOverride.prompts.replaceOverrideFile'),
+        });
+        logger_1.logger.log('');
+        if (!replaceOverrideFile) {
+            const accountId = (0, config_2.getAccountId)(accountOverride) || undefined;
+            (0, usageTracking_1.trackCommandMetadataUsage)('account-createOverride', {
+                command: 'hs account create-override',
+                step: 'Reject overwriting an override via prompt',
+            }, accountId);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+    }
+    if (!overrideDefaultAccount) {
+        overrideDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
+    }
+    else if (!(0, config_2.getAccountId)(overrideDefaultAccount)) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.createOverride.errors.accountNotFound', {
+            configPath: (0, config_2.getConfigPath)() || '',
+        }));
+        overrideDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
+    }
+    const accountId = (0, config_2.getAccountId)(overrideDefaultAccount);
+    try {
+        const overrideFilePath = path_1.default.join((0, path_2.getCwd)(), config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
+        await fs_extra_1.default.writeFile(overrideFilePath, accountId.toString(), 'utf8');
+        logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.createOverride.success', {
+            overrideFilePath,
+        }));
+        const trackingId = accountId || undefined;
+        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+            command: 'hs config migrate',
+            step: 'Confirm overwriting an override via prompt',
+            successful: true,
+        }, trackingId);
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+    catch (e) {
+        (0, index_1.logError)(e);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+}
+function builder(yargs) {
+    yargs.positional('account', {
+        describe: (0, lang_1.i18n)('commands.account.subcommands.createOverride.options.account.describe'),
+        type: 'string',
+    });
+    yargs.example([
+        [
+            '$0 account create-override',
+            (0, lang_1.i18n)('commands.account.subcommands.createOverride.examples.default', {
+                hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+            }),
+        ],
+        [
+            '$0 account create-override 12345678',
+            (0, lang_1.i18n)('commands.account.subcommands.createOverride.examples.idBased', {
+                hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+            }),
+        ],
+        [
+            '$0 account create-override MyAccount',
+            (0, lang_1.i18n)('commands.account.subcommands.createOverride.examples.nameBased', {
+                hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+            }),
+        ],
+    ]);
+    return yargs;
+}

package/commands/account/info.js

@@ -7,6 +7,7 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const yargsUtils_1 = require("../../lib/yargsUtils");
 const lang_1 = require("../../lib/lang");
+const index_1 = require("../../lib/ui/index");
 const table_1 = require("../../lib/ui/table");
 exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.info.describe`);
 exports.command = 'info [account]';
@@ -19,6 +20,28 @@ async function handler(args) {
         let scopeGroups = [];
         const response = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env, derivedAccountId);
         scopeGroups = response.scopeGroups.map(s => [s]);
+        // If a default account is present in the config, display it
+        const configPath = (0, config_1.getConfigPath)();
+        if (configPath) {
+            logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.defaultAccountTitle`));
+            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.info.configPath`, {
+                configPath,
+            })}`);
+            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.info.defaultAccount`, {
+                account: (0, config_1.getDisplayDefaultAccount)(),
+            })}`);
+        }
+        // If a default account override is present, display it
+        const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+        if (overrideFilePath) {
+            logger_1.logger.log('');
+            logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.overrideFilePathTitle`));
+            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.info.overrideFilePath`, { overrideFilePath })}`);
+            logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.info.overrideAccount`, {
+                account: (0, config_1.getConfigDefaultAccount)(),
+            })}`);
+        }
+        logger_1.logger.log('');
         logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.name`, { name: name }));
         logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.accountId`, {
             accountId: derivedAccountId,

package/commands/account/list.js

@@ -7,6 +7,7 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const commonOpts_1 = require("../../lib/commonOpts");
+const index_1 = require("../../lib/ui/index");
 const table_1 = require("../../lib/ui/table");
 const usageTracking_1 = require("../../lib/usageTracking");
 const accountTypes_1 = require("../../lib/accountTypes");
@@ -80,13 +81,28 @@ async function handler(args) {
         (0, lang_1.i18n)('commands.account.subcommands.list.labels.accountId'),
         (0, lang_1.i18n)('commands.account.subcommands.list.labels.authType'),
     ]));
-    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.configPath', {
-        configPath: configPath,
-    }));
-    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.defaultAccount', {
-        account: (0, config_1.getConfigDefaultAccount)(),
-    }));
-    logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.list.accounts'));
+    // If a default account is present in the config, display it
+    if (configPath) {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.list.defaultAccountTitle`));
+        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.list.configPath`, {
+            configPath,
+        })}`);
+        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.list.defaultAccount`, {
+            account: (0, config_1.getDisplayDefaultAccount)(),
+        })}`);
+        logger_1.logger.log('');
+    }
+    // If a default account override is present, display it
+    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+    if (overrideFilePath) {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.list.overrideFilePathTitle`));
+        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.list.overrideFilePath`, { overrideFilePath })}`);
+        logger_1.logger.log(`${(0, index_1.indent)(1)}${(0, lang_1.i18n)(`commands.account.subcommands.list.overrideAccount`, {
+            account: (0, config_1.getConfigDefaultAccount)(),
+        })}`);
+        logger_1.logger.log('');
+    }
+    logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.list.accounts`));
     logger_1.logger.log((0, table_1.getTableContents)(accountData, { border: { bodyLeft: '  ' } }));
 }
 function builder(yargs) {

package/commands/account/remove.js

@@ -1,12 +1,18 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.describe = exports.command = void 0;
 exports.handler = handler;
 exports.builder = builder;
+const fs_1 = __importDefault(require("fs"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const errorHandlers_1 = require("../../lib/errorHandlers");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const commonOpts_1 = require("../../lib/commonOpts");
 exports.command = 'remove [account]';
@@ -25,6 +31,28 @@ async function handler(args) {
     }
     (0, usageTracking_1.trackCommandUsage)('accounts-remove', undefined, (0, config_1.getAccountId)(accountToRemove));
     const currentDefaultAccount = (0, config_1.getConfigDefaultAccount)();
+    const accountOverride = (0, config_1.getCWDAccountOverride)();
+    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+    if (overrideFilePath &&
+        accountOverride &&
+        accountOverride === accountToRemove) {
+        const { deleteOverrideFile } = await (0, promptUtils_1.promptUser)({
+            type: 'confirm',
+            name: 'deleteOverrideFile',
+            message: (0, lang_1.i18n)(`commands.account.subcommands.remove.prompts.deleteOverrideFile`, {
+                overrideFilePath,
+                accountName: accountToRemove,
+            }),
+        });
+        try {
+            if (deleteOverrideFile) {
+                fs_1.default.unlinkSync(overrideFilePath);
+            }
+        }
+        catch (error) {
+            (0, errorHandlers_1.logError)(error);
+        }
+    }
     await (0, config_1.deleteAccount)(accountToRemove);
     logger_1.logger.success((0, lang_1.i18n)(`commands.account.subcommands.remove.success.accountRemoved`, {
         accountName: accountToRemove,

package/commands/account/removeOverride.d.ts

@@ -0,0 +1,10 @@
+import { Argv, ArgumentsCamelCase } from 'yargs';
+import { CommonArgs } from '../../types/Yargs';
+export declare const describe: string;
+export declare const command = "remove-override";
+type RemoveOverrideArgs = CommonArgs & {
+    force?: boolean;
+};
+export declare function handler(args: ArgumentsCamelCase<RemoveOverrideArgs>): Promise<void>;
+export declare function builder(yargs: Argv): Argv<RemoveOverrideArgs>;
+export {};

package/commands/account/removeOverride.js

@@ -0,0 +1,76 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = exports.describe = void 0;
+exports.handler = handler;
+exports.builder = builder;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const config_2 = require("@hubspot/local-dev-lib/constants/config");
+const lang_1 = require("../../lib/lang");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const usageTracking_1 = require("../../lib/usageTracking");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const index_1 = require("../../lib/errorHandlers/index");
+exports.describe = (0, lang_1.i18n)('commands.account.subcommands.removeOverride.describe', {
+    overrideFile: config_2.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
+});
+exports.command = 'remove-override';
+async function handler(args) {
+    const { force } = args;
+    const accountOverride = (0, config_1.getCWDAccountOverride)();
+    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+    if (accountOverride && overrideFilePath) {
+        const accountId = (0, config_1.getAccountId)(accountOverride) || undefined;
+        if (!force) {
+            logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.removeOverride.accountOverride', {
+                accountOverride,
+                overrideFilePath,
+            }));
+            const { deleteOverrideFile } = await (0, promptUtils_1.promptUser)({
+                type: 'confirm',
+                name: 'deleteOverrideFile',
+                message: (0, lang_1.i18n)('commands.account.subcommands.removeOverride.prompts.deleteOverrideFile', {
+                    accountOverride,
+                    overrideFilePath,
+                }),
+            });
+            logger_1.logger.log('');
+            if (!deleteOverrideFile) {
+                (0, usageTracking_1.trackCommandMetadataUsage)('account-removeOverride', {
+                    command: 'hs account remove-override',
+                    step: 'Reject removing override via prompt',
+                }, accountId);
+                process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+            }
+        }
+        try {
+            fs_extra_1.default.unlinkSync(overrideFilePath);
+            logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.removeOverride.success'));
+            (0, usageTracking_1.trackCommandMetadataUsage)('account-removeOverride', {
+                command: 'hs account remove-override',
+                step: 'Confirm removing override file (via prompt/force)',
+                successful: true,
+            }, accountId);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+        catch (error) {
+            (0, index_1.logError)(error);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+    }
+    else {
+        logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.removeOverride.noOverrideFile'));
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+}
+function builder(yargs) {
+    yargs.options('force', {
+        describe: (0, lang_1.i18n)('commands.account.subcommands.removeOverride.options.force.describe'),
+        type: 'boolean',
+    });
+    return yargs;
+}