@hubspot/cli 7.8.12-experimental.0 → 7.9.0-beta.0

package/commands/account/list.js

@@ -1,15 +1,15 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { getConfigPath, getConfigAccounts, getDefaultAccountOverrideFilePath, getDisplayDefaultAccount, getConfigDefaultAccount, } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { indent } from '../../lib/ui/index.js';
 import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { isSandbox, isDeveloperTestAccount } from '../../lib/accountTypes.js';
-import { i18n } from '../../lib/lang.js';
 import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { commands } from '../../lang/en.js';
 const command = ['list', 'ls'];
-const describe = i18n('commands.account.subcommands.list.describe');
+const describe = commands.account.subcommands.list.describe;
 function sortAndMapAccounts(accounts) {
     const mappedAccountData = {};
     // Standard and app developer accounts
@@ -72,33 +72,27 @@ async function handler(args) {
     const mappedAccountData = sortAndMapAccounts(accountsList);
     const accountData = getAccountData(mappedAccountData);
     accountData.unshift(getTableHeader([
-        i18n('commands.account.subcommands.list.labels.name'),
-        i18n('commands.account.subcommands.list.labels.accountId'),
-        i18n('commands.account.subcommands.list.labels.authType'),
+        commands.account.subcommands.list.labels.name,
+        commands.account.subcommands.list.labels.accountId,
+        commands.account.subcommands.list.labels.authType,
     ]));
     // If a default account is present in the config, display it
     if (configPath) {
-        logger.log(i18n(`commands.account.subcommands.list.defaultAccountTitle`));
-        logger.log(`${indent(1)}${i18n(`commands.account.subcommands.list.configPath`, {
-            configPath,
-        })}`);
-        logger.log(`${indent(1)}${i18n(`commands.account.subcommands.list.defaultAccount`, {
-            account: getDisplayDefaultAccount(),
-        })}`);
-        logger.log('');
+        uiLogger.log(commands.account.subcommands.list.defaultAccountTitle);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.configPath(configPath)}`);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.defaultAccount(getDisplayDefaultAccount().toString())}`);
+        uiLogger.log('');
     }
     // If a default account override is present, display it
     const overrideFilePath = getDefaultAccountOverrideFilePath();
     if (overrideFilePath) {
-        logger.log(i18n(`commands.account.subcommands.list.overrideFilePathTitle`));
-        logger.log(`${indent(1)}${i18n(`commands.account.subcommands.list.overrideFilePath`, { overrideFilePath })}`);
-        logger.log(`${indent(1)}${i18n(`commands.account.subcommands.list.overrideAccount`, {
-            account: getConfigDefaultAccount(),
-        })}`);
-        logger.log('');
+        uiLogger.log(commands.account.subcommands.list.overrideFilePathTitle);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.overrideFilePath(overrideFilePath)}`);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.overrideAccount(getConfigDefaultAccount().toString())}`);
+        uiLogger.log('');
     }
