@hubspot/cli 7.4.3-beta.0 → 7.4.4-beta.0

package/commands/project/migrate.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.describe = exports.command = void 0;
 exports.handler = handler;
 exports.builder = builder;
-const lang_1 = require("../../lib/lang");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const commonOpts_1 = require("../../lib/commonOpts");
 const migrate_1 = require("../../lib/app/migrate");
@@ -11,20 +10,28 @@ const projects_1 = require("../../lib/projects");
 const projects_2 = require("@hubspot/local-dev-lib/constants/projects");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
+const ui_1 = require("../../lib/ui");
+const en_1 = require("../../lang/en");
+const { v2025_2 } = projects_2.PLATFORM_VERSIONS;
 exports.command = 'migrate';
-exports.describe = undefined; // i18n('commands.project.subcommands.migrate.noProjectConfig')
+exports.describe = undefined;
 async function handler(options) {
+    const { platformVersion, unstable } = options;
     const projectConfig = await (0, projects_1.getProjectConfig)();
     if (!projectConfig.projectConfig) {
-        logger_1.logger.error((0, lang_1.i18n)('commands.project.subcommands.migrate.errors.noProjectConfig'));
+        logger_1.logger.error(en_1.commands.project.migrate.errors.noProjectConfig((0, ui_1.uiCommandReference)('hs app migrate')));
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    logger_1.logger.log();
+    logger_1.logger.log((0, ui_1.uiBetaTag)(en_1.commands.project.migrate.preamble(platformVersion), false));
     const { derivedAccountId } = options;
     try {
         await (0, migrate_1.migrateApp2025_2)(derivedAccountId, {
             ...options,
             name: projectConfig?.projectConfig?.name,
-            platformVersion: options.platformVersion,
+            platformVersion: unstable
+                ? projects_2.PLATFORM_VERSIONS.unstable
+                : platformVersion,
         }, projectConfig);
     }
     catch (error) {
@@ -37,10 +44,16 @@ function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
     (0, commonOpts_1.addAccountOptions)(yargs);
     (0, commonOpts_1.addGlobalOptions)(yargs);
-    yargs.option('platform-version', {
+    yargs
+        .option('platform-version', {
         type: 'string',
-        choices: Object.values(projects_2.PLATFORM_VERSIONS),
-        default: projects_2.PLATFORM_VERSIONS.v2025_2,
+        choices: [v2025_2],
+        default: v2025_2,
+        hidden: true,
+    })
+        .option('unstable', {
+        type: 'boolean',
+        default: false,
         hidden: true,
     });
     return yargs;

package/commands/project/migrateApp.d.ts

@@ -3,7 +3,7 @@ import { MigrateAppArgs } from '../../lib/app/migrate';
 export declare const command = "migrate-app";
 export declare const describe: string | undefined;
 export declare const deprecated = true;
-export declare function handler(yargs: ArgumentsCamelCase<MigrateAppArgs>): Promise<void>;
+export declare function handler(options: ArgumentsCamelCase<MigrateAppArgs>): Promise<void>;
 export declare function builder(yargs: Argv): Argv<MigrateAppArgs>;
 declare const migrateAppCommand: CommandModule<unknown, MigrateAppArgs>;
 export default migrateAppCommand;

package/commands/project/migrateApp.js

@@ -8,16 +8,18 @@ const ui_1 = require("../../lib/ui");
 const migrate_1 = require("../app/migrate");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const commonOpts_1 = require("../../lib/commonOpts");
+const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
+const { v2023_2, v2025_2 } = projects_1.PLATFORM_VERSIONS;
 exports.command = 'migrate-app';
 // TODO: Leave this as deprecated and remove in the next major release
 exports.describe = (0, ui_1.uiDeprecatedTag)((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.describe`), false);
 exports.deprecated = true;
-async function handler(yargs) {
+async function handler(options) {
     logger_1.logger.warn((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.deprecationWarning`, {
         oldCommand: (0, ui_1.uiCommandReference)('hs project migrate-app'),
-        newCommand: (0, ui_1.uiCommandReference)('hs app migrate'),
+        newCommand: (0, ui_1.uiCommandReference)(`hs app migrate --platform-version=${options.platformVersion}`),
     }));
-    await (0, migrate_1.handler)(yargs);
+    await (0, migrate_1.handler)(options);
 }
 function builder(yargs) {
     (0, commonOpts_1.addConfigOptions)(yargs);
@@ -38,9 +40,9 @@ function builder(yargs) {
         },
         'platform-version': {
             type: 'string',
-            choices: migrate_1.validMigrationTargets,
+            choices: [v2023_2, v2025_2],
             hidden: true,
-            default: '2023.2',
+            default: v2023_2,
         },
     });
     yargs.example([

package/commands/project/open.js

@@ -16,9 +16,8 @@ const urls_1 = require("../../lib/projects/urls");
 const projectNamePrompt_1 = require("../../lib/prompts/projectNamePrompt");
 const ui_1 = require("../../lib/ui");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const i18nKey = 'commands.project.subcommands.open';
 exports.command = 'open';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.open.describe`), false);
 async function handler(args) {
     const { project, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('project-open', undefined, derivedAccountId);
@@ -41,7 +40,9 @@ async function handler(args) {
     }
     const url = (0, urls_1.getProjectDetailUrl)(projectName, derivedAccountId);
     (0, open_1.default)(url, { url: true });
-    logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success`, { projectName: projectName }));
+    logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.open.success`, {
+        projectName: projectName,
+    }));
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
 function builder(yargs) {
@@ -51,11 +52,16 @@ function builder(yargs) {
     (0, commonOpts_1.addTestingOptions)(yargs);
     yargs.options({
         project: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.project.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.open.options.project.describe`),
             type: 'string',
         },
     });
