@hubspot/cli 7.10.0 → 7.11.0-experimental.0

package/bin/cli.js

@@ -4,7 +4,7 @@ import { logError } from '../lib/errorHandlers/index.js';
 import { setCLILogLevel, getCommandName } from '../lib/commonOpts.js';
 import { trackHelpUsage, trackConvertFieldsUsage, } from '../lib/usageTracking.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
-import { loadAndValidateConfigMiddleware, injectAccountIdMiddleware, validateAccountOptions, handleDeprecatedEnvVariables, } from '../lib/middleware/configMiddleware.js';
+import { validateConfigMiddleware, injectAccountIdMiddleware, validateAccountOptions, handleDeprecatedEnvVariables, handleCustomConfigLocationMiddleware, } from '../lib/middleware/configMiddleware.js';
 import { autoUpdateCLI } from '../lib/middleware/autoUpdateMiddleware.js';
 import { checkAndWarnGitInclusionMiddleware } from '../lib/middleware/gitMiddleware.js';
 import { performChecks } from '../lib/middleware/yargsChecksMiddleware.js';
@@ -55,7 +55,8 @@ function handleFailure(msg, err, yargs) {
     else if (err) {
         logError(err);
     }
-    if (msg === null) {
+    if (msg === null && !err) {
+        // Required so running `hs` without a command shows the help
         yargs.showHelp('log');
         process.exit(EXIT_CODES.SUCCESS);
     }
@@ -65,13 +66,13 @@ function handleFailure(msg, err, yargs) {
 }
 const argv = yargs(process.argv.slice(2))
     .usage('The command line interface to interact with HubSpot.')
-    // loadConfigMiddleware loads the new hidden config for all commands
     .middleware([
     setCLILogLevel,
     setRequestHeaders,
     handleDeprecatedEnvVariables,
-    loadAndValidateConfigMiddleware,
+    handleCustomConfigLocationMiddleware,
     injectAccountIdMiddleware,
+    validateConfigMiddleware,
     autoUpdateCLI,
     checkAndWarnGitInclusionMiddleware,
     validateAccountOptions,

package/commands/__tests__/getStarted.test.js

@@ -1,6 +1,7 @@
 import getStartedCommand from '../getStarted.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { projectNameAndDestPrompt } from '../../lib/prompts/projectNameAndDestPrompt.js';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
 import { getProjectConfig, writeProjectConfig, } from '../../lib/projects/config.js';
@@ -16,6 +17,7 @@ vi.mock('../../lib/ui/logger');
 vi.mock('../../lib/errorHandlers');
 vi.mock('@hubspot/local-dev-lib/github');
 vi.mock('../../lib/dependencyManagement');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('open');
 vi.mock('fs-extra', () => ({
     default: {
@@ -27,6 +29,14 @@ vi.mock('fs-extra', () => ({
 describe('commands/get-started', () => {
     beforeEach(() => {
         vi.clearAllMocks();
+        // @TODO Revisit config mocking in tests
+        getConfigAccountById.mockReturnValue({
+            accountId: 12345,
+            name: 'Test Account',
+            authType: 'personalaccesskey',
+            personalAccessKey: 'test-key',
+            env: 'prod',
+        });
     });
     describe('command', () => {
         it('should have the correct command structure', () => {

package/commands/__tests__/project.test.js

@@ -13,6 +13,7 @@ import migrateApp from '../project/migrateApp.js';
 import migrate from '../project/migrate.js';
 import cloneApp from '../project/cloneApp.js';
 import installDeps from '../project/installDeps.js';
+import lint from '../project/lint.js';
 import updateDeps from '../project/updateDeps.js';
 import validate from '../project/validate.js';
 import profileCommands from '../project/profile.js';
@@ -38,6 +39,7 @@ vi.mock('../project/migrate', () => ({
     default: {},
 }));
 vi.mock('../project/installDeps');
+vi.mock('../project/lint');
 vi.mock('../project/profile');
 vi.mock('../../lib/commonOpts');
 const commandSpy = vi
@@ -73,6 +75,7 @@ describe('commands/project', () => {
             migrate,
             cloneApp,
             installDeps,
+            lint,
             updateDeps,
             profileCommands,
             validate,

package/commands/account/__tests__/rename.test.js

@@ -4,17 +4,20 @@ import accountRenameCommand from '../rename.js';
 import * as config from '@hubspot/local-dev-lib/config';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import * as usageTracking from '../../../lib/usageTracking.js';
 vi.mock('../../../lib/commonOpts');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/errorHandlers/index.js');
+vi.mock('../../../lib/usageTracking.js');
 const positionalSpy = vi
     .spyOn(yargs, 'positional')
     .mockReturnValue(yargs);
 const exampleSpy = vi
     .spyOn(yargs, 'example')
     .mockReturnValue(yargs);
-const renameAccountSpy = vi.spyOn(config, 'renameAccount');
+const renameAccountSpy = vi.spyOn(config, 'renameConfigAccount');
 const processExitSpy = vi.spyOn(process, 'exit');
+const trackCommandUsageSpy = vi.spyOn(usageTracking, 'trackCommandUsage');
 describe('commands/account/rename', () => {
     const yargsMock = yargs;
     describe('command', () => {
@@ -31,7 +34,7 @@ describe('commands/account/rename', () => {
         let args;
         beforeEach(() => {
             vi.clearAllMocks();
-            renameAccountSpy.mockResolvedValue(undefined);
+            renameAccountSpy.mockReturnValue(undefined);
             processExitSpy.mockImplementation(() => {
                 throw new Error('process.exit called');
             });
@@ -42,13 +45,17 @@ describe('commands/account/rename', () => {
         });
         it('should rename the account', async () => {
             await expect(accountRenameCommand.handler(args)).rejects.toThrow('process.exit called');
+            expect(trackCommandUsageSpy).toHaveBeenCalledWith('accounts-rename', undefined, undefined);
             expect(renameAccountSpy).toHaveBeenCalledWith('myExistingAccountName', 'my-new-account-name');
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.SUCCESS);
         });
         it('should handle errors when renameAccount throws', async () => {
             const error = new Error('Failed to rename account');
-            renameAccountSpy.mockRejectedValue(error);
+            renameAccountSpy.mockImplementation(() => {
+                throw error;
+            });
             await expect(accountRenameCommand.handler(args)).rejects.toThrow('process.exit called');
+            expect(trackCommandUsageSpy).toHaveBeenCalledWith('accounts-rename', undefined, undefined);
             expect(renameAccountSpy).toHaveBeenCalledWith('myExistingAccountName', 'my-new-account-name');
             expect(logError).toHaveBeenCalledTimes(1);
             expect(logError).toHaveBeenCalledWith(error);

package/commands/account/auth.js

@@ -1,6 +1,4 @@
-import { loadConfig, updateAccountConfig, writeConfig, createEmptyConfigFile, deleteEmptyConfigFile, } from '@hubspot/local-dev-lib/config';
-import { configFileExists, getConfigPath, } from '@hubspot/local-dev-lib/config/migrate';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { updateConfigAccount, createEmptyConfigFile, deleteConfigFileIfEmpty, getConfigFilePath, localConfigFileExists, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
 import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { toKebabCase } from '@hubspot/local-dev-lib/text';
@@ -46,10 +44,9 @@ async function updateConfigWithNewAccount(env, configAlreadyExists, providedPers
         // Can happen if the user is re-authenticating an account with no name
         if (configAlreadyExists && !updatedConfig.name) {
             updatedConfig.name = (await cliAccountNamePrompt(defaultAccountName)).name;
-            updateAccountConfig({
+            updateConfigAccount({
                 ...updatedConfig,
             });
-            writeConfig();
         }
         return updatedConfig;
     }
@@ -59,8 +56,8 @@ async function updateConfigWithNewAccount(env, configAlreadyExists, providedPers
     }
 }
 async function handleConfigMigration() {
-    const deprecatedConfigExists = configFileExists(false);
-    const globalConfigExists = configFileExists(true);
+    const deprecatedConfigExists = localConfigFileExists();
+    const globalConfigExists = globalConfigFileExists();
     // No deprecated config exists, so no migration is needed
     if (!deprecatedConfigExists) {
         return true;
@@ -117,12 +114,11 @@ async function handler(args) {
         await trackAuthAction('account-auth', authType, TRACKING_STATUS.ERROR);
         process.exit(EXIT_CODES.ERROR);
     }
-    const configAlreadyExists = configFileExists(true);
+    const configAlreadyExists = globalConfigFileExists();
     if (!configAlreadyExists) {
-        createEmptyConfigFile({}, true);
+        createEmptyConfigFile(true);
     }
-    loadConfig('');
-    handleExit(deleteEmptyConfigFile);
+    handleExit(deleteConfigFileIfEmpty);
     const updatedConfig = await updateConfigWithNewAccount(args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, parsedUserProvidedAccountId);
     if (!updatedConfig) {
         if (!disableTracking) {
@@ -131,14 +127,14 @@ async function handler(args) {
         uiLogger.error(commands.account.subcommands.auth.errors.failedToUpdateConfig);
         process.exit(EXIT_CODES.ERROR);
     }
-    const accountId = getAccountIdentifier(updatedConfig);
+    const { accountId, name } = updatedConfig;
     if (!configAlreadyExists) {
         uiLogger.log('');
-        uiLogger.success(commands.account.subcommands.auth.success.configFileCreated(getConfigPath('', true)));
+        uiLogger.success(commands.account.subcommands.auth.success.configFileCreated(getConfigFilePath()));
         uiLogger.success(commands.account.subcommands.auth.success.configFileUpdated(accountId));
     }
     else {
-        await setAsDefaultAccountPrompt(updatedConfig.name);
+        await setAsDefaultAccountPrompt(name);
     }
     uiFeatureHighlight([
         'getStartedCommand',

package/commands/account/clean.js

@@ -1,9 +1,8 @@
 import fs from 'fs';
 import { accessTokenForPersonalAccessKey } from '@hubspot/local-dev-lib/personalAccessKey';
-import { loadConfig, getConfigPath, deleteAccount, getConfigAccounts, getConfigDefaultAccount, updateDefaultAccount, } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { removeAccountFromConfig, getAllConfigAccounts, getConfigDefaultAccountIfExists, setConfigAccountAsDefault, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { getCWDAccountOverride, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
@@ -20,7 +19,7 @@ const describe = commands.account.subcommands.clean.describe;
 async function handler(args) {
     const { qa } = args;
     trackCommandUsage('accounts-clean');
-    const accountsList = getConfigAccounts() || [];
+    const accountsList = getAllConfigAccounts();
     const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
     if (filteredTestAccounts && filteredTestAccounts.length === 0) {
         uiLogger.log(commands.account.subcommands.clean.noResults);
@@ -35,8 +34,7 @@ async function handler(args) {
     });
     for (const account of filteredTestAccounts) {
         try {
-            const accountId = getAccountIdentifier(account);
-            await accessTokenForPersonalAccessKey(accountId, true);
+            await accessTokenForPersonalAccessKey(account.accountId, true);
         }
         catch (error) {
             if (isSpecifiedError(error, {
@@ -60,17 +58,13 @@ async function handler(args) {
                 ? commands.account.subcommands.clean.inactiveAccountsFound.one
                 : commands.account.subcommands.clean.inactiveAccountsFound.other(accountsToRemove.length),
         });
-        uiLogger.log(getTableContents(accountsToRemove.map(p => [
-            uiAccountDescription(getAccountIdentifier(p)),
-        ]), { border: { bodyLeft: '  ' } }));
+        uiLogger.log(getTableContents(accountsToRemove.map(p => [uiAccountDescription(p.accountId)]), { border: { bodyLeft: '  ' } }));
         let promptMessage = oneAccountFound
             ? commands.account.subcommands.clean.confirm.one
             : commands.account.subcommands.clean.confirm.other(accountsToRemove.length);
-        const accountOverride = getCWDAccountOverride();
+        const accountOverride = getDefaultAccountOverrideAccountId();
         const overrideFilePath = getDefaultAccountOverrideFilePath();
-        const accountOverrideMatches = accountsToRemove.some(account => account.name === accountOverride ||
-            // @ts-expect-error: Default account override files can only exist with global config
-            account.accountId === accountOverride);
+        const accountOverrideMatches = accountsToRemove.some(account => account.accountId === accountOverride);
         if (overrideFilePath && accountOverride && accountOverrideMatches) {
             promptMessage = `${promptMessage}${commands.account.subcommands.clean.defaultAccountOverride(overrideFilePath)}`;
         }
@@ -92,17 +86,15 @@ async function handler(args) {
                 logError(error);
             }
             for (const accountToRemove of accountsToRemove) {
-                await deleteAccount(accountToRemove.name);
+                removeAccountFromConfig(accountToRemove.accountId);
                 uiLogger.log(commands.account.subcommands.clean.removeSuccess(accountToRemove.name));
             }
-            // Get updated version of the config
-            loadConfig(getConfigPath());
-            const defaultAccount = getConfigDefaultAccount();
+            const defaultAccount = getConfigDefaultAccountIfExists();
             if (defaultAccount &&
-                accountsToRemove.some(p => p.name === defaultAccount)) {
+                accountsToRemove.some(p => p.name === defaultAccount.name)) {
                 uiLogger.log(commands.account.subcommands.clean.replaceDefaultAccount);
                 const newDefaultAccount = await selectAccountFromConfig();
-                updateDefaultAccount(newDefaultAccount);
+                setConfigAccountAsDefault(newDefaultAccount);
             }
         }
     }

package/commands/account/createOverride.js

@@ -2,8 +2,8 @@ import fs from 'fs-extra';
 import path from 'path';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
-import { getCWDAccountOverride, getDefaultAccountOverrideFilePath, getConfigPath, getAccountId, } from '@hubspot/local-dev-lib/config';
-import { getGlobalConfig } from '@hubspot/local-dev-lib/config/migrate';
+import { getConfigFilePath, getConfigAccountIfExists, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
@@ -16,15 +16,15 @@ const command = 'create-override [account]';
 const describe = commands.account.subcommands.createOverride.describe(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
 async function handler(args) {
     let overrideDefaultAccount = args.account;
-    const globalConfig = getGlobalConfig();
-    if (!globalConfig) {
+    const globalConfigExists = globalConfigFileExists();
+    if (!globalConfigExists) {
         uiLogger.error(commands.account.subcommands.createOverride.errors.globalConfigNotFound);
         process.exit(EXIT_CODES.ERROR);
     }
-    const accountOverride = getCWDAccountOverride();
+    const accountOverrideId = getDefaultAccountOverrideAccountId();
     const overrideFilePath = getDefaultAccountOverrideFilePath();
-    if (accountOverride && overrideFilePath) {
-        uiLogger.log(commands.account.subcommands.createOverride.accountOverride(overrideFilePath, accountOverride.toString()));
+    if (accountOverrideId && overrideFilePath) {
+        uiLogger.log(commands.account.subcommands.createOverride.accountOverride(overrideFilePath, accountOverrideId.toString()));
         const { replaceOverrideFile } = await promptUser({
             type: 'confirm',
             name: 'replaceOverrideFile',
@@ -38,11 +38,15 @@ async function handler(args) {
     if (!overrideDefaultAccount) {
         overrideDefaultAccount = await selectAccountFromConfig();
     }
-    else if (!getAccountId(overrideDefaultAccount)) {
-        uiLogger.error(commands.account.subcommands.createOverride.errors.accountNotFound(getConfigPath() || ''));
-        overrideDefaultAccount = await selectAccountFromConfig();
+    else {
+        const account = getConfigAccountIfExists(overrideDefaultAccount);
+        if (!account) {
+            uiLogger.error(commands.account.subcommands.createOverride.errors.accountNotFound(getConfigFilePath() || ''));
+            overrideDefaultAccount = await selectAccountFromConfig();
+        }
     }
-    const accountId = getAccountId(overrideDefaultAccount);
+    const account = getConfigAccountIfExists(overrideDefaultAccount);
+    const accountId = account?.accountId;
     trackCommandUsage('account-createOverride', undefined, accountId);
     try {
         const overrideFilePath = path.join(getCwd(), DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);

package/commands/account/info.js

@@ -1,4 +1,5 @@
-import { getAccountConfig, getDisplayDefaultAccount, getConfigDefaultAccount, getDefaultAccountOverrideFilePath, getConfigPath, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById, getConfigDefaultAccount, getConfigFilePath, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideFilePath } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { indent } from '../../lib/ui/index.js';
@@ -9,7 +10,7 @@ const describe = commands.account.subcommands.info.describe;
 const command = 'info [account]';
 async function handler(args) {
     const { derivedAccountId } = args;
-    const config = getAccountConfig(derivedAccountId);
+    const config = getConfigAccountById(derivedAccountId);
     // check if the provided account is using a personal access key, if not, show an error
     if (config && config.authType === 'personalaccesskey') {
         const { name, personalAccessKey, env } = config;
@@ -17,11 +18,12 @@ async function handler(args) {
         const response = await getAccessToken(personalAccessKey, env, derivedAccountId);
         scopeGroups = response.scopeGroups.map(s => [s]);
         // If a default account is present in the config, display it
-        const configPath = getConfigPath();
+        const configPath = getConfigFilePath();
         if (configPath) {
             uiLogger.log(commands.account.subcommands.info.defaultAccountTitle);
             uiLogger.log(`${indent(1)}${commands.account.subcommands.info.configPath(configPath)}`);
-            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.defaultAccount(getDisplayDefaultAccount().toString())}`);
+            const defaultAccount = getConfigDefaultAccount();
+            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.defaultAccount(defaultAccount.name)}`);
         }
         // If a default account override is present, display it
         const overrideFilePath = getDefaultAccountOverrideFilePath();
@@ -29,7 +31,8 @@ async function handler(args) {
             uiLogger.log('');
             uiLogger.log(commands.account.subcommands.info.overrideFilePathTitle);
             uiLogger.log(`${indent(1)}${commands.account.subcommands.info.overrideFilePath(overrideFilePath)}`);
-            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.overrideAccount(getConfigDefaultAccount().toString())}`);
+            const defaultAccount = getConfigDefaultAccount();
+            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.overrideAccount(defaultAccount.name)}`);
         }
         uiLogger.log('');
         uiLogger.log(commands.account.subcommands.info.name(name));

package/commands/account/list.js

@@ -1,5 +1,5 @@
-import { getConfigPath, getConfigAccounts, getDefaultAccountOverrideFilePath, getDisplayDefaultAccount, getConfigDefaultAccount, } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getConfigFilePath, getAllConfigAccounts, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideFilePath } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { indent } from '../../lib/ui/index.js';
 import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
@@ -18,10 +18,7 @@ function sortAndMapAccounts(accounts) {
         (p.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD ||
             p.accountType === HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER))
         .forEach(account => {
-        const accountId = getAccountIdentifier(account);
-        if (accountId) {
-            mappedAccountData[accountId] = [account];
-        }
+        mappedAccountData[account.accountId] = [account];
     });
     // Non-standard accounts (sandbox, developer test account)
     accounts
@@ -34,10 +31,7 @@ function sortAndMapAccounts(accounts) {
             ];
         }
         else {
-            const accountId = getAccountIdentifier(p);
-            if (accountId) {
-                mappedAccountData[accountId] = [p];
-            }
+            mappedAccountData[p.accountId] = [p];
         }
     });
     return mappedAccountData;
@@ -46,7 +40,7 @@ function getAccountData(mappedAccountData) {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const accountData = [];
     Object.entries(mappedAccountData).forEach(([key, set]) => {
-        const hasParentAccount = set.filter(p => getAccountIdentifier(p) === parseInt(key, 10))[0];
+        const hasParentAccount = set.filter(p => p.accountId === parseInt(key, 10))[0];
         set.forEach(account => {
             let name = `${account.name} [${HUBSPOT_ACCOUNT_TYPE_STRINGS[account.accountType]}]`;
             if (isSandbox(account)) {
@@ -59,7 +53,7 @@ function getAccountData(mappedAccountData) {
                     name = `↳ ${name}`;
                 }
             }
-            accountData.push([name, getAccountIdentifier(account), account.authType]);
+            accountData.push([name, account.accountId, account.authType]);
         });
     });
     return accountData;
@@ -67,8 +61,8 @@ function getAccountData(mappedAccountData) {
 async function handler(args) {
     const { derivedAccountId } = args;
     trackCommandUsage('accounts-list', undefined, derivedAccountId);
-    const configPath = getConfigPath();
-    const accountsList = getConfigAccounts() || [];
+    const configPath = getConfigFilePath();
+    const accountsList = getAllConfigAccounts();
     const mappedAccountData = sortAndMapAccounts(accountsList);
     const accountData = getAccountData(mappedAccountData);
     accountData.unshift(getTableHeader([
@@ -76,19 +70,21 @@ async function handler(args) {
         commands.account.subcommands.list.labels.accountId,
         commands.account.subcommands.list.labels.authType,
     ]));
+    const defaultAccount = getConfigDefaultAccountIfExists();
+    const accountId = defaultAccount?.accountId;
+    const overrideFilePath = getDefaultAccountOverrideFilePath();
     // If a default account is present in the config, display it
-    if (configPath) {
+    if (configPath && accountId) {
         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(`${indent(1)}${commands.account.subcommands.list.currentResolvedDefaultAccount(accountId)}`);
         uiLogger.log('');
     }
     // If a default account override is present, display it
-    const overrideFilePath = getDefaultAccountOverrideFilePath();
-    if (overrideFilePath) {
+    if (overrideFilePath && accountId) {
         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(`${indent(1)}${commands.account.subcommands.list.currentResolvedDefaultAccount(accountId)}`);
         uiLogger.log('');
     }
     uiLogger.log(commands.account.subcommands.list.accounts);

package/commands/account/remove.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
-import { loadConfig, getConfigPath, deleteAccount, getConfigDefaultAccount, getAccountId, updateDefaultAccount, getCWDAccountOverride, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config';
+import { getConfigFilePath, removeAccountFromConfig, getConfigDefaultAccountIfExists, getConfigAccountIfExists, getConfigAccountById, setConfigAccountAsDefault, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -10,25 +11,29 @@ import { commands } from '../../lang/en.js';
 const command = 'remove [account]';
 const describe = commands.account.subcommands.remove.describe;
 async function handler(args) {
-    const { account } = args;
-    let accountToRemove = account;
-    if (accountToRemove && !getAccountId(accountToRemove)) {
-        uiLogger.error(commands.account.subcommands.remove.errors.accountNotFound(accountToRemove, getConfigPath()));
+    const { account: accountFlag } = args;
+    let accountToRemoveConfig = accountFlag
+        ? getConfigAccountIfExists(accountFlag)
+        : undefined;
+    let accountToRemoveId = accountToRemoveConfig?.accountId;
+    if (accountFlag && !accountToRemoveConfig) {
+        uiLogger.error(commands.account.subcommands.remove.errors.accountNotFound(accountFlag, getConfigFilePath()));
     }
-    if (!accountToRemove || !getAccountId(accountToRemove)) {
-        accountToRemove = await selectAccountFromConfig(commands.account.subcommands.remove.prompts.selectAccountToRemove);
+    if (!accountToRemoveId) {
+        accountToRemoveId = await selectAccountFromConfig(commands.account.subcommands.remove.prompts.selectAccountToRemove);
     }
-    trackCommandUsage('accounts-remove', undefined, getAccountId(accountToRemove));
-    const currentDefaultAccount = getConfigDefaultAccount();
-    const accountOverride = getCWDAccountOverride();
+    accountToRemoveConfig = getConfigAccountById(accountToRemoveId);
+    trackCommandUsage('accounts-remove', undefined, accountToRemoveId);
+    const currentDefaultAccount = getConfigDefaultAccountIfExists();
+    const accountOverride = getDefaultAccountOverrideAccountId();
     const overrideFilePath = getDefaultAccountOverrideFilePath();
     if (overrideFilePath &&
         accountOverride &&
-        accountOverride === accountToRemove) {
+        accountOverride === accountToRemoveConfig?.accountId) {
         const { deleteOverrideFile } = await promptUser({
             type: 'confirm',
             name: 'deleteOverrideFile',
-            message: commands.account.subcommands.remove.prompts.deleteOverrideFile(overrideFilePath, accountToRemove),
+            message: commands.account.subcommands.remove.prompts.deleteOverrideFile(overrideFilePath, accountToRemoveConfig.name),
         });
         try {
             if (deleteOverrideFile) {
@@ -39,20 +44,16 @@ async function handler(args) {
             logError(error);
         }
     }
-    await deleteAccount(accountToRemove);
-    uiLogger.success(commands.account.subcommands.remove.success.accountRemoved(accountToRemove));
-    // Get updated version of the config
-    loadConfig(getConfigPath());
-    const accountToRemoveId = getAccountId(accountToRemove);
-    let defaultAccountId;
-    if (currentDefaultAccount) {
-        defaultAccountId = getAccountId(currentDefaultAccount);
+    if (accountToRemoveConfig) {
+        removeAccountFromConfig(accountToRemoveConfig.accountId);
     }
-    if (accountToRemoveId === defaultAccountId) {
+    uiLogger.success(commands.account.subcommands.remove.success.accountRemoved(accountToRemoveConfig.name));
+    if (currentDefaultAccount &&
+        accountToRemoveConfig?.accountId === currentDefaultAccount.accountId) {
         uiLogger.log('');
         uiLogger.log(commands.account.subcommands.remove.logs.replaceDefaultAccount);
         const newDefaultAccount = await selectAccountFromConfig();
-        updateDefaultAccount(newDefaultAccount);
+        setConfigAccountAsDefault(newDefaultAccount);
     }
 }
 function accountRemoveBuilder(yargs) {

package/commands/account/removeOverride.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
-import { getCWDAccountOverride, getDefaultAccountOverrideFilePath, getAccountId, } from '@hubspot/local-dev-lib/config';
+import { globalConfigFileExists } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
-import { getGlobalConfig } from '@hubspot/local-dev-lib/config/migrate';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
@@ -13,15 +13,15 @@ const command = 'remove-override';
 const describe = commands.account.subcommands.removeOverride.describe(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
 async function handler(args) {
     const { force } = args;
-    const globalConfig = getGlobalConfig();
-    if (!globalConfig) {
+    const globalConfigExists = globalConfigFileExists();
+    if (!globalConfigExists) {
         uiLogger.error(commands.account.subcommands.removeOverride.errors.globalConfigNotFound);
         process.exit(EXIT_CODES.ERROR);
     }
-    const accountOverride = getCWDAccountOverride();
+    const accountOverride = getDefaultAccountOverrideAccountId();
     const overrideFilePath = getDefaultAccountOverrideFilePath();
     if (accountOverride && overrideFilePath) {
-        const accountId = getAccountId(accountOverride) || undefined;
+        const accountId = accountOverride;
         trackCommandUsage('account-removeOverride', undefined, accountId);
         if (!force) {
             uiLogger.log(commands.account.subcommands.removeOverride.accountOverride(overrideFilePath, accountOverride.toString()));

package/commands/account/rename.js

@@ -1,4 +1,4 @@
-import { renameAccount } from '@hubspot/local-dev-lib/config';
+import { renameConfigAccount } from '@hubspot/local-dev-lib/config';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -14,7 +14,7 @@ async function handler(args) {
     const newNameKebabCase = toKebabCase(newName);
     const nameWasSanitized = newNameKebabCase !== newName;
     try {
-        await renameAccount(accountName, newNameKebabCase);
+        renameConfigAccount(accountName, newNameKebabCase);
     }
     catch (error) {
         logError(error);

package/commands/account/use.js

@@ -1,4 +1,5 @@
-import { getConfigPath, updateDefaultAccount, getAccountId, getCWDAccountOverride, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config';
+import { getConfigFilePath, setConfigAccountAsDefault, getConfigAccountIfExists, getConfigAccountByName, getConfigAccountById, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -11,20 +12,30 @@ async function handler(args) {
     if (!newDefaultAccount) {
         newDefaultAccount = await selectAccountFromConfig();
     }
-    else if (!getAccountId(newDefaultAccount)) {
-        uiLogger.error(commands.account.subcommands.use.errors.accountNotFound(newDefaultAccount, getConfigPath()));
-        newDefaultAccount = await selectAccountFromConfig();
+    else {
+        const account = getConfigAccountIfExists(newDefaultAccount);
+        if (!account) {
+            uiLogger.error(commands.account.subcommands.use.errors.accountNotFound(newDefaultAccount, getConfigFilePath()));
+            newDefaultAccount = await selectAccountFromConfig();
+        }
+    }
+    let account;
+    if (!isNaN(Number(newDefaultAccount))) {
+        account = getConfigAccountById(Number(newDefaultAccount));
+    }
+    else {
+        account = getConfigAccountByName(String(newDefaultAccount));
     }
-    trackCommandUsage('accounts-use', undefined, getAccountId(newDefaultAccount));
-    const accountOverride = getCWDAccountOverride();
+    trackCommandUsage('accounts-use', undefined, account?.accountId);
+    const accountOverride = getDefaultAccountOverrideAccountId();
     const overrideFilePath = getDefaultAccountOverrideFilePath();
     if (accountOverride && overrideFilePath) {
         uiLogger.warn(commands.account.subcommands.use.accountOverride(accountOverride.toString()));
         uiLogger.log(commands.account.subcommands.use.accountOverrideCommands);
         uiLogger.log('');
     }
-    updateDefaultAccount(newDefaultAccount);
-    return uiLogger.success(commands.account.subcommands.use.success.defaultAccountUpdated(newDefaultAccount));
+    setConfigAccountAsDefault(newDefaultAccount);
+    return uiLogger.success(commands.account.subcommands.use.success.defaultAccountUpdated(account.name));
 }
 function accountUseBuilder(yargs) {
     yargs.positional('account', {