@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/commands/sandbox/__tests__/create.test.js

@@ -10,11 +10,11 @@ import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import * as buildAccount from '../../../lib/buildAccount.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../lib/ui/logger.js';
 import * as sandboxesLib from '../../../lib/sandboxes.js';
 import * as sandboxSync from '../../../lib/sandboxSync.js';
 import { vi } from 'vitest';
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../../lib/ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/commonOpts');
 vi.mock('../../../lib/hasFeature');
@@ -207,7 +207,7 @@ describe('commands/sandbox/create', () => {
                 type: 'invalid',
                 force: true,
             });
-            expect(logger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
@@ -217,7 +217,7 @@ describe('commands/sandbox/create', () => {
                 type: 'standard',
                 force: true,
             });
-            expect(logger.error).toHaveBeenCalled();
+            expect(uiLogger.error).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
@@ -230,7 +230,7 @@ describe('commands/sandbox/create', () => {
                 ...args,
                 type: 'developer',
             });
-            expect(logger.error).toHaveBeenCalled();
+            expect(uiLogger.error).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalled();
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });

package/commands/sandbox/create.js

@@ -1,12 +1,12 @@
 import { getAccountConfig, getEnv } from '@hubspot/local-dev-lib/config';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { isMissingScopeError } from '@hubspot/local-dev-lib/errors/index';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
-import { i18n } from '../../lib/lang.js';
+import { commands, lib } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { uiFeatureHighlight, uiBetaTag, uiCommandReference, } from '../../lib/ui/index.js';
+import { uiFeatureHighlight, uiBetaTag } from '../../lib/ui/index.js';
 import { SANDBOX_TYPE_MAP, getAvailableSyncTypes, SYNC_TYPES, validateSandboxUsageLimits, } from '../../lib/sandboxes.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { sandboxTypePrompt } from '../../lib/prompts/sandboxesPrompt.js';
@@ -19,7 +19,7 @@ import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { hasFeature } from '../../lib/hasFeature.js';
 import { FEATURES } from '../../lib/constants.js';
 const command = 'create';
-const describe = uiBetaTag(i18n(`commands.sandbox.subcommands.create.describe`), false);
+const describe = uiBetaTag(commands.sandbox.subcommands.create.describe, false);
 async function handler(args) {
     const { name, type, force, derivedAccountId } = args;
     const accountConfig = getAccountConfig(derivedAccountId);
@@ -27,19 +27,13 @@ async function handler(args) {
     trackCommandUsage('sandbox-create', {}, derivedAccountId);
     // Check if account config exists
     if (!accountConfig) {
-        logger.error(i18n(`commands.sandbox.subcommands.create.failure.noAccountConfig`, {
-            accountId: derivedAccountId,
-            authCommand: uiCommandReference('hs auth'),
-        }));
+        uiLogger.error(commands.sandbox.subcommands.create.failure.noAccountConfig(derivedAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
     // Default account is not a production portal
     if (accountConfig.accountType &&
         accountConfig.accountType !== HUBSPOT_ACCOUNT_TYPES.STANDARD) {
-        logger.error(i18n(`commands.sandbox.subcommands.create.failure.invalidAccountType`, {
-            accountType: HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]],
-            accountName: accountConfig.name || '',
-        }));
+        uiLogger.error(commands.sandbox.subcommands.create.failure.invalidAccountType(HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]], accountConfig.name || ''));
         process.exit(EXIT_CODES.ERROR);
     }
     let typePrompt;
@@ -49,7 +43,7 @@ async function handler(args) {
             typePrompt = await sandboxTypePrompt();
         }
         else {
-            logger.error(i18n(`commands.sandbox.subcommands.create.failure.optionMissing.type`));
+            uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.type);
             process.exit(EXIT_CODES.ERROR);
         }
     }