-    yargs.example([['$0 project open', (0, lang_1.i18n)(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project open',
+            (0, lang_1.i18n)(`commands.project.subcommands.open.examples.default`),
+        ],
+    ]);
     return yargs;
 }
 module.exports = {

package/commands/project/upload.js

@@ -20,9 +20,8 @@ const constants_1 = require("../../lib/constants");
 const index_2 = require("../../lib/errorHandlers/index");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const i18nKey = 'commands.project.subcommands.upload';
 exports.command = 'upload';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.upload.describe`), false);
 async function handler(args) {
     const { forceCreate, message, derivedAccountId, skipValidation } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
@@ -41,7 +40,7 @@ async function handler(args) {
                 subCategory: constants_1.PROJECT_ERROR_TYPES.PROJECT_LOCKED,
             })) {
                 logger_1.logger.log();
-                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.projectLockedError`));
+                logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.upload.errors.projectLockedError`));
                 logger_1.logger.log();
             }
             else {
@@ -53,10 +52,10 @@ async function handler(args) {
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (result && result.succeeded && !result.buildResult.isAutoDeployEnabled) {
-            logger_1.logger.log(chalk_1.default.bold((0, lang_1.i18n)(`${i18nKey}.logs.buildSucceeded`, {
+            logger_1.logger.log(chalk_1.default.bold((0, lang_1.i18n)(`commands.project.subcommands.upload.logs.buildSucceeded`, {
                 buildId: result.buildId,
             })));
-            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.autoDeployDisabled`, {
+            logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.upload.logs.autoDeployDisabled`, {
                 deployCommand: (0, ui_1.uiCommandReference)(`hs project deploy --build=${result.buildId}`),
             }));
             (0, projects_1.logFeedbackMessage)(result.buildId);
@@ -76,13 +75,13 @@ async function handler(args) {
 function projectUploadBuilder(yargs) {
     yargs.options({
         'force-create': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.forceCreate.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.upload.options.forceCreate.describe`),
             type: 'boolean',
             default: false,
         },
         message: {
             alias: 'm',
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.message.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.upload.options.message.describe`),
             type: 'string',
             default: '',
         },
@@ -92,7 +91,12 @@ function projectUploadBuilder(yargs) {
             default: false,
         },
     });
-    yargs.example([['$0 project upload', (0, lang_1.i18n)(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project upload',
+            (0, lang_1.i18n)(`commands.project.subcommands.upload.examples.default`),
+        ],
+    ]);
     return yargs;
 }
 exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectUploadBuilder, exports.command, exports.describe, {

package/commands/project/watch.js

@@ -19,9 +19,8 @@ const { cancelStagedBuild, fetchProjectBuilds, } = require('@hubspot/local-dev-l
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { handleKeypress, handleExit } = require('../../lib/process');
-const i18nKey = 'commands.project.subcommands.watch';
 exports.command = 'watch';
-exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
+exports.describe = uiBetaTag(i18n(`commands.project.subcommands.watch.describe`), false);
 const handleBuildStatus = async (accountId, projectName, buildId) => {
     const { isAutoDeployEnabled, deployStatusTaskLocator } = await pollBuildStatus(accountId, projectName, buildId);
     if (isAutoDeployEnabled && deployStatusTaskLocator) {
@@ -31,7 +30,7 @@ const handleBuildStatus = async (accountId, projectName, buildId) => {
 };
 const handleUserInput = (accountId, projectName, currentBuildId) => {
     const onTerminate = async () => {
-        logger.log(i18n(`${i18nKey}.logs.processExited`));
+        logger.log(i18n(`commands.project.subcommands.watch.logs.processExited`));
         if (currentBuildId) {
             try {
                 await cancelStagedBuild(accountId, projectName);
@@ -89,7 +88,7 @@ exports.handler = async (options) => {
                     subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
                 })) {
                     logger.log();
-                    logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
+                    logger.error(i18n(`commands.project.subcommands.watch.errors.projectLockedError`));
                     logger.log();
                 }
                 else {
@@ -112,10 +111,15 @@ exports.handler = async (options) => {
 exports.builder = yargs => {
     yargs.option('initial-upload', {
         alias: 'i',
-        describe: i18n(`${i18nKey}.options.initialUpload.describe`),
+        describe: i18n(`commands.project.subcommands.watch.options.initialUpload.describe`),
         type: 'boolean',
     });
-    yargs.example([['$0 project watch', i18n(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project watch',
+            i18n(`commands.project.subcommands.watch.examples.default`),
+        ],
+    ]);
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     addUseEnvironmentOptions(yargs);

package/commands/project.js

@@ -18,9 +18,8 @@ const migrateApp = require('./project/migrateApp');
 const migrate = require('./project/migrate');
 const cloneApp = require('./project/cloneApp');
 const installDeps = require('./project/installDeps');
-const i18nKey = 'commands.project';
 exports.command = ['project', 'projects'];
-exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
+exports.describe = uiBetaTag(i18n(`commands.project.describe`), false);
 exports.builder = yargs => {
     addGlobalOptions(yargs);
     yargs

package/commands/remove.js

@@ -9,18 +9,20 @@ const index_1 = require("../lib/errorHandlers/index");
 const commonOpts_1 = require("../lib/commonOpts");
 const usageTracking_1 = require("../lib/usageTracking");
 const lang_1 = require("../lib/lang");
-const i18nKey = 'commands.remove';
 exports.command = 'remove <path>';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.remove.describe`);
 async function handler(args) {
     const { path: hsPath, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('remove', undefined, derivedAccountId);
     try {
         await (0, fileMapper_1.deleteFile)(derivedAccountId, hsPath);
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.deleted`, { accountId: derivedAccountId, path: hsPath }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.remove.deleted`, {
+            accountId: derivedAccountId,
+            path: hsPath,
+        }));
     }
     catch (error) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.deleteFailed`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.remove.errors.deleteFailed`, {
             accountId: derivedAccountId,
             path: hsPath,
         }));
