@hubspot/cli 7.4.5-experimental.0 → 7.4.6-beta.0

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,8 +20,32 @@ 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 }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.accountId`, {
+            accountId: derivedAccountId,
+        }));
         logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.info.scopeGroups`));
         logger_1.logger.log((0, table_1.getTableContents)(scopeGroups, { border: { bodyLeft: '  ' } }));
     }
@@ -34,9 +59,18 @@ function accountInfoBuilder(yargs) {
         type: 'string',
     });
     yargs.example([
-        ['$0 accounts info', (0, lang_1.i18n)(`commands.account.subcommands.info.examples.default`)],
-        ['$0 accounts info MyAccount', (0, lang_1.i18n)(`commands.account.subcommands.info.examples.nameBased`)],
-        ['$0 accounts info 1234567', (0, lang_1.i18n)(`commands.account.subcommands.info.examples.idBased`)],
+        [
+            '$0 accounts info',
+            (0, lang_1.i18n)(`commands.account.subcommands.info.examples.default`),
+        ],
+        [
+            '$0 accounts info MyAccount',
+            (0, lang_1.i18n)(`commands.account.subcommands.info.examples.nameBased`),
+        ],
+        [
+            '$0 accounts info 1234567',
+            (0, lang_1.i18n)(`commands.account.subcommands.info.examples.idBased`),
+        ],
     ]);
     return yargs;
 }

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,11 +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,
@@ -45,8 +73,14 @@ function builder(yargs) {
         type: 'string',
     });
     yargs.example([
-        ['$0 accounts remove', (0, lang_1.i18n)(`commands.account.subcommands.remove.examples.default`)],
-        ['$0 accounts remove MyAccount', (0, lang_1.i18n)(`commands.account.subcommands.remove.examples.byName`)],
+        [
+            '$0 accounts remove',
+            (0, lang_1.i18n)(`commands.account.subcommands.remove.examples.default`),
+        ],
+        [
+            '$0 accounts remove MyAccount',
+            (0, lang_1.i18n)(`commands.account.subcommands.remove.examples.byName`),
+        ],
     ]);
     return yargs;
 }

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;
+}

package/commands/account/use.js