@@ -62,15 +56,14 @@ async function handler(args) {
     }
     catch (err) {
         if (isMissingScopeError(err)) {
-            logger.error(i18n('lib.sandbox.create.failure.scopes.message', {
-                accountName: accountConfig.name || derivedAccountId,
-            }));
+            uiLogger.error(sandboxType === 'DEVELOPMENT_SANDBOX'
+                ? lib.sandbox.create.developer.failure.scopes.message
+                : lib.sandbox.create.standard.failure.scopes.message);
             const websiteOrigin = getHubSpotWebsiteOrigin(env);
             const url = `${websiteOrigin}/personal-access-key/${derivedAccountId}`;
-            logger.info(i18n('lib.sandbox.create.failure.scopes.instructions', {
-                accountName: accountConfig.name || derivedAccountId,
-                url,
-            }));
+            uiLogger.info(sandboxType === 'DEVELOPMENT_SANDBOX'
+                ? lib.sandbox.create.developer.failure.scopes.instructions(accountConfig.name || derivedAccountId, url)
+                : lib.sandbox.create.standard.failure.scopes.instructions(accountConfig.name || derivedAccountId, url));
         }
         else {
             logError(err);
@@ -82,13 +75,13 @@ async function handler(args) {
             namePrompt = await hubspotAccountNamePrompt({ accountType: sandboxType });
         }
         else {
-            logger.error(i18n(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
+            uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.name);
             process.exit(EXIT_CODES.ERROR);
         }
     }
     const sandboxName = name || (namePrompt && namePrompt.name);
     if (!sandboxName) {
-        logger.error(i18n(`commands.sandbox.subcommands.create.failure.optionMissing.name`));
+        uiLogger.error(commands.sandbox.subcommands.create.failure.optionMissing.name);
         process.exit(EXIT_CODES.ERROR);
     }
     let contactRecordsSyncPromptResult = false;
@@ -100,7 +93,7 @@ async function handler(args) {
                 {
                     name: 'contactRecordsSyncPrompt',
                     type: 'confirm',
-                    message: i18n('lib.sandbox.sync.confirm.syncContactRecords.standard'),
+                    message: commands.sandbox.sync.confirm.syncContactRecords.standard,
                 },
             ]);
             contactRecordsSyncPromptResult = contactRecordsSyncPrompt;
@@ -121,10 +114,7 @@ async function handler(args) {
         const sandboxAccountConfig = getAccountConfig(result.sandbox.sandboxHubId);
         // Check if sandbox account config exists
         if (!sandboxAccountConfig) {
-            logger.error(i18n(`commands.sandbox.subcommands.create.failure.noSandboxAccountConfig`, {
-                accountId: result.sandbox.sandboxHubId,
-                authCommand: uiCommandReference('hs auth'),
-            }));
+            uiLogger.error(commands.sandbox.subcommands.create.failure.noSandboxAccountConfig(result.sandbox.sandboxHubId));
             process.exit(EXIT_CODES.ERROR);
         }
         if (result && !canCreateV2Sandbox) {
@@ -160,20 +150,20 @@ function sandboxCreateBuilder(yargs) {
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: i18n(`commands.sandbox.subcommands.create.options.force.describe`),
+        describe: commands.sandbox.subcommands.create.options.force.describe,
     });
     yargs.option('name', {
-        describe: i18n(`commands.sandbox.subcommands.create.options.name.describe`),
+        describe: commands.sandbox.subcommands.create.options.name.describe,
         type: 'string',
     });
     yargs.option('type', {
-        describe: i18n(`commands.sandbox.subcommands.create.options.type.describe`),
+        describe: commands.sandbox.subcommands.create.options.type.describe,
         choices: Object.keys(SANDBOX_TYPE_MAP),
     });
     yargs.example([
         [
-            '$0 sandbox create --name=MySandboxAccount --type=STANDARD',
-            i18n(`commands.sandbox.subcommands.create.examples.default`),
+            '$0 sandbox create --name=MySandboxAccount --type=standard',
+            commands.sandbox.subcommands.create.examples.default,
         ],
     ]);
     return yargs;

package/commands/sandbox/delete.js

@@ -1,4 +1,4 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { deleteSandbox } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, getAccountId, getConfigAccounts, } from '@hubspot/local-dev-lib/config';
@@ -7,15 +7,15 @@ import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { logError, debugError } from '../../lib/errorHandlers/index.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
 import { deleteSandboxPrompt } from '../../lib/prompts/sandboxesPrompt.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { uiAccountDescription, uiBetaTag, uiCommandReference, } from '../../lib/ui/index.js';
+import { uiAuthCommandReference, uiBetaTag } from '../../lib/ui/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete';
-const describe = uiBetaTag(i18n(`commands.sandbox.subcommands.delete.describe`), false);
+const describe = uiBetaTag(commands.sandbox.subcommands.delete.describe, false);
 async function handler(args) {
     const { userProvidedAccount, derivedAccountId, force } = args;
     trackCommandUsage('sandbox-delete', {}, derivedAccountId);
@@ -26,21 +26,19 @@ async function handler(args) {
         }
         else {
             // Account is required, throw error if force flag is present and no account is specified
-            logger.log('');
-            logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noAccount`));
+            uiLogger.log('');
+            uiLogger.error(commands.sandbox.subcommands.delete.failure.noAccount);
             process.exit(EXIT_CODES.ERROR);
         }
         if (!accountPrompt) {
-            logger.log('');
-            logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noSandboxAccounts`, {
-                authCommand: uiCommandReference('hs auth'),
-            }));
+            uiLogger.log('');
+            uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccounts);
             process.exit(EXIT_CODES.ERROR);
         }
     }
     const sandboxAccountId = getAccountId(userProvidedAccount || accountPrompt.account);
     if (!sandboxAccountId) {
-        logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noSandboxAccountId`));
+        uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccountId);
         process.exit(EXIT_CODES.ERROR);
     }
     const isDefaultAccount = sandboxAccountId === getAccountId();
@@ -55,41 +53,32 @@ async function handler(args) {
             else if (!force) {
                 const parentAccountPrompt = await deleteSandboxPrompt(true);
                 if (!parentAccountPrompt) {
-                    logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
-                        authCommand: uiCommandReference('hs auth'),
-                    }));
+                    uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
                     process.exit(EXIT_CODES.ERROR);
                 }
                 parentAccountId = getAccountId(parentAccountPrompt.account);
             }
             else {
-                logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noParentAccount`, {
-                    authCommand: uiCommandReference('hs auth'),
-                }));
+                uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
                 process.exit(EXIT_CODES.ERROR);
             }
         }
     }
     const url = `${baseUrl}/sandboxes/${parentAccountId}`;