@@ -36,7 +38,7 @@ function builder(yargs) {
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.path.describe`),
+        describe: (0, lang_1.i18n)(`commands.remove.positionals.path.describe`),
         type: 'string',
     });
     return yargs;

package/commands/sandbox/create.js

@@ -21,9 +21,8 @@ const sandboxSync_1 = require("../../lib/sandboxSync");
 const index_2 = require("../../lib/errorHandlers/index");
 const buildAccount_1 = require("../../lib/buildAccount");
 const accountNamePrompt_1 = require("../../lib/prompts/accountNamePrompt");
-const i18nKey = 'commands.sandbox.subcommands.create';
 exports.command = 'create';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.create.describe`), false);
 async function handler(args) {
     const { name, type, force, derivedAccountId } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
@@ -31,7 +30,7 @@ async function handler(args) {
     (0, usageTracking_1.trackCommandUsage)('sandbox-create', {}, derivedAccountId);
     // Check if account config exists
     if (!accountConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noAccountConfig`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.noAccountConfig`, {
             accountId: derivedAccountId,
             authCommand: (0, ui_1.uiCommandReference)('hs auth'),
         }));
@@ -40,7 +39,7 @@ async function handler(args) {
     // Default account is not a production portal
     if (accountConfig.accountType &&
         accountConfig.accountType !== config_2.HUBSPOT_ACCOUNT_TYPES.STANDARD) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidAccountType`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.invalidAccountType`, {
             accountType: config_2.HUBSPOT_ACCOUNT_TYPE_STRINGS[config_2.HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]],
             accountName: accountConfig.name || '',
         }));