-    logger.log(i18n(`commands.account.subcommands.list.accounts`));
-    logger.log(getTableContents(accountData, { border: { bodyLeft: '  ' } }));
+    uiLogger.log(commands.account.subcommands.list.accounts);
+    uiLogger.log(getTableContents(accountData, { border: { bodyLeft: '  ' } }));
 }
 function accountListBuilder(yargs) {
     yargs.example([['$0 accounts list']]);

package/commands/account/remove.js

@@ -1,25 +1,22 @@
 import fs from 'fs';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { loadConfig, getConfigPath, deleteAccount, getConfigDefaultAccount, getAccountId, updateDefaultAccount, getCWDAccountOverride, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { i18n } from '../../lib/lang.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { commands } from '../../lang/en.js';
 const command = 'remove [account]';
-const describe = i18n(`commands.account.subcommands.remove.describe`);
+const describe = commands.account.subcommands.remove.describe;
 async function handler(args) {
     const { account } = args;
     let accountToRemove = account;
     if (accountToRemove && !getAccountId(accountToRemove)) {
-        logger.error(i18n(`commands.account.subcommands.remove.errors.accountNotFound`, {
-            specifiedAccount: accountToRemove,
-            configPath: getConfigPath(),
-        }));
+        uiLogger.error(commands.account.subcommands.remove.errors.accountNotFound(accountToRemove, getConfigPath()));
     }
     if (!accountToRemove || !getAccountId(accountToRemove)) {
-        accountToRemove = await selectAccountFromConfig(i18n(`commands.account.subcommands.remove.prompts.selectAccountToRemove`));
+        accountToRemove = await selectAccountFromConfig(commands.account.subcommands.remove.prompts.selectAccountToRemove);
     }
     trackCommandUsage('accounts-remove', undefined, getAccountId(accountToRemove));
     const currentDefaultAccount = getConfigDefaultAccount();
@@ -31,10 +28,7 @@ async function handler(args) {
         const { deleteOverrideFile } = await promptUser({
             type: 'confirm',
             name: 'deleteOverrideFile',
-            message: i18n(`commands.account.subcommands.remove.prompts.deleteOverrideFile`, {
-                overrideFilePath,
-                accountName: accountToRemove,
-            }),
+            message: commands.account.subcommands.remove.prompts.deleteOverrideFile(overrideFilePath, accountToRemove),
         });
         try {
             if (deleteOverrideFile) {
@@ -46,9 +40,7 @@ async function handler(args) {
         }
     }
     await deleteAccount(accountToRemove);
-    logger.success(i18n(`commands.account.subcommands.remove.success.accountRemoved`, {
-        accountName: accountToRemove,
-    }));
+    uiLogger.success(commands.account.subcommands.remove.success.accountRemoved(accountToRemove));
     // Get updated version of the config
     loadConfig(getConfigPath());
     const accountToRemoveId = getAccountId(accountToRemove);
@@ -57,25 +49,25 @@ async function handler(args) {
         defaultAccountId = getAccountId(currentDefaultAccount);
     }
     if (accountToRemoveId === defaultAccountId) {
-        logger.log();
-        logger.log(i18n(`commands.account.subcommands.remove.logs.replaceDefaultAccount`));
+        uiLogger.log('');
+        uiLogger.log(commands.account.subcommands.remove.logs.replaceDefaultAccount);
         const newDefaultAccount = await selectAccountFromConfig();
         updateDefaultAccount(newDefaultAccount);
     }
 }
 function accountRemoveBuilder(yargs) {
     yargs.positional('account', {
-        describe: i18n(`commands.account.subcommands.remove.options.account.describe`),
+        describe: commands.account.subcommands.remove.options.account.describe,
         type: 'string',
     });
     yargs.example([
         [
             '$0 accounts remove',
-            i18n(`commands.account.subcommands.remove.examples.default`),
+            commands.account.subcommands.remove.examples.default,
         ],
         [
             '$0 accounts remove MyAccount',
-            i18n(`commands.account.subcommands.remove.examples.byName`),
+            commands.account.subcommands.remove.examples.byName,
         ],
     ]);
     return yargs;

package/commands/account/removeOverride.js

@@ -1,26 +1,21 @@
 import fs from 'fs-extra';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { getCWDAccountOverride, getDefaultAccountOverrideFilePath, getAccountId, } from '@hubspot/local-dev-lib/config';
 import { DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
 import { getGlobalConfig } from '@hubspot/local-dev-lib/config/migrate';
-import { i18n } from '../../lib/lang.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { trackCommandMetadataUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { uiCommandReference } from '../../lib/ui/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { commands } from '../../lang/en.js';
 const command = 'remove-override';
-const describe = i18n('commands.account.subcommands.removeOverride.describe', {
-    overrideFile: DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
-});
+const describe = commands.account.subcommands.removeOverride.describe(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
 async function handler(args) {
     const { force } = args;
     const globalConfig = getGlobalConfig();
     if (!globalConfig) {
-        logger.error(i18n('commands.account.subcommands.createOverride.errors.globalConfigNotFound', {
-            authCommand: uiCommandReference('hs account auth'),
-        }));
+        uiLogger.error(commands.account.subcommands.removeOverride.errors.globalConfigNotFound);
         process.exit(EXIT_CODES.ERROR);
     }
     const accountOverride = getCWDAccountOverride();
@@ -28,19 +23,14 @@ async function handler(args) {
     if (accountOverride && overrideFilePath) {
         const accountId = getAccountId(accountOverride) || undefined;
         if (!force) {
-            logger.log(i18n('commands.account.subcommands.removeOverride.accountOverride', {
-                accountOverride,
-                overrideFilePath,
-            }));
+            uiLogger.log(commands.account.subcommands.removeOverride.accountOverride(overrideFilePath, accountOverride.toString()));
             const { deleteOverrideFile } = await promptUser({
                 type: 'confirm',
                 name: 'deleteOverrideFile',
-                message: i18n('commands.account.subcommands.removeOverride.prompts.deleteOverrideFile', {
-                    accountOverride,
-                    overrideFilePath,
-                }),
+                message: commands.account.subcommands.removeOverride.prompts
+                    .deleteOverrideFile,
             });
-            logger.log('');
+            uiLogger.log('');
             if (!deleteOverrideFile) {
                 trackCommandMetadataUsage('account-removeOverride', {
                     command: 'hs account remove-override',
@@ -51,7 +41,7 @@ async function handler(args) {
         }
         try {
             fs.unlinkSync(overrideFilePath);
-            logger.success(i18n('commands.account.subcommands.removeOverride.success'));
+            uiLogger.success(commands.account.subcommands.removeOverride.success);
             trackCommandMetadataUsage('account-removeOverride', {
                 command: 'hs account remove-override',
                 step: 'Confirm removing override file (via prompt/force)',
@@ -65,13 +55,13 @@ async function handler(args) {
         }
     }
     else {
-        logger.log(i18n('commands.account.subcommands.removeOverride.noOverrideFile'));
+        uiLogger.log(commands.account.subcommands.removeOverride.noOverrideFile);
         process.exit(EXIT_CODES.SUCCESS);
     }
 }
 function accountRemoveOverrideBuilder(yargs) {
     yargs.options('force', {
-        describe: i18n('commands.account.subcommands.removeOverride.options.force.describe'),
+        describe: commands.account.subcommands.removeOverride.options.force.describe,
         type: 'boolean',
     });
     return yargs;

package/commands/account/rename.js

@@ -1,12 +1,12 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { renameAccount } from '@hubspot/local-dev-lib/config';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'rename <account-name> <new-name>';
-const describe = i18n(`commands.account.subcommands.rename.describe`);
+const describe = commands.account.subcommands.rename.describe;
 async function handler(args) {
     const { accountName, newName, derivedAccountId } = args;
     trackCommandUsage('accounts-rename', undefined, derivedAccountId);
@@ -17,19 +17,16 @@ async function handler(args) {
         logError(error);
         process.exit(EXIT_CODES.ERROR);
     }
-    logger.log(i18n(`commands.account.subcommands.rename.success.renamed`, {
-        name: accountName,
-        newName,
-    }));
+    uiLogger.log(commands.account.subcommands.rename.success.renamed(accountName, newName));
     process.exit(EXIT_CODES.SUCCESS);
 }
 function accountRenameBuilder(yargs) {
     yargs.positional('account-name', {
-        describe: i18n(`commands.account.subcommands.rename.positionals.accountName.describe`),
+        describe: commands.account.subcommands.rename.positionals.accountName.describe,
         type: 'string',
     });
     yargs.positional('new-name', {
-        describe: i18n(`commands.account.subcommands.rename.positionals.newName.describe`),
+        describe: commands.account.subcommands.rename.positionals.newName.describe,
         type: 'string',
     });
     yargs.example([

package/commands/account/use.js

@@ -1,59 +1,45 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { getConfigPath, updateDefaultAccount, getAccountId, getCWDAccountOverride, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
-import { uiCommandReference } from '../../lib/ui/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'use [account]';
-const describe = i18n('commands.account.subcommands.use.describe');
+const describe = commands.account.subcommands.use.describe;
 async function handler(args) {
     let newDefaultAccount = args.account;
     if (!newDefaultAccount) {
         newDefaultAccount = await selectAccountFromConfig();
     }
     else if (!getAccountId(newDefaultAccount)) {
-        logger.error(i18n('commands.account.subcommands.use.errors.accountNotFound', {
-            specifiedAccount: newDefaultAccount,
-            configPath: getConfigPath(),
-        }));
+        uiLogger.error(commands.account.subcommands.use.errors.accountNotFound(newDefaultAccount, getConfigPath()));
         newDefaultAccount = await selectAccountFromConfig();
     }
     trackCommandUsage('accounts-use', undefined, getAccountId(newDefaultAccount));
     const accountOverride = getCWDAccountOverride();
     const overrideFilePath = getDefaultAccountOverrideFilePath();
     if (accountOverride && overrideFilePath) {
-        logger.warn(i18n(`commands.account.subcommands.use.accountOverride`, {
-            accountOverride,
-        }));
-        logger.log(i18n(`commands.account.subcommands.use.accountOverrideCommands`, {
-            createOverrideCommand: uiCommandReference('hs account create-override'),
-            removeOverrideCommand: uiCommandReference('hs account remove-override'),
-        }));
-        logger.log('');
+        uiLogger.warn(commands.account.subcommands.use.accountOverride(accountOverride.toString()));
+        uiLogger.log(commands.account.subcommands.use.accountOverrideCommands);
+        uiLogger.log('');
     }
     updateDefaultAccount(newDefaultAccount);
-    return logger.success(i18n('commands.account.subcommands.use.success.defaultAccountUpdated', {
-        accountName: newDefaultAccount,
-    }));
+    return uiLogger.success(commands.account.subcommands.use.success.defaultAccountUpdated(newDefaultAccount));
 }
 function accountUseBuilder(yargs) {
     yargs.positional('account', {
-        describe: i18n('commands.account.subcommands.use.options.account.describe'),
+        describe: commands.account.subcommands.use.options.account.describe,
         type: 'string',
     });
     yargs.example([
-        [
-            '$0 accounts use',
-            i18n('commands.account.subcommands.use.examples.default'),
-        ],
+        ['$0 accounts use', commands.account.subcommands.use.examples.default],
         [
             '$0 accounts use MyAccount',
-            i18n('commands.account.subcommands.use.examples.nameBased'),
+            commands.account.subcommands.use.examples.nameBased,
         ],
         [
             '$0 accounts use 1234567',
-            i18n('commands.account.subcommands.use.examples.idBased'),
+            commands.account.subcommands.use.examples.idBased,
         ],
     ]);
     return yargs;

package/commands/account.js

@@ -1,4 +1,4 @@
-import { i18n } from '../lib/lang.js';
+import { commands } from '../lang/en.js';
 import auth from './account/auth.js';
 import list from './account/list.js';
 import rename from './account/rename.js';
@@ -10,7 +10,7 @@ import createOverride from './account/createOverride.js';
 import removeOverride from './account/removeOverride.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['account', 'accounts'];
-const describe = i18n('commands.account.describe');
+const describe = commands.account.describe;
 function accountBuilder(yargs) {
     yargs
         .command(auth)

package/commands/app/__tests__/migrate.test.js

@@ -1,13 +1,13 @@
 import yargs from 'yargs';
 import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../../../lib/ui/logger.js';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
 import { migrateApp2025_2 } from '../../../lib/app/migrate.js';
 import { migrateApp2023_2 } from '../../../lib/app/migrate_legacy.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import migrateCommand from '../migrate.js';
 vi.mock('@hubspot/local-dev-lib/config');
-vi.mock('@hubspot/local-dev-lib/logger');
+vi.mock('../../../lib/ui/logger.js');
 vi.mock('../../../lib/app/migrate');
 vi.mock('../../../lib/app/migrate_legacy');
 vi.mock('../../../lib/projects/config.js');
@@ -15,7 +15,7 @@ const mockYargs = yargs;
 const mockedGetAccountConfig = getAccountConfig;
 const mockedMigrateApp2023_2 = migrateApp2023_2;
 const mockedMigrateApp2025_2 = migrateApp2025_2;
-const mockedLogger = logger;
+const mockedUiLogger = uiLogger;
 const optionsSpy = vi.spyOn(mockYargs, 'options');
 const exampleSpy = vi.spyOn(mockYargs, 'example');
 const exitSpy = vi
@@ -40,7 +40,7 @@ describe('commands/app/migrate', () => {
             await migrateCommand.handler({
                 derivedAccountId: mockAccountId,
             });
-            expect(mockedLogger.error).toHaveBeenCalled();
+            expect(mockedUiLogger.error).toHaveBeenCalled();
             expect(exitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
         it('should call migrateApp2025_2 for platform version 2025.2', async () => {
@@ -80,7 +80,7 @@ describe('commands/app/migrate', () => {
                 derivedAccountId: mockAccountId,
                 platformVersion: PLATFORM_VERSIONS.v2023_2,
             });
-            expect(mockedLogger.error).toHaveBeenCalled();
+            expect(mockedUiLogger.error).toHaveBeenCalled();
             expect(exitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
     });

package/commands/app/migrate.js

@@ -1,35 +1,33 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { getAccountConfig } from '@hubspot/local-dev-lib/config';
 import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
 import { trackCommandMetadataUsage, trackCommandUsage, } from '../../lib/usageTracking.js';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { ApiErrorContext, logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { migrateApp2025_2 } from '../../lib/app/migrate.js';
-import { uiCommandReference, uiLink } from '../../lib/ui/index.js';
 import { migrateApp2023_2 } from '../../lib/app/migrate_legacy.js';
 import { getIsInProject } from '../../lib/projects/config.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const { v2023_2, v2025_2 } = PLATFORM_VERSIONS;
 const command = 'migrate';
-const describe = i18n(`commands.project.subcommands.migrateApp.describe`);
+const describe = commands.project.migrateApp.describe;
 export function handlerGenerator(commandTrackingName) {
     return async function handler(args) {
         const { derivedAccountId, platformVersion, unstable } = args;
         await trackCommandUsage(commandTrackingName, {}, derivedAccountId);
         const accountConfig = getAccountConfig(derivedAccountId);
         if (!accountConfig) {
-            logger.error(i18n(`commands.project.subcommands.migrateApp.errors.noAccountConfig`));
+            uiLogger.error(commands.project.migrateApp.errors.noAccountConfig);
             return process.exit(EXIT_CODES.ERROR);
         }
-        logger.log('');
-        logger.log(i18n(`commands.project.subcommands.migrateApp.header.text`));
-        logger.log(uiLink(i18n(`commands.project.subcommands.migrateApp.header.link`), 'https://developers.hubspot.com/docs/platform/migrate-a-public-app-to-projects'));
-        logger.log('');
+        uiLogger.log('');
+        uiLogger.log(commands.project.migrateApp.header);
+        uiLogger.log('');
         try {
             if (platformVersion === v2025_2 || unstable) {
                 if (getIsInProject()) {
-                    logger.error(i18n(`commands.project.subcommands.migrateApp.errors.notAllowedWithinProject`, { command: uiCommandReference('hs project migrate') }));
+                    uiLogger.error(commands.project.migrateApp.errors.notAllowedWithinProject);
                     return process.exit(EXIT_CODES.ERROR);
                 }
                 args.platformVersion = unstable
@@ -62,15 +60,15 @@ const handler = handlerGenerator('app-migrate');
 function appMigrateBuilder(yargs) {
     yargs.options({
         name: {
-            describe: i18n(`commands.project.subcommands.migrateApp.options.name.describe`),
+            describe: commands.project.migrateApp.options.name.describe,
             type: 'string',
         },
         dest: {
-            describe: i18n(`commands.project.subcommands.migrateApp.options.dest.describe`),
+            describe: commands.project.migrateApp.options.dest.describe,
             type: 'string',
         },
         'app-id': {
-            describe: i18n(`commands.project.subcommands.migrateApp.options.appId.describe`),
+            describe: commands.project.migrateApp.options.appId.describe,
             type: 'number',
         },
         'platform-version': {
@@ -85,14 +83,11 @@ function appMigrateBuilder(yargs) {
         },
     });
     yargs.example([
-        [
-            `$0 app migrate`,
-            i18n(`commands.project.subcommands.migrateApp.examples.default`),
-        ],
+        [`$0 app migrate`, commands.project.migrateApp.examples.default],
     ]);
     return yargs;
 }
-const builder = makeYargsBuilder(appMigrateBuilder, command, i18n(`commands.project.subcommands.migrateApp.describe`), {
+const builder = makeYargsBuilder(appMigrateBuilder, command, commands.project.migrateApp.describe, {
     useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,

package/commands/app.js

@@ -1,16 +1,11 @@
 import migrateCommand from './app/migrate.js';
 import appSecretCommand from './app/secret.js';
-import installAppCommand from './app/install.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { commands } from '../lang/en.js';
 const command = ['app', 'apps'];
 const describe = commands.app.describe;
 function appBuilder(yargs) {
-    yargs
-        .command(migrateCommand)
-        .command(appSecretCommand)
-        .command(installAppCommand)
-        .demandCommand(1, '');
+    yargs.command(migrateCommand).command(appSecretCommand).demandCommand(1, '');
     return yargs;
 }
 const builder = makeYargsBuilder(appBuilder, command, describe);

package/commands/auth.d.ts

@@ -1,6 +1,7 @@
 import { AccountArgs, CommonArgs, ConfigArgs, TestingArgs, YargsCommandModule } from '../types/Yargs.js';
 type AuthArgs = CommonArgs & ConfigArgs & TestingArgs & AccountArgs & {
     authType?: string;
+    disableTracking: boolean;
 } & {
     personalAccessKey?: string;
 };

package/commands/auth.js

@@ -9,7 +9,7 @@ import { promptUser } from '../lib/prompts/promptUtils.js';
 import { personalAccessKeyPrompt, OAUTH_FLOW, } from '../lib/prompts/personalAccessKeyPrompt.js';
 import { cliAccountNamePrompt } from '../lib/prompts/accountNamePrompt.js';
 import { setAsDefaultAccountPrompt } from '../lib/prompts/setAsDefaultAccountPrompt.js';
-import { setLogLevel } from '../lib/commonOpts.js';
+import { setCLILogLevel } from '../lib/commonOpts.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { trackAuthAction, trackCommandUsage } from '../lib/usageTracking.js';
 import { authenticateWithOauth } from '../lib/oauth.js';
@@ -32,7 +32,7 @@ const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = commaSeparatedValues(ALLOWED_AUT
 const command = 'auth';
 const describe = commands.auth.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, config: configFlagValue, qa, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, } = args;
+    const { authType: authTypeFlagValue, config: configFlagValue, qa, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, disableTracking, } = args;
     let parsedUserProvidedAccountId;
     try {
         if (userProvidedAccount) {
@@ -45,7 +45,7 @@ async function handler(args) {
     }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
-    setLogLevel(args);
+    setCLILogLevel(args);
     const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
     // Needed to load deprecated config
     loadConfig(configFlagValue);
@@ -57,8 +57,10 @@ async function handler(args) {
         uiLogger.error(commands.auth.errors.globalConfigFileExists('hs account auth'));
         process.exit(EXIT_CODES.ERROR);
     }
-    trackCommandUsage('auth');
-    trackAuthAction('auth', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
+    if (!disableTracking) {
+        trackCommandUsage('auth');
+        trackAuthAction('auth', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
+    }
     let configData;
     let updatedConfig;
     let validName;
@@ -110,7 +112,7 @@ async function handler(args) {
             uiLogger.error(commands.auth.errors.unsupportedAuthType(authType, SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT));
             break;
     }
-    if (!successAuthMethod) {
+    if (!successAuthMethod && !disableTracking) {
         await trackAuthAction('auth', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
         process.exit(EXIT_CODES.ERROR);
     }
@@ -119,12 +121,15 @@ async function handler(args) {
     await setAsDefaultAccountPrompt(accountName);
     uiLogger.success(commands.auth.success.configFileUpdated(accountName, DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, successAuthMethod));
     uiFeatureHighlight([
+        'getStartedCommand',
         'accountsUseCommand',
         'accountOption',
         'accountsListCommand',
     ]);
     const accountId = getAccountId(accountName) || undefined;
-    await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
+    if (!disableTracking) {
+        await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
+    }
     process.exit(EXIT_CODES.SUCCESS);
 }
 function authBuilder(yargs) {
@@ -149,6 +154,11 @@ function authBuilder(yargs) {
             hidden: false,
             alias: 'pak',
         },
+        'disable-tracking': {
+            type: 'boolean',
+            hidden: true,
+            default: false,
+        },
     });
     return yargs;
 }

package/commands/{__tests__/remove.test.js → cms/__tests__/delete.test.js}

@@ -1,24 +1,24 @@
 import yargs from 'yargs';
-import * as commonOpts from '../../lib/commonOpts.js';
-import removeCommand from '../remove.js';
-vi.mock('../../lib/commonOpts');
+import * as commonOpts from '../../../lib/commonOpts.js';
+import deleteCommand from '../delete.js';
+vi.mock('../../../lib/commonOpts');
 const positionalSpy = vi
     .spyOn(yargs, 'positional')
     .mockReturnValue(yargs);
-describe('commands/remove', () => {
+describe('commands/cms/delete', () => {
     describe('command', () => {
         it('should have the correct command structure', () => {
-            expect(removeCommand.command).toBe('remove <path>');
+            expect(deleteCommand.command).toBe('delete <path>');
         });
     });
     describe('describe', () => {
         it('should provide a description', () => {
-            expect(removeCommand.describe).toBeDefined();
+            expect(deleteCommand.describe).toBeDefined();
         });
     });
     describe('builder', () => {
         it('should support the correct options', () => {
-            removeCommand.builder(yargs);
+            deleteCommand.builder(yargs);
             expect(commonOpts.addGlobalOptions).toHaveBeenCalledTimes(1);
             expect(commonOpts.addGlobalOptions).toHaveBeenCalledWith(yargs);
             expect(commonOpts.addConfigOptions).toHaveBeenCalledTimes(1);
@@ -29,7 +29,7 @@ describe('commands/remove', () => {
             expect(commonOpts.addUseEnvironmentOptions).toHaveBeenCalledWith(yargs);
         });
         it('should add the path positional argument', () => {
-            removeCommand.builder(yargs);
+            deleteCommand.builder(yargs);
             expect(positionalSpy).toHaveBeenCalledWith('path', {
                 describe: expect.any(String),
                 type: 'string',

package/commands/{__tests__ → cms/__tests__}/fetch.test.js

@@ -1,6 +1,6 @@
 import yargs from 'yargs';
-import { addAccountOptions, addConfigOptions, addOverwriteOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, } from '../../lib/commonOpts.js';
-vi.mock('../../lib/commonOpts');
+import { addAccountOptions, addConfigOptions, addOverwriteOptions, addCmsPublishModeOptions, addUseEnvironmentOptions, } from '../../../lib/commonOpts.js';
+vi.mock('../../../lib/commonOpts');
 // Import this last so mocks apply
 import fetchCommand from '../fetch.js';
 const positionalSpy = vi
@@ -9,7 +9,7 @@ const positionalSpy = vi
 const optionsSpy = vi
     .spyOn(yargs, 'options')
     .mockReturnValue(yargs);
-describe('commands/fetch', () => {
+describe('commands/cms/fetch', () => {
     describe('command', () => {
         it('should have the correct command structure', () => {
             expect(fetchCommand.command).toEqual('fetch <src> [dest]');