-    const command = `hs auth ${getEnv(sandboxAccountId) === 'qa' ? '--qa' : ''} --account=${parentAccountId}`;
+    const command = uiAuthCommandReference({
+        accountId: parentAccountId || undefined,
+        qa: getEnv(sandboxAccountId) === 'qa',
+    });
     if (parentAccountId && !getAccountId(parentAccountId)) {
-        logger.log('');
-        logger.error(i18n(`commands.sandbox.subcommands.delete.failure.noParentPortalAvailable`, {
-            parentAccountId,
-            url,
-            command,
-        }));
-        logger.log('');
+        uiLogger.log('');
+        uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentPortalAvailable(command, url));
+        uiLogger.log('');
         process.exit(EXIT_CODES.ERROR);
     }
-    logger.debug(i18n(`commands.sandbox.subcommands.delete.debug.deleting`, {
-        account: uiAccountDescription(sandboxAccountId),
-    }));
+    uiLogger.debug(commands.sandbox.subcommands.delete.debug.deleting(sandboxAccountId));
     if (isDefaultAccount) {
-        logger.info(i18n(`commands.sandbox.subcommands.delete.defaultAccountWarning`, {
-            account: uiAccountDescription(sandboxAccountId),
-        }));
-        logger.log('');
+        uiLogger.info(commands.sandbox.subcommands.delete.defaultAccountWarning(sandboxAccountId));
+        uiLogger.log('');
     }
     try {
         if (!force) {
@@ -97,9 +86,7 @@ async function handler(args) {
                 {
                     name: 'confirmSandboxDeletePrompt',
                     type: 'confirm',
-                    message: i18n(`commands.sandbox.subcommands.delete.confirm`, {
-                        account: uiAccountDescription(sandboxAccountId),
-                    }),
+                    message: commands.sandbox.subcommands.delete.confirm(sandboxAccountId),
                 },
             ]);
             if (!confirmed) {
@@ -107,21 +94,17 @@ async function handler(args) {
             }
         }
         await deleteSandbox(parentAccountId, sandboxAccountId);
-        const deleteKey = isDefaultAccount
-            ? `commands.sandbox.subcommands.delete.success.deleteDefault`
-            : `commands.sandbox.subcommands.delete.success.delete`;
-        logger.log('');
-        logger.success(i18n(deleteKey, {
-            account: userProvidedAccount || accountPrompt.account,
-            sandboxHubId: sandboxAccountId || '',
-        }));
-        logger.log('');
+        uiLogger.log('');
+        uiLogger.success(isDefaultAccount
+            ? commands.sandbox.subcommands.delete.success.deleteDefault(userProvidedAccount || accountPrompt.account, sandboxAccountId)
+            : commands.sandbox.subcommands.delete.success.delete(userProvidedAccount || accountPrompt.account, sandboxAccountId));
+        uiLogger.log('');
         const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
         if (promptDefaultAccount && !force) {
             const newDefaultAccount = await selectAccountFromConfig();
             updateDefaultAccount(newDefaultAccount);
         }
-        else {
+        else if (isDefaultAccount && force) {
             // If force is specified, skip prompt and set the parent account id as the default account
             updateDefaultAccount(parentAccountId);
         }
@@ -132,34 +115,26 @@ async function handler(args) {
         if (isSpecifiedError(err, { statusCode: 401 })) {
             // 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.log('');
-            logger.error(i18n(`commands.sandbox.subcommands.delete.failure.invalidKey`, {
-                account: uiAccountDescription(parentAccountId),
-                authCommand: uiCommandReference('hs auth'),
-            }));
+            uiLogger.log('');
+            uiLogger.error(commands.sandbox.subcommands.delete.failure.invalidKey(parentAccountId));
         }
         else if (isSpecifiedError(err, {
             statusCode: 403,
             category: 'BANNED',
             subCategory: 'SandboxErrors.USER_ACCESS_NOT_ALLOWED',
         })) {
-            logger.log('');
-            logger.error(i18n(`commands.sandbox.subcommands.delete.failure.invalidUser`, {
-                accountName: uiAccountDescription(sandboxAccountId),
-                parentAccountName: uiAccountDescription(parentAccountId),
-            }));
-            logger.log('');
+            uiLogger.log('');
+            uiLogger.error(commands.sandbox.subcommands.delete.failure.invalidUser(sandboxAccountId, parentAccountId));
+            uiLogger.log('');
         }
         else if (isSpecifiedError(err, {
             statusCode: 404,
             category: 'OBJECT_NOT_FOUND',
             subCategory: 'SandboxErrors.SANDBOX_NOT_FOUND',
         })) {
-            logger.log('');
-            logger.warn(i18n(`commands.sandbox.subcommands.delete.failure.objectNotFound`, {
-                account: uiAccountDescription(sandboxAccountId),
-            }));
-            logger.log('');
+            uiLogger.log('');
+            uiLogger.warn(commands.sandbox.subcommands.delete.failure.objectNotFound(sandboxAccountId));
+            uiLogger.log('');
             const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
             if (promptDefaultAccount && !force) {
                 const newDefaultAccount = await selectAccountFromConfig();
@@ -179,18 +154,18 @@ async function handler(args) {
 }
 function sandboxDeleteBuilder(yargs) {
     yargs.option('account', {
-        describe: i18n(`commands.sandbox.subcommands.delete.options.account.describe`),
+        describe: commands.sandbox.subcommands.delete.options.account.describe,
         type: 'string',
     });
     yargs.option('force', {
         type: 'boolean',
         alias: 'f',
-        describe: i18n(`commands.sandbox.subcommands.delete.options.force.describe`),
+        describe: commands.sandbox.subcommands.delete.options.force.describe,
     });
     yargs.example([
         [
             '$0 sandbox delete --account=MySandboxAccount',
-            i18n(`commands.sandbox.subcommands.delete.examples.default`),
+            commands.sandbox.subcommands.delete.examples.default,
         ],
     ]);
     return yargs;

package/commands/sandbox.js

@@ -1,10 +1,10 @@
-import { i18n } from '../lib/lang.js';
+import { commands } from '../lang/en.js';
 import { uiBetaTag } from '../lib/ui/index.js';
 import create from './sandbox/create.js';
 import del from './sandbox/delete.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['sandbox', 'sandboxes'];
-const describe = uiBetaTag(i18n(`commands.sandbox.describe`), false);
+const describe = uiBetaTag(commands.sandbox.describe, false);
 function sandboxBuilder(yargs) {
     yargs.command(create).command(del).demandCommand(1, '');
     return yargs;

package/commands/secret/addSecret.js

@@ -1,15 +1,13 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { addSecret, fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { uiAccountDescription } from '../../lib/ui/index.js';
 import { secretValuePrompt, secretNamePrompt, } from '../../lib/prompts/secretPrompt.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { uiCommandReference } from '../../lib/ui/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'add [name]';
-const describe = i18n(`commands.secret.subcommands.add.describe`);
+const describe = commands.secret.subcommands.add.describe;
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -21,23 +19,15 @@ async function handler(args) {
         }
         const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
         if (secrets.includes(secretName)) {
-            logger.error(i18n(`commands.secret.subcommands.add.errors.alreadyExists`, {
-                secretName,
-                command: uiCommandReference('hs secret update'),
-            }));
+            uiLogger.error(commands.secret.subcommands.add.errors.alreadyExists(secretName));
             process.exit(EXIT_CODES.ERROR);
         }
         const { secretValue } = await secretValuePrompt();
         await addSecret(derivedAccountId, secretName, secretValue);
-        logger.success(i18n(`commands.secret.subcommands.add.success.add`, {
-            accountIdentifier: uiAccountDescription(derivedAccountId),
-            secretName,
-        }));
+        uiLogger.success(commands.secret.subcommands.add.success.add(secretName, derivedAccountId));
     }
     catch (err) {
-        logger.error(i18n(`commands.secret.subcommands.add.errors.add`, {
-            secretName: secretName || '',
-        }));
+        uiLogger.error(commands.secret.subcommands.add.errors.add(secretName || ''));
         logError(err, new ApiErrorContext({
             request: 'add secret',
             accountId: derivedAccountId,
@@ -46,7 +36,7 @@ async function handler(args) {
 }
 function addSecretBuilder(yargs) {
     yargs.positional('name', {
-        describe: i18n(`commands.secret.subcommands.add.positionals.name.describe`),
+        describe: commands.secret.subcommands.add.positionals.name.describe,
         type: 'string',
     });
     return yargs;

package/commands/secret/deleteSecret.js

@@ -1,15 +1,14 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { deleteSecret, fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { secretListPrompt } from '../../lib/prompts/secretPrompt.js';
 import { confirmPrompt } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { uiAccountDescription } from '../../lib/ui/index.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from './../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'delete [name]';
-const describe = i18n(`commands.secret.subcommands.delete.describe`);
+const describe = commands.secret.subcommands.delete.describe;
 async function handler(args) {
     const { name, derivedAccountId, force } = args;
     let secretName = name;
@@ -17,36 +16,27 @@ async function handler(args) {
     try {
         const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
-            logger.error(i18n(`commands.secret.subcommands.delete.errors.noSecret`, {
-                secretName,
-            }));
+            uiLogger.error(commands.secret.subcommands.delete.errors.noSecret(secretName));
             process.exit(EXIT_CODES.ERROR);
         }
         if (!secretName) {
-            const { secretToModify } = await secretListPrompt(secrets, i18n(`commands.secret.subcommands.delete.selectSecret`));
+            const { secretToModify } = await secretListPrompt(secrets, commands.secret.subcommands.delete.selectSecret);
             secretName = secretToModify;
         }
         const confirmDelete = force ||
-            (await confirmPrompt(i18n(`commands.secret.subcommands.delete.confirmDelete`, {
-                secretName,
-            }), {
+            (await confirmPrompt(commands.secret.subcommands.delete.confirmDelete(secretName), {
                 defaultAnswer: false,
             }));
         if (!confirmDelete) {
-            logger.success(i18n(`commands.secret.subcommands.delete.deleteCanceled`));
+            uiLogger.success(commands.secret.subcommands.delete.deleteCanceled);
             process.exit(EXIT_CODES.SUCCESS);
         }
         await deleteSecret(derivedAccountId, secretName);
-        logger.success(i18n(`commands.secret.subcommands.delete.success.delete`, {
-            accountIdentifier: uiAccountDescription(derivedAccountId),
-            secretName,
-        }));
+        uiLogger.success(commands.secret.subcommands.delete.success.delete(secretName, derivedAccountId));
     }
     catch (err) {
         if (secretName) {
-            logger.error(i18n(`commands.secret.subcommands.delete.errors.delete`, {
-                secretName,
-            }));
+            uiLogger.error(commands.secret.subcommands.delete.errors.delete(secretName));
         }
         logError(err, new ApiErrorContext({
             request: 'delete a secret',
@@ -57,7 +47,7 @@ async function handler(args) {
 function deleteSecretBuilder(yargs) {
     yargs
         .positional('name', {
-        describe: i18n(`commands.secret.subcommands.delete.positionals.name.describe`),
+        describe: commands.secret.subcommands.delete.positionals.name.describe,
         type: 'string',
     })
         .options('force', {

package/commands/secret/listSecret.js

@@ -1,26 +1,24 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { uiAccountDescription } from '../../lib/ui/index.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'list';
-const describe = i18n(`commands.secret.subcommands.list.describe`);
+const describe = commands.secret.subcommands.list.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
     trackCommandUsage('secrets-list', {}, derivedAccountId);
     try {
         const { data: { results }, } = await fetchSecrets(derivedAccountId);
-        const groupLabel = i18n(`commands.secret.subcommands.list.groupLabel`, {
-            accountIdentifier: uiAccountDescription(derivedAccountId),
-        });
-        logger.group(groupLabel);
-        results.forEach(secret => logger.log(secret));
-        logger.groupEnd();
+        const groupLabel = commands.secret.subcommands.list.groupLabel(uiAccountDescription(derivedAccountId));
+        uiLogger.group(groupLabel);
+        results.forEach(secret => uiLogger.log(secret));
+        uiLogger.groupEnd();
     }
     catch (err) {
-        logger.error(i18n(`commands.secret.subcommands.list.errors.list`));
+        uiLogger.error(commands.secret.subcommands.list.errors.list);
         logError(err, new ApiErrorContext({
             request: 'add secret',
             accountId: derivedAccountId,

package/commands/secret/updateSecret.js

@@ -1,14 +1,13 @@
 import { updateSecret, fetchSecrets } from '@hubspot/local-dev-lib/api/secrets';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { uiAccountDescription } from '../../lib/ui/index.js';
 import { secretValuePrompt, secretListPrompt, } from '../../lib/prompts/secretPrompt.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'update [name]';
-const describe = i18n(`commands.secret.subcommands.update.describe`);
+const describe = commands.secret.subcommands.update.describe;
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -16,27 +15,20 @@ async function handler(args) {
     try {
         const { data: { results: secrets }, } = await fetchSecrets(derivedAccountId);
         if (secretName && !secrets.includes(secretName)) {
-            logger.error(i18n(`commands.secret.subcommands.update.errors.noSecret`, {
-                secretName,
-            }));
+            uiLogger.error(commands.secret.subcommands.update.errors.noSecret(secretName));
             process.exit(EXIT_CODES.ERROR);
         }
         if (!secretName) {
-            const { secretToModify } = await secretListPrompt(secrets, i18n(`commands.secret.subcommands.update.selectSecret`));
+            const { secretToModify } = await secretListPrompt(secrets, commands.secret.subcommands.update.selectSecret);
             secretName = secretToModify;
         }
         const { secretValue } = await secretValuePrompt();
         await updateSecret(derivedAccountId, secretName, secretValue);
-        logger.success(i18n(`commands.secret.subcommands.update.success.update`, {
-            accountIdentifier: uiAccountDescription(derivedAccountId),
-            secretName,
-        }));
-        logger.log(i18n(`commands.secret.subcommands.update.success.updateExplanation`));
+        uiLogger.success(commands.secret.subcommands.update.success.update(secretName, derivedAccountId));
+        uiLogger.log(commands.secret.subcommands.update.success.updateExplanation);
     }
     catch (err) {
-        logger.error(i18n(`commands.secret.subcommands.update.errors.update`, {
-            secretName: secretName || '',
-        }));
+        uiLogger.error(commands.secret.subcommands.update.errors.update(secretName || ''));
         logError(err, new ApiErrorContext({
             request: 'update secret',
             accountId: derivedAccountId,
@@ -45,7 +37,7 @@ async function handler(args) {
 }
 function updateSecretBuilder(yargs) {
     yargs.positional('name', {
-        describe: i18n(`commands.secret.subcommands.update.positionals.name.describe`),
+        describe: commands.secret.subcommands.update.positionals.name.describe,
         type: 'string',
     });
     return yargs;

package/commands/secret.js

@@ -2,10 +2,10 @@ import addSecretCommand from './secret/addSecret.js';
 import listSecretCommand from './secret/listSecret.js';
 import deleteSecretCommand from './secret/deleteSecret.js';
 import updateSecretCommand from './secret/updateSecret.js';
-import { i18n } from '../lib/lang.js';
+import { commands } from '../lang/en.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['secret', 'secrets'];
-const describe = i18n(`commands.secret.describe`);
+const describe = commands.secret.describe;
 function secretBuilder(yargs) {
     yargs
         .command(listSecretCommand)