@@ -53,7 +52,7 @@ async function handler(args) {
             typePrompt = await (0, sandboxesPrompt_1.sandboxTypePrompt)();
         }
         else {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.optionMissing.type`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.optionMissing.type`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
@@ -86,7 +85,7 @@ async function handler(args) {
             namePrompt = await (0, accountNamePrompt_1.hubspotAccountNamePrompt)({ accountType: sandboxType });
         }
         else {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.optionMissing.name`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
@@ -111,7 +110,7 @@ async function handler(args) {
         const sandboxAccountConfig = (0, config_1.getAccountConfig)(result.sandbox.sandboxHubId);
         // Check if sandbox account config exists
         if (!sandboxAccountConfig) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccountConfig`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.create.failure.noSandboxAccountConfig`, {
                 accountId: result.sandbox.sandboxHubId,
                 authCommand: (0, ui_1.uiCommandReference)('hs auth'),
             }));
@@ -151,20 +150,20 @@ function builder(yargs) {
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.force.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.force.describe`),
     });
     yargs.option('name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.name.describe`),
         type: 'string',
     });
     yargs.option('type', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.type.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.create.options.type.describe`),
         choices: Object.keys(sandboxes_1.SANDBOX_TYPE_MAP),
     });
     yargs.example([
         [
             '$0 sandbox create --name=MySandboxAccount --type=STANDARD',
-            (0, lang_1.i18n)(`${i18nKey}.examples.default`),
+            (0, lang_1.i18n)(`commands.sandbox.subcommands.create.examples.default`),
         ],
     ]);
     (0, commonOpts_1.addConfigOptions)(yargs);

package/commands/sandbox/delete.js

@@ -19,9 +19,8 @@ const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const ui_1 = require("../../lib/ui");
-const i18nKey = 'commands.sandbox.subcommands.delete';
 exports.command = 'delete';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.describe`), false);
 async function handler(args) {
     const { providedAccountId, force } = args;
     (0, usageTracking_1.trackCommandUsage)('sandbox-delete', {}, providedAccountId);
@@ -33,12 +32,12 @@ async function handler(args) {
         else {
             // Account is required, throw error if force flag is present and no account is specified
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noAccount`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noAccount`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (!accountPrompt) {
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccounts`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noSandboxAccounts`, {
                 authCommand: (0, ui_1.uiCommandReference)('hs auth'),
             }));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -46,7 +45,7 @@ async function handler(args) {
     }
     const sandboxAccountId = (0, config_1.getAccountId)(providedAccountId || accountPrompt.account);
     if (!sandboxAccountId) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noSandboxAccountId`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noSandboxAccountId`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const isDefaultAccount = sandboxAccountId === (0, config_1.getAccountId)();
@@ -61,7 +60,7 @@ async function handler(args) {
             else if (!force) {
                 const parentAccountPrompt = await (0, sandboxesPrompt_1.deleteSandboxPrompt)(true);
                 if (!parentAccountPrompt) {
-                    logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentAccount`, {
+                    logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
                         authCommand: (0, ui_1.uiCommandReference)('hs auth'),
                     }));
                     process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -69,7 +68,7 @@ async function handler(args) {
                 parentAccountId = (0, config_1.getAccountId)(parentAccountPrompt.account);
             }
             else {
-                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentAccount`, {
+                logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
                     authCommand: (0, ui_1.uiCommandReference)('hs auth'),
                 }));
                 process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -80,7 +79,7 @@ async function handler(args) {
     const command = `hs auth ${(0, config_1.getEnv)(sandboxAccountId) === 'qa' ? '--qa' : ''} --account=${parentAccountId}`;
     if (parentAccountId && !(0, config_1.getAccountId)(parentAccountId)) {
         logger_1.logger.log('');
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.noParentPortalAvailable`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.noParentPortalAvailable`, {
             parentAccountId,
             url,
             command,
@@ -88,11 +87,11 @@ async function handler(args) {
         logger_1.logger.log('');
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.debug.deleting`, {
+    logger_1.logger.debug((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.debug.deleting`, {
         account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
     }));
     if (isDefaultAccount) {
-        logger_1.logger.info((0, lang_1.i18n)(`${i18nKey}.defaultAccountWarning`, {
+        logger_1.logger.info((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.defaultAccountWarning`, {
             account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
         }));
         logger_1.logger.log('');
@@ -103,7 +102,7 @@ async function handler(args) {
                 {
                     name: 'confirmSandboxDeletePrompt',
                     type: 'confirm',
-                    message: (0, lang_1.i18n)(`${i18nKey}.confirm`, {
+                    message: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.confirm`, {
                         account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
                     }),
                 },
@@ -114,8 +113,8 @@ async function handler(args) {
         }
         await (0, sandboxHubs_1.deleteSandbox)(parentAccountId, sandboxAccountId);
         const deleteKey = isDefaultAccount
-            ? `${i18nKey}.success.deleteDefault`
-            : `${i18nKey}.success.delete`;
+            ? `commands.sandbox.subcommands.delete.success.deleteDefault`
+            : `commands.sandbox.subcommands.delete.success.delete`;
         logger_1.logger.log('');
         logger_1.logger.success((0, lang_1.i18n)(deleteKey, {
             account: providedAccountId || accountPrompt.account,
@@ -139,7 +138,7 @@ async function handler(args) {
             // Intercept invalid key error
             // This command uses the parent portal PAK to delete a sandbox, so we must specify which account needs a new key
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidKey`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.invalidKey`, {
                 account: (0, ui_1.uiAccountDescription)(parentAccountId),
                 authCommand: (0, ui_1.uiCommandReference)('hs auth'),
             }));
@@ -150,7 +149,7 @@ async function handler(args) {
             subCategory: 'SandboxErrors.USER_ACCESS_NOT_ALLOWED',
         })) {
             logger_1.logger.log('');
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.failure.invalidUser`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.invalidUser`, {
                 accountName: (0, ui_1.uiAccountDescription)(sandboxAccountId),
                 parentAccountName: (0, ui_1.uiAccountDescription)(parentAccountId),
             }));
@@ -162,7 +161,7 @@ async function handler(args) {
             subCategory: 'SandboxErrors.SANDBOX_NOT_FOUND',
         })) {
             logger_1.logger.log('');
-            logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.failure.objectNotFound`, {
+            logger_1.logger.warn((0, lang_1.i18n)(`commands.sandbox.subcommands.delete.failure.objectNotFound`, {
                 account: (0, ui_1.uiAccountDescription)(sandboxAccountId),
             }));
             logger_1.logger.log('');
@@ -185,18 +184,18 @@ async function handler(args) {
 }
 function builder(yargs) {
     yargs.option('account', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.account.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.options.account.describe`),
         type: 'string',
     });
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: (0, lang_1.i18n)(`${i18nKey}.options.force.describe`),
+        describe: (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.options.force.describe`),
     });
     yargs.example([
         [
             '$0 sandbox delete --account=MySandboxAccount',
-            (0, lang_1.i18n)(`${i18nKey}.examples.default`),
+            (0, lang_1.i18n)(`commands.sandbox.subcommands.delete.examples.default`),
         ],
     ]);
     (0, commonOpts_1.addConfigOptions)(yargs);

package/commands/sandbox.js

@@ -40,9 +40,8 @@ const lang_1 = require("../lib/lang");
 const ui_1 = require("../lib/ui");
 const create = __importStar(require("./sandbox/create"));
 const del = __importStar(require("./sandbox/delete"));
-const i18nKey = 'commands.sandbox';
 exports.command = ['sandbox', 'sandboxes'];
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.sandbox.describe`), false);
 function builder(yargs) {
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs.command(create).command(del).demandCommand(1, '');

package/commands/secret/addSecret.js

@@ -13,9 +13,8 @@ const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_2 = require("../../lib/ui");
-const i18nKey = 'commands.secret.subcommands.add';
 exports.command = 'add [name]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.add.describe`);
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -27,7 +26,7 @@ async function handler(args) {
         }
         const { data: { results: secrets }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
         if (secrets.includes(secretName)) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.alreadyExists`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.add.errors.alreadyExists`, {
                 secretName,
                 command: (0, ui_2.uiCommandReference)('hs secret update'),
             }));
@@ -35,13 +34,13 @@ async function handler(args) {
         }
         const { secretValue } = await (0, secretPrompt_1.secretValuePrompt)();
         await (0, secrets_1.addSecret)(derivedAccountId, secretName, secretValue);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.add`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.add.success.add`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
             secretName,
         }));
     }
     catch (err) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.add`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.add.errors.add`, {
             secretName: secretName || '',
         }));
         (0, index_1.logError)(err, new index_1.ApiErrorContext({
@@ -55,7 +54,7 @@ function builder(yargs) {
     (0, commonOpts_1.addAccountOptions)(yargs);
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs.positional('name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.secret.subcommands.add.positionals.name.describe`),
         type: 'string',
     });
     return yargs;

package/commands/secret/deleteSecret.js

@@ -13,9 +13,8 @@ const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
 const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-const i18nKey = 'commands.secret.subcommands.delete';
 exports.command = 'delete [name]';
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.delete.describe`);
 async function handler(args) {
     const { name, derivedAccountId, force } = args;
     let secretName = name;
@@ -23,30 +22,34 @@ async function handler(args) {
     try {
         const { data: { results: secrets }, } = await (0, secrets_1.fetchSecrets)(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noSecret`, { secretName }));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.delete.errors.noSecret`, {
+                secretName,
+            }));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (!secretName) {
-            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`${i18nKey}.selectSecret`));
+            const { secretToModify } = await (0, secretPrompt_1.secretListPrompt)(secrets, (0, lang_1.i18n)(`commands.secret.subcommands.delete.selectSecret`));
             secretName = secretToModify;
         }
         const confirmDelete = force ||
-            (await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)(`${i18nKey}.confirmDelete`, { secretName }), {
+            (await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)(`commands.secret.subcommands.delete.confirmDelete`, {
+                secretName,
+            }), {
                 defaultAnswer: false,
             }));
         if (!confirmDelete) {
-            logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.deleteCanceled`));
+            logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.delete.deleteCanceled`));
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
         await (0, secrets_1.deleteSecret)(derivedAccountId, secretName);
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.delete`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.secret.subcommands.delete.success.delete`, {
             accountIdentifier: (0, ui_1.uiAccountDescription)(derivedAccountId),
             secretName,
         }));
     }
     catch (err) {
         if (secretName) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.delete`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.secret.subcommands.delete.errors.delete`, {
                 secretName,
             }));
         }
@@ -62,7 +65,7 @@ function builder(yargs) {
     (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     yargs
         .positional('name', {
-        describe: (0, lang_1.i18n)(`${i18nKey}.positionals.name.describe`),
+        describe: (0, lang_1.i18n)(`commands.secret.subcommands.delete.positionals.name.describe`),
         type: 'string',
     })
         .options('force', {