@@ -8,6 +8,7 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
+const ui_1 = require("../../lib/ui");
 exports.command = 'use [account]';
 exports.describe = (0, lang_1.i18n)('commands.account.subcommands.use.describe');
 async function handler(args) {
@@ -23,6 +24,18 @@ async function handler(args) {
         newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
     }
     (0, usageTracking_1.trackCommandUsage)('accounts-use', undefined, (0, config_1.getAccountId)(newDefaultAccount));
+    const accountOverride = (0, config_1.getCWDAccountOverride)();
+    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+    if (accountOverride && overrideFilePath) {
+        logger_1.logger.warn((0, lang_1.i18n)(`commands.account.subcommands.use.accountOverride`, {
+            accountOverride,
+        }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.use.accountOverrideCommands`, {
+            createOverrideCommand: (0, ui_1.uiCommandReference)('hs account create-override'),
+            removeOverrideCommand: (0, ui_1.uiCommandReference)('hs account remove-override'),
+        }));
+        logger_1.logger.log('');
+    }
     (0, config_1.updateDefaultAccount)(newDefaultAccount);
     return logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.use.success.defaultAccountUpdated', {
         accountName: newDefaultAccount,
@@ -34,9 +47,18 @@ function builder(yargs) {
         type: 'string',
     });
     yargs.example([
-        ['$0 accounts use', (0, lang_1.i18n)('commands.account.subcommands.use.examples.default')],
-        ['$0 accounts use MyAccount', (0, lang_1.i18n)('commands.account.subcommands.use.examples.nameBased')],
-        ['$0 accounts use 1234567', (0, lang_1.i18n)('commands.account.subcommands.use.examples.idBased')],
+        [
+            '$0 accounts use',
+            (0, lang_1.i18n)('commands.account.subcommands.use.examples.default'),
+        ],
+        [
+            '$0 accounts use MyAccount',
+            (0, lang_1.i18n)('commands.account.subcommands.use.examples.nameBased'),
+        ],
+        [
+            '$0 accounts use 1234567',
+            (0, lang_1.i18n)('commands.account.subcommands.use.examples.idBased'),
+        ],
     ]);
     return yargs;
 }

package/commands/account.js

@@ -37,24 +37,29 @@ exports.describe = exports.command = void 0;
 exports.builder = builder;
 const commonOpts_1 = require("../lib/commonOpts");
 const lang_1 = require("../lib/lang");
+const auth = __importStar(require("./account/auth"));
 const list = __importStar(require("./account/list"));
 const rename = __importStar(require("./account/rename"));
 const use = __importStar(require("./account/use"));
 const info = __importStar(require("./account/info"));
 const remove = __importStar(require("./account/remove"));
 const clean = __importStar(require("./account/clean"));
-const i18nKey = 'commands.account';
+const createOverride = __importStar(require("./account/createOverride"));
+const removeOverride = __importStar(require("./account/removeOverride"));
 exports.command = ['account', 'accounts'];
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.account.describe');
 function builder(yargs) {
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs
+        .command(auth)
         .command(list)
         .command(rename)
         .command(use)
         .command(info)
         .command(remove)
         .command(clean)
+        .command(createOverride)
+        .command(removeOverride)
         .demandCommand(1, '');
     return yargs;
 }

package/commands/app/migrate.d.ts

@@ -1,7 +1,6 @@
-import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
-import { MigrateAppOptions } from '../../types/Yargs';
-export declare const validMigrationTargets: string[];
-export declare function handler(options: ArgumentsCamelCase<MigrateAppOptions>): Promise<never>;
-export declare function builder(yargs: Argv): Argv<MigrateAppOptions>;
-declare const migrateCommand: CommandModule<unknown, MigrateAppOptions>;
+import { ArgumentsCamelCase } from 'yargs';
+import { YargsCommandModule } from '../../types/Yargs';
+import { MigrateAppArgs } from '../../lib/app/migrate';
+export declare function handler(options: ArgumentsCamelCase<MigrateAppArgs>): Promise<never>;
+declare const migrateCommand: YargsCommandModule<unknown, MigrateAppArgs>;
 export default migrateCommand;

package/commands/app/migrate.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validMigrationTargets = void 0;
 exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
-const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const errorHandlers_1 = require("../../lib/errorHandlers");
@@ -14,12 +11,13 @@ const exitCodes_1 = require("../../lib/enums/exitCodes");
 const migrate_1 = require("../../lib/app/migrate");
 const ui_1 = require("../../lib/ui");
 const migrate_legacy_1 = require("../../lib/app/migrate_legacy");
-const { v2023_2, v2025_2, unstable } = projects_1.PLATFORM_VERSIONS;
-exports.validMigrationTargets = [v2023_2, v2025_2, unstable];
+const config_2 = require("../../lib/projects/config");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const { v2023_2, v2025_2 } = projects_1.PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = undefined; // uiBetaTag(i18n(`commands.project.subcommands.migrateApp.header.text.describe`), false);
 async function handler(options) {
-    const { derivedAccountId, platformVersion } = options;
+    const { derivedAccountId, platformVersion, unstable } = options;
     await (0, usageTracking_1.trackCommandUsage)('migrate-app', {}, derivedAccountId);
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
     if (!accountConfig) {
@@ -31,7 +29,14 @@ async function handler(options) {
     logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.header.link`), 'https://developers.hubspot.com/docs/platform/migrate-a-public-app-to-projects'));
     logger_1.logger.log('');
     try {
-        if (platformVersion === v2025_2 || platformVersion === unstable) {
+        if (platformVersion === v2025_2 || unstable) {
+            if ((0, config_2.getIsInProject)()) {
+                logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.notAllowedWithinProject`, { command: (0, ui_1.uiCommandReference)('hs project migrate') }));
+                return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            }
+            options.platformVersion = unstable
+                ? projects_1.PLATFORM_VERSIONS.unstable
+                : platformVersion;
             await (0, migrate_1.migrateApp2025_2)(derivedAccountId, options);
         }
         else {
@@ -49,15 +54,12 @@ async function handler(options) {
             (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({ accountId: derivedAccountId }));
         }
         await (0, usageTracking_1.trackCommandMetadataUsage)('migrate-app', { successful: false }, derivedAccountId);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     await (0, usageTracking_1.trackCommandMetadataUsage)('migrate-app', { successful: true }, derivedAccountId);
     return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function appMigrateBuilder(yargs) {
     yargs.options({
         name: {
             describe: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.options.name.describe`),
@@ -73,9 +75,14 @@ function builder(yargs) {
         },
         'platform-version': {
             type: 'string',
-            choices: exports.validMigrationTargets,
+            choices: [v2023_2, v2025_2],
+            hidden: true,
+            default: v2025_2,
+        },
+        unstable: {
+            type: 'boolean',
+            default: false,
             hidden: true,
-            default: '2023.2',
         },
     });
     yargs.example([
@@ -86,6 +93,12 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(appMigrateBuilder, command, (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.describe`), false), {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
 const migrateCommand = {
     command,
     describe,

package/commands/app.js

@@ -6,12 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.describe = exports.command = void 0;
 exports.builder = builder;
 const migrate_1 = __importDefault(require("./app/migrate"));
-const commonOpts_1 = require("../lib/commonOpts");
 exports.command = ['app', 'apps'];
 // Keep the command hidden for now
 exports.describe = undefined;
 function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
     return yargs.command(migrate_1.default).demandCommand(1, '');
 }
 const appCommand = {

package/commands/auth.js

@@ -22,7 +22,6 @@ const oauth_1 = require("../lib/oauth");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const ui_1 = require("../lib/ui");
 const index_1 = require("../lib/errorHandlers/index");
-const i18nKey = 'commands.auth';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -34,7 +33,7 @@ const ALLOWED_AUTH_METHODS = [
 ];
 const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = (0, text_1.commaSeparatedValues)(ALLOWED_AUTH_METHODS);
 exports.command = 'auth';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.auth.describe');
 async function handler(args) {
     const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, } = args;
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
@@ -47,8 +46,12 @@ async function handler(args) {
     if (configPath) {
         (0, git_1.checkAndWarnGitInclusion)(configPath);
     }
-    if (!(0, config_2.getConfigPath)(configFlagValue)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noConfigFileFound`));
+    if ((0, config_2.configFileExists)(true)) {
+        const globalConfigPath = (0, config_2.getConfigPath)('', true);
+        logger_1.logger.error((0, lang_1.i18n)(`commands.auth.errors.globalConfigFileExists`, {
+            configPath: globalConfigPath,
+            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+        }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, usageTracking_1.trackCommandUsage)('auth');
@@ -99,7 +102,7 @@ async function handler(args) {
             successAuthMethod = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
             break;
         default:
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.unsupportedAuthType`, {
+            logger_1.logger.error((0, lang_1.i18n)('commands.auth.errors.unsupportedAuthType', {
                 supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
                 type: authType,
             }));
@@ -114,16 +117,16 @@ async function handler(args) {
     const setAsDefault = await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(accountName);
     logger_1.logger.log('');
     if (setAsDefault) {
-        logger_1.logger.success((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
+        logger_1.logger.success((0, lang_1.i18n)('lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount', {
             accountName,
         }));
     }
     else {
-        logger_1.logger.info((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
+        logger_1.logger.info((0, lang_1.i18n)('lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault', {
             accountName: (0, config_2.getConfigDefaultAccount)(),
         }));
     }
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.configFileUpdated`, {
+    logger_1.logger.success((0, lang_1.i18n)('commands.auth.success.configFileUpdated', {
         configFilename: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
         authType: successAuthMethod,
         accountName,
@@ -140,7 +143,7 @@ async function handler(args) {
 function authBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.authType.describe`),
+            describe: (0, lang_1.i18n)('commands.auth.options.authType.describe'),
             type: 'string',
             choices: [
                 `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
@@ -149,14 +152,14 @@ function authBuilder(yargs) {
             default: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         },
         account: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+            describe: (0, lang_1.i18n)('commands.auth.options.account.describe'),
             type: 'string',
             alias: 'a',
         },
     });
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, exports.command, (0, lang_1.i18n)(`${i18nKey}.verboseDescribe`, {
+exports.builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, exports.command, (0, lang_1.i18n)('commands.auth.verboseDescribe', {
     authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
     configName: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 }), {