@hubspot/cli 7.9.0-experimental.0 → 7.9.1-experimental.0

package/lang/en.js

@@ -7,15 +7,15 @@ import { uiAccountDescription, uiBetaTag, uiCommandReference, uiLink, UI_COLORS,
 import { getProjectDetailUrl, getProjectSettingsUrl, getLocalDevUiUrl, } from '../lib/projects/urls.js';
 import { getProductUpdatesUrl } from '../lib/links.js';
 import { APP_DISTRIBUTION_TYPES, APP_AUTH_TYPES, PROJECT_CONFIG_FILE, PROJECT_WITH_APP, LEGACY_PUBLIC_APP_FILE, } from '../lib/constants.js';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 export const commands = {
     generalErrors: {
         srcIsProject: (src, command) => `"${src}" is in a project folder. Did you mean "hs project ${command}"?`,
         handleDeprecatedEnvVariables: {
             portalEnvVarDeprecated: 'The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead.',
         },
-        loadConfigMiddleware: {
-            configFileExists: (configPath) => `A configuration file already exists at ${configPath}. To specify a new configuration file, delete the existing one and try again.`,
+        validateConfigMiddleware: {
+            missingConfigFile: `A HubSpot config file is required to run this command, but none was found. To create a new config file and authenticate a HubSpot account, run ${uiCommandReference('hs account auth')}`,
+            configValidationFailed: (errors) => `Your HubSpot config file is invalid. Please fix the following errors:\n - ${errors.join('\n- ')}`,
         },
     },
     getStarted: {
@@ -118,7 +118,7 @@ export const commands = {
                     },
                 },
                 success: {
-                    renamed: (name, newName) => `Account "${name}" renamed to "${newName}"`,
+                    renamed: (name, newName, nameWasSanitized) => `Account "${chalk.bold(name)}" successfully renamed to "${chalk.bold(newName)}"${nameWasSanitized ? ' (Sanitized to remove invalid characters)' : ''}.`,
                 },
             },
             use: {
@@ -1196,6 +1196,7 @@ export const commands = {
         setup: {
             describe: 'Setup the HubSpot development MCP servers.',
             installingDocSearch: 'Adding the docs-search mcp server',
+            codex: 'Codex CLI',
             claudeCode: 'Claude Code',
             cursor: 'Cursor',
             windsurf: 'Windsurf',
@@ -1217,7 +1218,11 @@ export const commands = {
                 configuredClaudeCode: 'Configured Claude Code',
                 claudeCodeNotFound: 'Claude Code not found - skipping configuration',
                 claudeCodeInstallFailed: 'Claude Code CLI not working - skipping configuration',
-                failedToConfigureClaudeDesktop: 'Failed to configure Claude Desktop',
+                // Codex
+                configuringCodex: 'Configuring Codex...',
+                configuredCodex: 'Configured Codex',
+                codexNotFound: 'Codex command not found - skipping configuration',
+                codexInstallFailed: 'Failed to configure Codex',
                 // Cursor
                 configuringCursor: 'Configuring Cursor...',
                 failedToConfigureCursor: 'Failed to configure Cursor',
@@ -2113,9 +2118,21 @@ export const commands = {
                 createFailure: 'Failed to create test account.',
             },
             options: {
-                configPath: 'The path to the test account config',
+                configPath: 'Path to config file (mutually exclusive with other flags)',
+                accountName: 'Name for the test account',
+                description: 'Description for the test account',
+                marketingLevel: 'Marketing Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                opsLevel: 'Operations Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                serviceLevel: 'Service Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                salesLevel: 'Sales Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                contentLevel: 'CMS Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
             },
             example: (configPath) => `Create a test account from the config file at ${configPath}`,
+            examples: {
+                withAllHubsEnterprise: 'Create a test account with all hubs at ENTERPRISE level',
+                withSpecificHubLevels: 'Create a test account with specific hub levels',
+            },
+            savedAccountNameDiffers: (originalName, savedName) => `Account name "${chalk.bold(originalName)}" was saved as "${chalk.bold(savedName)}" in config.`,
         },
         createConfig: {
             describe: 'Create a test account config file.',
@@ -2984,6 +3001,10 @@ export const lib = {
             header: 'Created the following components and features:',
             applicationLog: (componentType, uid, name) => `  - Created ${chalk.bold(componentType)} with uid ${chalk.bold(uid)} and name ${chalk.bold(name)}`,
             componentLog: (componentType, uid) => `  - Created ${chalk.bold(componentType)} feature with uid ${chalk.bold(uid)}`,
+            failedToUpdate: (hsMetaFile) => `Failed to update the uid in ${chalk.bold(hsMetaFile)}`,
+        },
+        generateSafeFilenameDifferentiator: {
+            failedToCheckFiles: 'Failed to check files for filename differentiator. Falling back to timestamp.',
         },
         validateProjectConfig: {
             configNotFound: `Unable to locate a project configuration file. Try running again from a project directory, or run ${uiCommandReference('hs project create')} to create a new project.`,
@@ -3232,6 +3253,9 @@ export const lib = {
             skippedExistingAccounts: (accountIds) => `The following accounts were not merged because they already exist in the global config:${accountIds.map(id => `\n- ${uiAccountDescription(Number(id))}`).join('')}`,
             success: 'Your deprecated config file has been successfully merged with the global config file.',
         },
+        errors: {
+            archive: (deprecatedConfigPath) => `The config migration was successful, but an error occurred when archiving config file at ${deprecatedConfigPath}. You may need to manually delete or rename this config file.`,
+        },
     },
     prompts: {
         promptUtils: {
@@ -3244,7 +3268,7 @@ export const lib = {
             promptMessage: '[--file-path] Select the JSON file that will be used to import your data.',
         },
         confirmImportDataPrompt: {
-            message: (dataFileNames, cliAccount) => `You are importing [${dataFileNames.join(', ')}] into ${uiAccountDescription(getAccountIdentifier(cliAccount))}. Continue?`,
+            message: (dataFileNames, cliAccount) => `You are importing [${dataFileNames.join(', ')}] into ${uiAccountDescription(cliAccount?.accountId)}. Continue?`,
         },
         importDataTestAccountSelectPrompt: {
             errors: {
@@ -3596,7 +3620,7 @@ export const lib = {
             },
             failure: {
                 syncTypeFetch: 'Unable to fetch available sandbox sync types. Please try again.',
-                invalidUser: (accountName, parentAccountName) => `Couldn't sync ${chalk.bold(accountName)} because your account has been removed from ${chalk.bold(parentAccountName)} or your permission set doesn't allow you to sync the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
+                invalidUser: (accountName, parentAccountName) => `Couldn't sync sandbox ${chalk.bold(accountName)} because your account has been removed from parent account${chalk.bold(parentAccountName)} or your permission set doesn't allow you to sync the sandbox. To update your permissions, contact a super admin in ${chalk.bold(parentAccountName)}.`,
                 syncInProgress: (url) => `Couldn't run the sync because there's another sync in progress. Wait for the current sync to finish and then try again. To check the sync status, visit the sync activity log: ${url}.`,
                 notSuperAdmin: (accountId) => `Couldn't run the sync because you are not a super admin in ${uiAccountDescription(accountId)}. Ask the account owner for super admin access to the sandbox.`,
                 objectNotFound: (accountId) => `Couldn't sync the sandbox because ${uiAccountDescription(accountId)} may have been deleted through the UI. Run ${uiCommandReference('hs sandbox delete')} to remove this account from the config.`,
@@ -3724,7 +3748,7 @@ export const lib = {
     },
     validation: {
         accountNotFoundInConfig: (userProvidedAccount) => `The account "${userProvidedAccount}" could not be found in the config`,
-        accountRequired: 'An account needs to be supplied either via "--account" or through setting a "defaultPortal"',
+        accountRequired: 'An account needs to be supplied either via "--account" or through setting a "defaultAccount"',
         userProvidedAccount: 'Cannot specify an account when environment variables are supplied. Please unset the environment variables or do not use the "--account" flag.',
         accountNotConfigured: (accountId) => `The account ${uiAccountDescription(accountId)} has not been configured`,
         invalidAuthType: (authType, accountId, configPath, validValues) => `Invalid "authType" value "${authType}" for account "${uiAccountDescription(accountId)}" in config file: ${configPath}. Valid values are ${validValues}.`,

package/lib/__tests__/buildAccount.test.js

@@ -1,11 +1,12 @@
 import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
-import { accountNameExistsInConfig, updateAccountConfig, writeConfig, getAccountId, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists, updateConfigAccount, } from '@hubspot/local-dev-lib/config';
 import { createDeveloperTestAccount, fetchDeveloperTestAccountGateSyncStatus, generateDeveloperTestAccountPersonalAccessKey, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { createSandbox, createV2Sandbox, getSandboxPersonalAccessKey, } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { personalAccessKeyPrompt } from '../prompts/personalAccessKeyPrompt.js';
 import { cliAccountNamePrompt } from '../prompts/accountNamePrompt.js';
 import * as buildAccount from '../buildAccount.js';
+import { poll } from '../polling.js';
 vi.mock('@hubspot/local-dev-lib/personalAccessKey');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('@hubspot/local-dev-lib/api/developerTestAccounts');
@@ -14,6 +15,7 @@ vi.mock('../ui/logger.js');
 vi.mock('../errorHandlers/index.js');
 vi.mock('../prompts/personalAccessKeyPrompt');
 vi.mock('../prompts/accountNamePrompt');
+vi.mock('../polling.js');
 vi.mock('../ui/SpinniesManager', () => ({
     default: {
         init: vi.fn(),
@@ -25,17 +27,16 @@ vi.mock('../ui/SpinniesManager', () => ({
 const mockedPersonalAccessKeyPrompt = personalAccessKeyPrompt;
 const mockedGetAccessToken = getAccessToken;
 const mockedUpdateConfigWithAccessToken = updateConfigWithAccessToken;
-const mockedAccountNameExistsInConfig = accountNameExistsInConfig;
-const mockedUpdateAccountConfig = updateAccountConfig;
-const mockedWriteConfig = writeConfig;
+const mockedGetConfigAccountIfExists = getConfigAccountIfExists;
+const mockedUpdateConfigAccount = updateConfigAccount;
 const mockedCliAccountNamePrompt = cliAccountNamePrompt;
-const mockedGetAccountId = getAccountId;
 const mockedCreateDeveloperTestAccount = createDeveloperTestAccount;
 const mockedFetchDeveloperTestAccountGateSyncStatus = fetchDeveloperTestAccountGateSyncStatus;
 const mockedGenerateDeveloperTestAccountPersonalAccessKey = generateDeveloperTestAccountPersonalAccessKey;
 const mockedCreateSandbox = createSandbox;
 const mockedCreateV2Sandbox = createV2Sandbox;
 const mockedGetPersonalAccessKey = getSandboxPersonalAccessKey;
+const mockedPoll = poll;
 describe('lib/buildAccount', () => {
     describe('saveAccountToConfig()', () => {
         const mockAccountConfig = {
@@ -61,9 +62,8 @@ describe('lib/buildAccount', () => {
             });
             mockedGetAccessToken.mockResolvedValue(accessToken);
             mockedUpdateConfigWithAccessToken.mockResolvedValue(mockAccountConfig);
-            mockedAccountNameExistsInConfig.mockResolvedValue(false);
-            mockedUpdateAccountConfig.mockReturnValue(undefined);
-            mockedWriteConfig.mockReturnValue(undefined);
+            mockedGetConfigAccountIfExists.mockResolvedValue(undefined);
+            mockedUpdateConfigAccount.mockReturnValue(undefined);
         });
         afterEach(() => {
             vi.clearAllMocks();
@@ -72,8 +72,7 @@ describe('lib/buildAccount', () => {
             const result = await buildAccount.saveAccountToConfig(mockAccountConfig.accountId, mockAccountConfig.name, mockAccountConfig.env, 'test-key');
             expect(mockedPersonalAccessKeyPrompt).not.toHaveBeenCalled();
             expect(mockedUpdateConfigWithAccessToken).toHaveBeenCalledWith(accessToken, 'test-key', mockAccountConfig.env);
-            expect(mockedUpdateAccountConfig).toHaveBeenCalledWith(expect.objectContaining(mockAccountConfig));
-            expect(mockedWriteConfig).toHaveBeenCalled();
+            expect(mockedUpdateConfigAccount).toHaveBeenCalledWith(expect.objectContaining(mockAccountConfig));
             expect(result).toBe(mockAccountConfig.name);
         });
         it('should prompt for personal access key if not provided', async () => {
@@ -83,8 +82,7 @@ describe('lib/buildAccount', () => {
                 account: mockAccountConfig.accountId,
             });
             expect(mockedUpdateConfigWithAccessToken).toHaveBeenCalledWith(accessToken, 'test-key', mockAccountConfig.env);
-            expect(mockedUpdateAccountConfig).toHaveBeenCalledWith(expect.objectContaining(mockAccountConfig));
-            expect(mockedWriteConfig).toHaveBeenCalled();
+            expect(mockedUpdateConfigAccount).toHaveBeenCalledWith(expect.objectContaining(mockAccountConfig));
             expect(result).toBe(mockAccountConfig.name);
         });
         it('should handle duplicate account names', async () => {
@@ -93,7 +91,7 @@ describe('lib/buildAccount', () => {
                 name: undefined,
             };
             mockedUpdateConfigWithAccessToken.mockResolvedValue(mockAccountConfigWithNoName);
-            mockedAccountNameExistsInConfig.mockResolvedValue(true);
+            mockedGetConfigAccountIfExists.mockResolvedValue({ accountId: 123 });
             mockedCliAccountNamePrompt.mockResolvedValue({
                 name: 'test-account-with-new-name',
             });
@@ -109,6 +107,7 @@ describe('lib/buildAccount', () => {
             description: 'Test Account created by the HubSpot CLI',
         };
         beforeEach(() => {
+            vi.useFakeTimers();
             mockedCreateDeveloperTestAccount.mockResolvedValue({
                 data: { id: 123456 },
             });
@@ -118,15 +117,23 @@ describe('lib/buildAccount', () => {
             mockedGenerateDeveloperTestAccountPersonalAccessKey.mockResolvedValue({
                 data: { personalAccessKey: 'test-key' },
             });
+            // Mock poll to resolve immediately with the success status
+            mockedPoll.mockResolvedValue({ status: 'SUCCESS' });
+        });
+        afterEach(() => {
+            vi.useRealTimers();
         });
         it('should create a developer test account successfully', async () => {
-            const result = await buildAccount.createDeveloperTestAccountV2(parentAccountId, mockDeveoperTestAccountConfig);
+            const resultPromise = buildAccount.createDeveloperTestAccountV2(parentAccountId, mockDeveoperTestAccountConfig);
+            // Fast-forward the 5 second setTimeout
+            await vi.advanceTimersByTimeAsync(5000);
+            const result = await resultPromise;
             expect(result).toEqual({
                 accountName: mockDeveoperTestAccountConfig.accountName,
                 accountId: 123456,
                 personalAccessKey: 'test-key',
             });
-        }, 10000);
+        });
     });
     describe('buildDeveloperTestAccount()', () => {
         const mockParentAccountConfig = {
@@ -146,7 +153,6 @@ describe('lib/buildAccount', () => {
         };
         beforeEach(() => {
             vi.spyOn(buildAccount, 'saveAccountToConfig').mockResolvedValue(mockParentAccountConfig.name);
-            mockedGetAccountId.mockReturnValue(mockParentAccountConfig.accountId);
             mockedCreateDeveloperTestAccount.mockResolvedValue({
                 data: mockDeveloperTestAccount,
             });
@@ -158,10 +164,6 @@ describe('lib/buildAccount', () => {
             const result = await buildAccount.buildDeveloperTestAccount(mockDeveloperTestAccount.accountName, mockParentAccountConfig, mockParentAccountConfig.env, 10);
             expect(result).toEqual(mockDeveloperTestAccount.id);
         });
-        it('should throw error if account ID is not found', async () => {
-            mockedGetAccountId.mockReturnValue(null);
-            await expect(buildAccount.buildDeveloperTestAccount(mockDeveloperTestAccount.accountName, mockParentAccountConfig, mockParentAccountConfig.env, 10)).rejects.toThrow();
-        });
         it('should handle API errors when creating developer test account', async () => {
             mockedCreateDeveloperTestAccount.mockRejectedValue(new Error('test-error'));
             await expect(buildAccount.buildDeveloperTestAccount(mockDeveloperTestAccount.accountName, mockParentAccountConfig, mockParentAccountConfig.env, 10)).rejects.toThrow();
@@ -192,7 +194,6 @@ describe('lib/buildAccount', () => {
         };
         beforeEach(() => {
             vi.spyOn(buildAccount, 'saveAccountToConfig').mockResolvedValue(mockParentAccountConfig.name);
-            mockedGetAccountId.mockReturnValue(mockParentAccountConfig.accountId);
             mockedCreateSandbox.mockResolvedValue({
                 data: { sandbox: mockSandbox, personalAccessKey: 'test-key' },
             });
@@ -216,10 +217,6 @@ describe('lib/buildAccount', () => {
                 sandbox: mockSandbox,
             });
         });
-        it('should throw error if account ID is not found', async () => {
-            mockedGetAccountId.mockReturnValue(null);
-            await expect(buildAccount.buildSandbox(mockSandbox.name, mockParentAccountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX, mockParentAccountConfig.env)).rejects.toThrow();
-        });
         it('should handle API errors when creating sandbox', async () => {
             mockedCreateSandbox.mockRejectedValue(new Error('test-error'));
             await expect(buildAccount.buildSandbox(mockSandbox.name, mockParentAccountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX, mockParentAccountConfig.env, false)).rejects.toThrow();
@@ -250,7 +247,6 @@ describe('lib/buildAccount', () => {
         };
         beforeEach(() => {
             vi.spyOn(buildAccount, 'saveAccountToConfig').mockResolvedValue(mockParentAccountConfig.name);
-            mockedGetAccountId.mockReturnValue(mockParentAccountConfig.accountId);
             mockedCreateV2Sandbox.mockResolvedValue({
                 data: mockSandbox,
             });
@@ -271,10 +267,6 @@ describe('lib/buildAccount', () => {
             expect(result).toEqual({ sandbox: mockSandbox });
             expect(mockedGetPersonalAccessKey).toHaveBeenCalledWith(mockParentAccountConfig.accountId, mockSandbox.sandboxHubId);
         });
-        it('should throw error if account ID is not found', async () => {
-            mockedGetAccountId.mockReturnValue(null);
-            await expect(buildAccount.buildV2Sandbox(mockSandbox.name, mockParentAccountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX, false, mockParentAccountConfig.env, false)).rejects.toThrow();
-        });
         it('should handle API errors when creating sandbox', async () => {
             mockedCreateV2Sandbox.mockRejectedValue(new Error('test-error'));
             await expect(buildAccount.buildV2Sandbox(mockSandbox.name, mockParentAccountConfig, HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX, false, mockParentAccountConfig.env, false)).rejects.toThrow();

package/lib/__tests__/commonOpts.test.js

@@ -1,9 +1,8 @@
 import { CMS_PUBLISH_MODE, DEFAULT_CMS_PUBLISH_MODE, } from '@hubspot/local-dev-lib/constants/files';
-import { getAndLoadConfigIfNeeded, getAccountConfig, loadConfigFromEnvironment, } from '@hubspot/local-dev-lib/config';
+import { getConfig, getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { getCmsPublishMode } from '../commonOpts.js';
-const mockedGetAccountConfig = getAccountConfig;
-const mockedGetAndLoadConfigIfNeeded = getAndLoadConfigIfNeeded;
-const mockedLoadConfigFromEnvironment = loadConfigFromEnvironment;
+const mockedGetConfigAccountById = getConfigAccountById;
+const mockedGetConfig = getConfig;
 function buildArguments(args) {
     return {
         _: [],
@@ -42,8 +41,8 @@ describe('lib/commonOpts', () => {
         describe('cms publish mode option precedence', () => {
             describe('1. --cmsPublishMode', () => {
                 it('should return the cms publish mode specified by the command option if present.', () => {
-                    mockedGetAndLoadConfigIfNeeded.mockReturnValue(configWithDefaultCmsPublishMode);
-                    mockedGetAccountConfig.mockReturnValue(devAccountConfig);
+                    mockedGetConfig.mockReturnValue(configWithDefaultCmsPublishMode);
+                    mockedGetConfigAccountById.mockReturnValue(devAccountConfig);
                     expect(getCmsPublishMode(buildArguments({
                         cmsPublishMode: CMS_PUBLISH_MODE.draft,
                     }))).toBe(CMS_PUBLISH_MODE.draft);
@@ -54,9 +53,8 @@ describe('lib/commonOpts', () => {
             });
             describe('2. hubspot.config.yml -> config.accounts[x].defaultCmsPublishMode', () => {
                 it('should return the defaultCmsPublishMode specified by the account specific config if present.', () => {
-                    mockedGetAndLoadConfigIfNeeded.mockReturnValue(configWithDefaultCmsPublishMode);
-                    mockedGetAccountConfig.mockReturnValue(devAccountConfig);
-                    mockedLoadConfigFromEnvironment.mockReturnValue(undefined);
+                    mockedGetConfig.mockReturnValue(configWithDefaultCmsPublishMode);
+                    mockedGetConfigAccountById.mockReturnValue(devAccountConfig);
                     expect(getCmsPublishMode(buildArguments({
                         account: accounts.DEV,
                     }))).toBe(CMS_PUBLISH_MODE.draft);
@@ -64,9 +62,8 @@ describe('lib/commonOpts', () => {
             });
             describe('3. hubspot.config.yml -> config.defaultCmsPublishMode', () => {
                 it('should return the defaultCmsPublishMode specified by the config if present.', () => {
-                    mockedGetAndLoadConfigIfNeeded.mockReturnValue(configWithDefaultCmsPublishMode);
-                    mockedGetAccountConfig.mockReturnValue(prodAccountConfig);
-                    mockedLoadConfigFromEnvironment.mockReturnValue(undefined);
+                    mockedGetConfig.mockReturnValue(configWithDefaultCmsPublishMode);
+                    mockedGetConfigAccountById.mockReturnValue(prodAccountConfig);
                     expect(getCmsPublishMode(buildArguments({
                         account: accounts.PROD,
                     }))).toBe(CMS_PUBLISH_MODE.draft);
@@ -74,7 +71,6 @@ describe('lib/commonOpts', () => {
             });
             describe('4. DEFAULT_CMS_PUBLISH_MODE', () => {
                 it('should return the defaultCmsPubishMode specified by the config if present.', () => {
-                    mockedLoadConfigFromEnvironment.mockReturnValue(undefined);
                     expect(getCmsPublishMode(buildArguments({
                         account: 'xxxxx',
                     }))).toBe(DEFAULT_CMS_PUBLISH_MODE);

package/lib/__tests__/developerTestAccounts.test.js

@@ -1,16 +1,18 @@
-import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
+import { getAllConfigAccounts, getConfigAccountIfExists, getConfigAccountById, } from '@hubspot/local-dev-lib/config';
 import { uiLogger } from '../ui/logger.js';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { mockHubSpotHttpError } from '../testUtils.js';
 import * as errorHandlers from '../errorHandlers/index.js';
 import { getHasDevTestAccounts, handleDeveloperTestAccountCreateError, validateDevTestAccountUsageLimits, } from '../developerTestAccounts.js';
+import { logError } from '../errorHandlers/index.js';
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/developerTestAccounts');
 vi.mock('../errorHandlers');
-const mockedGetAccountId = getAccountId;
-const mockedGetConfigAccounts = getConfigAccounts;
+const mockedGetConfigAccountIfExists = getConfigAccountIfExists;
+const mockedGetAllConfigAccounts = getAllConfigAccounts;
+const mockedGetConfigAccountById = getConfigAccountById;
 const mockedFetchDeveloperTestAccounts = fetchDeveloperTestAccounts;
 const APP_DEVELOPER_ACCOUNT_1 = {
     name: 'app-developer-1',
@@ -33,41 +35,43 @@ const accounts = [
         parentAccountId: APP_DEVELOPER_ACCOUNT_1.accountId,
         accountType: HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST,
         env: 'prod',
+        authType: 'personalaccesskey',
     },
 ];
 describe('lib/developerTestAccounts', () => {
     describe('getHasDevTestAccounts()', () => {
         it('should return true if there are developer test accounts associated with the account', () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
-            mockedGetConfigAccounts.mockReturnValueOnce(accounts);
+            mockedGetAllConfigAccounts.mockReturnValueOnce(accounts);
             const result = getHasDevTestAccounts(APP_DEVELOPER_ACCOUNT_1);
             expect(result).toBe(true);
         });
         it('should return false if there are no developer test accounts associated with the account', () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_2.accountId);
-            mockedGetConfigAccounts.mockReturnValueOnce(accounts);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_2);
+            mockedGetAllConfigAccounts.mockReturnValueOnce(accounts);
             const result = getHasDevTestAccounts(APP_DEVELOPER_ACCOUNT_2);
             expect(result).toBe(false);
         });
         it('should return false if there are no accounts configured', () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
-            mockedGetConfigAccounts.mockReturnValueOnce(undefined);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1);
+            mockedGetAllConfigAccounts.mockReturnValueOnce(undefined);
             const result = getHasDevTestAccounts(APP_DEVELOPER_ACCOUNT_1);
             expect(result).toBe(false);
         });
     });
     describe('validateDevTestAccountUsageLimits()', () => {
         afterEach(() => {
-            mockedGetAccountId.mockRestore();
+            mockedGetConfigAccountIfExists.mockRestore();
             mockedFetchDeveloperTestAccounts.mockRestore();
         });
         it('should return null if the account id is not found', async () => {
-            mockedGetAccountId.mockReturnValueOnce(undefined);
+            mockedFetchDeveloperTestAccounts.mockResolvedValueOnce({
+                data: null,
+            });
             const result = await validateDevTestAccountUsageLimits(APP_DEVELOPER_ACCOUNT_1);
             expect(result).toBe(null);
         });
         it('should return null if there is no developer test account data', async () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1);
             mockedFetchDeveloperTestAccounts.mockResolvedValueOnce({
                 data: null,
             });
@@ -75,7 +79,7 @@ describe('lib/developerTestAccounts', () => {
             expect(result).toBe(null);
         });
         it('should return the test account data if the account has not reached the limit', async () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1);
             const testAccountData = {
                 maxTestPortals: 10,
                 results: [],
@@ -87,7 +91,7 @@ describe('lib/developerTestAccounts', () => {
             expect(result).toEqual(expect.objectContaining(testAccountData));
         });
         it('should throw an error if the account has reached the limit', async () => {
-            mockedGetAccountId.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1.accountId);
+            mockedGetConfigAccountIfExists.mockReturnValueOnce(APP_DEVELOPER_ACCOUNT_1);
             mockedFetchDeveloperTestAccounts.mockResolvedValueOnce({
                 data: {
                     maxTestPortals: 0,
@@ -103,6 +107,14 @@ describe('lib/developerTestAccounts', () => {
         beforeEach(() => {
             loggerErrorSpy = vi.spyOn(uiLogger, 'error');
             logErrorSpy = vi.spyOn(errorHandlers, 'logError');
+            // Mock account config for uiAccountDescription calls
+            mockedGetConfigAccountById.mockReturnValue({
+                accountId: APP_DEVELOPER_ACCOUNT_1.accountId,
+                name: 'Test Account',
+                authType: 'personalaccesskey',
+                personalAccessKey: 'test-key',
+                env: 'prod',
+            });
         });
         afterEach(() => {
             loggerErrorSpy.mockRestore();
@@ -117,7 +129,7 @@ describe('lib/developerTestAccounts', () => {
                 },
             });
             expect(() => handleDeveloperTestAccountCreateError(missingScopesError, APP_DEVELOPER_ACCOUNT_1.accountId, 'prod', 10)).toThrow('Missing scopes error');
-            expect(loggerErrorSpy).toHaveBeenCalled();
+            expect(uiLogger.error).toHaveBeenCalled();
         });
         it('should log and throw an error if the account is missing the required scopes', () => {
             const portalLimitReachedError = mockHubSpotHttpError('Portal limit reached error', {
@@ -128,7 +140,7 @@ describe('lib/developerTestAccounts', () => {
                 },
             });
             expect(() => handleDeveloperTestAccountCreateError(portalLimitReachedError, APP_DEVELOPER_ACCOUNT_1.accountId, 'prod', 10)).toThrow('Portal limit reached error');
-            expect(loggerErrorSpy).toHaveBeenCalled();
+            expect(uiLogger.error).toHaveBeenCalled();
         });
         it('should log a generic error message for an unknown error type', () => {
             const someUnknownError = mockHubSpotHttpError('Some unknown error', {
@@ -139,7 +151,7 @@ describe('lib/developerTestAccounts', () => {
                 },
             });
             expect(() => handleDeveloperTestAccountCreateError(someUnknownError, APP_DEVELOPER_ACCOUNT_1.accountId, 'prod', 10)).toThrow('Some unknown error');
-            expect(logErrorSpy).toHaveBeenCalled();
+            expect(logError).toHaveBeenCalled();
         });
     });
 });

package/lib/__tests__/importData.test.js

@@ -1,6 +1,6 @@
 import { uiLogger } from '../ui/logger.js';
 import { createImport } from '@hubspot/local-dev-lib/api/crm';
-import { getAccountConfig, getAccountId } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById, getConfigAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { handleImportData, handleTargetTestAccountSelectionFlow, } from '../importData.js';
 import { lib } from '../../lang/en.js';
 import { isDeveloperTestAccount, isStandardAccount, isAppDeveloperAccount, } from '../accountTypes.js';
@@ -13,8 +13,8 @@ vi.mock('../prompts/importDataTestAccountSelectPrompt');
 describe('lib/importData', () => {
     const mockUiLogger = vi.mocked(uiLogger);
     const mockCreateImport = vi.mocked(createImport);
-    const mockGetAccountConfig = vi.mocked(getAccountConfig);
-    const mockGetAccountId = vi.mocked(getAccountId);
+    const mockGetConfigAccountById = vi.mocked(getConfigAccountById);
+    const mockGetConfigAccountIfExists = vi.mocked(getConfigAccountIfExists);
     const mockIsDeveloperTestAccount = vi.mocked(isDeveloperTestAccount);
     const mockIsStandardAccount = vi.mocked(isStandardAccount);
     const mockIsAppDeveloperAccount = vi.mocked(isAppDeveloperAccount);
@@ -24,8 +24,8 @@ describe('lib/importData', () => {
         mockUiLogger.success.mockReset();
         mockUiLogger.error.mockReset();
         mockCreateImport.mockReset();
-        mockGetAccountConfig.mockReset();
-        mockGetAccountId.mockReset();
+        mockGetConfigAccountById.mockReset();
+        mockGetConfigAccountIfExists.mockReset();
         mockIsDeveloperTestAccount.mockReset();
         mockIsStandardAccount.mockReset();
         mockIsAppDeveloperAccount.mockReset();
@@ -56,32 +56,42 @@ describe('lib/importData', () => {
         const userProvidedAccountId = '1234';
         const derivedAccountId = 123456789;
         it('should error if the userProvidedAccountId is not the right account type', async () => {
-            mockGetAccountConfig.mockReturnValue({});
-            mockGetAccountId.mockReturnValue(1234);
+            mockGetConfigAccountIfExists.mockReturnValue({
+                accountId: 1234,
+            });
             mockIsDeveloperTestAccount.mockReturnValue(false);
             await expect(handleTargetTestAccountSelectionFlow(derivedAccountId, userProvidedAccountId)).rejects.toThrow(lib.importData.errors.notDeveloperTestAccount);
         });
         it('should error if the derivedAccountId belongs to the wrong account type', async () => {
-            mockGetAccountConfig.mockReturnValue({});
+            mockGetConfigAccountIfExists.mockReturnValue({
+                accountId: derivedAccountId,
+            });
+            mockGetConfigAccountById.mockReturnValue({
+                accountId: derivedAccountId,
+            });
             mockIsDeveloperTestAccount.mockReturnValue(false);
             mockIsStandardAccount.mockReturnValue(false);
             mockIsAppDeveloperAccount.mockReturnValue(false);
             await expect(handleTargetTestAccountSelectionFlow(derivedAccountId, undefined)).rejects.toThrow(lib.importData.errors.incorrectAccountType(derivedAccountId));
         });
         it('should return the derivedAccountId if it is a developer test account', async () => {
-            mockGetAccountConfig.mockReturnValue({});
             mockIsDeveloperTestAccount.mockReturnValue(true);
+            mockGetConfigAccountById.mockReturnValue({
+                accountId: derivedAccountId,
+            });
             const result = await handleTargetTestAccountSelectionFlow(derivedAccountId, undefined);
             expect(result).toBe(derivedAccountId);
         });
         it('should return the result of the importDataTestAccountSelectPrompt if the derivedAccountId is a standard or app developer account', async () => {
-            mockGetAccountConfig.mockReturnValue({});
             mockIsDeveloperTestAccount.mockReturnValue(false);
             mockIsStandardAccount.mockReturnValue(true);
             mockIsAppDeveloperAccount.mockReturnValue(true);
             mockImportDataTestAccountSelectPrompt.mockResolvedValue({
                 selectedAccountId: 890223,
             });
+            mockGetConfigAccountById.mockReturnValue({
+                accountId: derivedAccountId,
+            });
             const result = await handleTargetTestAccountSelectionFlow(derivedAccountId, undefined);
             expect(result).toBe(890223);
         });

package/lib/__tests__/oauth.test.js

@@ -1,7 +1,7 @@
 import express from 'express';
 import open from 'open';
 import { OAuth2Manager } from '@hubspot/local-dev-lib/models/OAuth2Manager';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { addOauthToAccountConfig } from '@hubspot/local-dev-lib/oauth';
 import { uiLogger } from '../ui/logger.js';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
@@ -15,18 +15,22 @@ vi.mock('@hubspot/local-dev-lib/oauth');
 vi.mock('../ui/logger.js');
 const mockedExpress = express;
 const mockedOAuth2Manager = OAuth2Manager;
-const mockedGetAccountConfig = getAccountConfig;
+const mockedGetConfigAccountById = getConfigAccountById;
 describe('lib/oauth', () => {
     const mockExpressReq = {
         query: { code: 'test-auth-code' },
     };
     const mockExpressResp = { send: vi.fn() };
     const mockAccountConfig = {
+        name: 'test-account',
         accountId: 123,
-        clientId: 'test-client-id',
-        clientSecret: 'test-client-secret',
-        scopes: ['test-scope'],
+        authType: 'oauth2',
         env: ENVIRONMENTS.PROD,
+        auth: {
+            clientId: 'test-client-id',
+            clientSecret: 'test-client-secret',
+            scopes: ['test-scope'],
+        },
     };
     beforeEach(() => {
         mockedExpress.mockReturnValue({
@@ -49,7 +53,7 @@ describe('lib/oauth', () => {
                 exchangeForTokens: vi.fn().mockResolvedValue({}),
             };
             mockedOAuth2Manager.mockImplementation(() => mockOAuth2Manager);
-            mockedGetAccountConfig.mockReturnValue({
+            mockedGetConfigAccountById.mockReturnValue({
                 env: ENVIRONMENTS.PROD,
             });
             await authenticateWithOauth(mockAccountConfig);
@@ -66,7 +70,10 @@ describe('lib/oauth', () => {
         it('should handle missing clientId', async () => {
             const invalidConfig = {
                 ...mockAccountConfig,
-                clientId: undefined,
+                auth: {
+                    ...mockAccountConfig.auth,
+                    clientId: undefined,
+                },
             };
             mockedOAuth2Manager.mockImplementation(() => ({
                 account: invalidConfig,
@@ -74,6 +81,7 @@ describe('lib/oauth', () => {
             const exitSpy = vi.spyOn(process, 'exit').mockImplementation(() => {
                 throw new Error('exit');
             });
+            // @ts-expect-error Testing invalid config
             await expect(authenticateWithOauth(invalidConfig)).rejects.toThrow('exit');
             expect(uiLogger.error).toHaveBeenCalled();
             expect(exitSpy).toHaveBeenCalled();
@@ -82,7 +90,10 @@ describe('lib/oauth', () => {
         it('should use default scopes when none provided', async () => {
             const configWithoutScopes = {
                 ...mockAccountConfig,
-                scopes: undefined,
+                auth: {
+                    ...mockAccountConfig.auth,
+                    scopes: [],
+                },
             };
             const mockOAuth2Manager = {
                 account: configWithoutScopes,