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

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

@@ -1,7 +1,7 @@
 import yargs from 'yargs';
 import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
 import { uiLogger } from '../../../lib/ui/logger.js';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } 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';
@@ -11,8 +11,9 @@ vi.mock('../../../lib/ui/logger.js');
 vi.mock('../../../lib/app/migrate');
 vi.mock('../../../lib/app/migrate_legacy');
 vi.mock('../../../lib/projects/config.js');
+vi.mock('../../../lib/usageTracking.js');
 const mockYargs = yargs;
-const mockedGetAccountConfig = getAccountConfig;
+const mockedGetConfigAccountById = getConfigAccountById;
 const mockedMigrateApp2023_2 = migrateApp2023_2;
 const mockedMigrateApp2025_2 = migrateApp2025_2;
 const mockedUiLogger = uiLogger;
@@ -24,11 +25,14 @@ const exitSpy = vi
 describe('commands/app/migrate', () => {
     const mockAccountId = 123;
     const mockAccountConfig = {
+        accountId: mockAccountId,
         name: 'Test Account',
         env: 'prod',
+        authType: 'personalaccesskey',
+        personalAccessKey: 'test-key',
     };
     beforeEach(() => {
-        mockedGetAccountConfig.mockReturnValue(mockAccountConfig);
+        mockedGetConfigAccountById.mockReturnValue(mockAccountConfig);
         exitSpy.mockClear();
     });
     afterEach(() => {
@@ -36,7 +40,7 @@ describe('commands/app/migrate', () => {
     });
     describe('handler', () => {
         it('should exit with error when no account config is found', async () => {
-            mockedGetAccountConfig.mockReturnValue(null);
+            mockedGetConfigAccountById.mockReturnValue(null);
             await migrateCommand.handler({
                 derivedAccountId: mockAccountId,
             });

package/commands/app/migrate.js

@@ -1,4 +1,4 @@
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
 import { trackCommandMetadataUsage, trackCommandUsage, } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
@@ -16,7 +16,7 @@ export function handlerGenerator(commandTrackingName) {
     return async function handler(args) {
         const { derivedAccountId, platformVersion, unstable } = args;
         await trackCommandUsage(commandTrackingName, {}, derivedAccountId);
-        const accountConfig = getAccountConfig(derivedAccountId);
+        const accountConfig = getConfigAccountById(derivedAccountId);
         if (!accountConfig) {
             uiLogger.error(commands.project.migrateApp.errors.noAccountConfig);
             return process.exit(EXIT_CODES.ERROR);

package/commands/auth.js

@@ -3,7 +3,7 @@ import { OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/lo
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
 import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
-import { updateAccountConfig, writeConfig, getConfigPath, loadConfig, getAccountId, configFileExists, } from '@hubspot/local-dev-lib/config';
+import { updateConfigAccount, getConfigFilePath, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
 import { commaSeparatedValues, toKebabCase } from '@hubspot/local-dev-lib/text';
 import { promptUser } from '../lib/prompts/promptUtils.js';
 import { personalAccessKeyPrompt, OAUTH_FLOW, } from '../lib/prompts/personalAccessKeyPrompt.js';
@@ -47,13 +47,11 @@ async function handler(args) {
         PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     setCLILogLevel(args);
     const env = qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
-    // Needed to load deprecated config
-    loadConfig(configFlagValue);
-    const configPath = getConfigPath();
+    const configPath = getConfigFilePath();
     if (configPath) {
         checkAndWarnGitInclusion(configPath);
     }
-    if (configFileExists(true)) {
+    if (!configFlagValue && globalConfigFileExists()) {
         uiLogger.error(commands.auth.errors.globalConfigFileExists('hs account auth'));
         process.exit(EXIT_CODES.ERROR);
     }
@@ -62,7 +60,7 @@ async function handler(args) {
         trackAuthAction('auth', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     }
     let configData;
-    let updatedConfig;
+    let updatedConfig = undefined;
     let validName;
     let successAuthMethod;
     let token;
@@ -70,10 +68,19 @@ async function handler(args) {
     switch (authType) {
         case OAUTH_AUTH_METHOD.value:
             configData = await promptUser(OAUTH_FLOW);
-            await authenticateWithOauth({
-                ...configData,
+            const oauthAccount = {
+                name: configData.name,
+                accountId: configData.accountId,
+                authType: OAUTH_AUTH_METHOD.value,
                 env,
-            });
+                auth: {
+                    clientId: configData.clientId,
+                    clientSecret: configData.clientSecret,
+                    scopes: configData.scopes,
+                    tokenInfo: {},
+                },
+            };
+            await authenticateWithOauth(oauthAccount);
             successAuthMethod = OAUTH_AUTH_METHOD.name;
             break;
         case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
@@ -99,13 +106,10 @@ async function handler(args) {
                 const { name: namePrompt } = await cliAccountNamePrompt(defaultName);
                 validName = namePrompt;
             }
-            updateAccountConfig({
+            updateConfigAccount({
                 ...updatedConfig,
-                env: updatedConfig.env,
-                tokenInfo: updatedConfig.auth.tokenInfo,
                 name: validName,
             });
-            writeConfig();
             successAuthMethod = PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
             break;
         default:
@@ -126,7 +130,7 @@ async function handler(args) {
         'accountOption',
         'accountsListCommand',
     ]);
-    const accountId = getAccountId(accountName) || undefined;
+    const accountId = updatedConfig?.accountId;
     if (!disableTracking) {
         await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
     }

package/commands/config/migrate.js

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { configFileExists } from '@hubspot/local-dev-lib/config/migrate';
+import { localConfigFileExists, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
 import { handleMigration, handleMerge } from '../../lib/configMigrate.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
@@ -16,8 +16,8 @@ async function handler(args) {
         uiLogger.error(commands.config.subcommands.migrate.errors.configNotFound(configPath));
         process.exit(EXIT_CODES.ERROR);
     }
-    const deprecatedConfigExists = configFileExists(false, configPath);
-    const globalConfigExists = configFileExists(true);
+    const deprecatedConfigExists = localConfigFileExists();
+    const globalConfigExists = globalConfigFileExists();
     if (!deprecatedConfigExists) {
         uiLogger.error(commands.config.subcommands.migrate.errors.noConfigToMigrate);
         process.exit(EXIT_CODES.ERROR);
@@ -25,10 +25,10 @@ async function handler(args) {
     let success = false;
     try {
         if (!globalConfigExists) {
-            success = await handleMigration(configPath, true);
+            success = await handleMigration(true);
         }
         else {
-            success = await handleMerge(configPath, force, true);
+            success = await handleMerge(force, true);
         }
     }
     catch (error) {

package/commands/config/set.js

@@ -22,7 +22,7 @@ async function selectOptions() {
                 },
                 { name: 'Allow usage tracking', value: { allowUsageTracking: '' } },
                 { name: 'HTTP timeout', value: { httpTimeout: '' } },
-                // TODO enable when we unhide this option { name: 'Allow auto updates', value: { allowAutoUpdates: '' } },
+                { name: 'Allow auto updates', value: { allowAutoUpdates: '' } },
             ],
         },
     ]);
@@ -94,7 +94,6 @@ function configSetBuilder(yargs) {
         'allow-auto-updates': {
             describe: commands.config.subcommands.set.options.allowAutoUpdates.describe,
             type: 'boolean',
-            hidden: true,
         },
         'auto-open-browser': {
             describe: commands.config.subcommands.set.options.autoOpenBrowser.describe,

package/commands/customObject/createSchema.js

@@ -1,6 +1,5 @@
 import { uiLogger } from '../../lib/ui/logger.js';
-import { getEnv } from '@hubspot/local-dev-lib/config';
-import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getAbsoluteFilePath } from '@hubspot/local-dev-lib/path';
 import { createObjectSchema } from '@hubspot/local-dev-lib/api/customObjects';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
@@ -24,7 +23,7 @@ async function handler(args) {
     }
     try {
         const { data } = await createObjectSchema(derivedAccountId, schemaJson);
-        uiLogger.success(commands.customObject.subcommands.createSchema.success.schemaViewable(`${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`));
+        uiLogger.success(commands.customObject.subcommands.createSchema.success.schemaViewable(`${getHubSpotWebsiteOrigin(getConfigAccountEnvironment(derivedAccountId))}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`));
     }
     catch (e) {
         logError(e, { accountId: derivedAccountId });

package/commands/customObject/updateSchema.js

@@ -1,8 +1,7 @@
 import { fetchObjectSchemas, updateObjectSchema, } from '@hubspot/local-dev-lib/api/customObjects';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { getAbsoluteFilePath } from '@hubspot/local-dev-lib/path';
-import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
-import { getEnv } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { listPrompt } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -34,7 +33,7 @@ async function handler(args) {
                     choices: schemaNames,
                 });
         const { data } = await updateObjectSchema(derivedAccountId, name, schemaJson);
-        uiLogger.success(commands.customObject.subcommands.updateSchema.success.viewAtUrl(`${getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD)}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`));
+        uiLogger.success(commands.customObject.subcommands.updateSchema.success.viewAtUrl(`${getHubSpotWebsiteOrigin(getConfigAccountEnvironment(derivedAccountId))}/contacts/${derivedAccountId}/objects/${data.objectTypeId}`));
     }
     catch (e) {
         logError(e, { accountId: derivedAccountId });

package/commands/getStarted.js

@@ -11,7 +11,7 @@ import { promptUser } from '../lib/prompts/promptUtils.js';
 import { projectNameAndDestPrompt } from '../lib/prompts/projectNameAndDestPrompt.js';
 import { uiAccountDescription, uiFeatureHighlight, uiInfoSection, } from '../lib/ui/index.js';
 import { uiLogger } from '../lib/ui/logger.js';
-import { debugError } from '../lib/errorHandlers/index.js';
+import { debugError, logError } from '../lib/errorHandlers/index.js';
 import { handleProjectUpload } from '../lib/projects/upload.js';
 import { PROJECT_CONFIG_FILE, GET_STARTED_OPTIONS, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } from '../lib/constants.js';
 import { writeProjectConfig, getProjectConfig, validateProjectConfig, } from '../lib/projects/config.js';
@@ -19,14 +19,13 @@ import { pollProjectBuildAndDeploy } from '../lib/projects/pollProjectBuildAndDe
 import { isV2Project } from '../lib/projects/platformVersion.js';
 import { openLink } from '../lib/links.js';
 import { getStaticAuthAppInstallUrl } from '../lib/app/urls.js';
-import { getEnv } from '@hubspot/local-dev-lib/config';
-import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
 const command = 'get-started';
 const describe = commands.getStarted.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
-    const env = getEnv(derivedAccountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
+    const env = getConfigAccountEnvironment(derivedAccountId);
     await trackCommandUsage('get-started', {}, derivedAccountId);
     const accountName = uiAccountDescription(derivedAccountId);
     uiInfoSection(commands.getStarted.startTitle, () => {
@@ -162,7 +161,13 @@ async function handler(args) {
                     uiLogger.error(commands.getStarted.errors.configFileNotFound);
                     process.exit(EXIT_CODES.ERROR);
                 }
-                validateProjectConfig(newProjectConfig, newProjectDir);
+                try {
+                    validateProjectConfig(newProjectConfig, newProjectDir);
+                }
+                catch (error) {
+                    logError(error);
+                    process.exit(EXIT_CODES.ERROR);
+                }
                 uiLogger.log(' ');
                 uiLogger.log(commands.getStarted.logs.uploadingProject);
                 uiLogger.log(' ');

package/commands/hubdb/__tests__/list.test.js

@@ -7,6 +7,7 @@ import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import hubdbListCommand from '../list.js';
 vi.mock('../../../lib/commonOpts');
 vi.mock('@hubspot/local-dev-lib/api/hubdb');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/ui/logger', () => ({
     uiLogger: {
         success: vi.fn(),

package/commands/hubdb/list.js

@@ -1,5 +1,5 @@
 import { fetchTables } from '@hubspot/local-dev-lib/api/hubdb';
-import { getEnv } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -46,7 +46,7 @@ async function handler(args) {
     uiLogger.log(' ');
     // link devs to the hubdb page in hubspot for easy access
     // TODO: This is hacky, we should make a util like getBaseUrl()
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv());
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(derivedAccountId));
     uiLogger.log(commands.hubdb.subcommands.list.viewTablesLink(baseUrl, derivedAccountId));
     // don't bother showing an empty list of tables
     if (tables.length > 0) {

package/commands/hubdb.d.ts

@@ -1,5 +1,5 @@
 import { YargsCommandModuleBucket } from '../types/Yargs.js';
 export declare const command = "hubdb";
-export declare const describe: "Commands for managing HubDB tables.";
+export declare const describe: string;
 declare const hubdbCommand: YargsCommandModuleBucket;
 export default hubdbCommand;

package/commands/init.js

@@ -1,6 +1,6 @@
 import path from 'path';
-import fs from 'fs-extra';
-import { loadConfig, getConfigPath, createEmptyConfigFile, deleteEmptyConfigFile, updateDefaultAccount, configFileExists, } from '@hubspot/local-dev-lib/config';
+import { existsSync } from 'fs';
+import { getConfigFilePath, createEmptyConfigFile, deleteConfigFileIfEmpty, setConfigAccountAsDefault, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
 import { OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
 import { checkAndAddConfigToGitignore } from '@hubspot/local-dev-lib/gitignore';
 import { DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
@@ -8,7 +8,6 @@ import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { toKebabCase } from '@hubspot/local-dev-lib/text';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { setCLILogLevel } from '../lib/commonOpts.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { handleExit } from '../lib/process.js';
@@ -44,13 +43,21 @@ async function personalAccessKeyConfigCreationFlow(env, account) {
 }
 async function oauthConfigCreationFlow(env) {
     const configData = await promptUser(OAUTH_FLOW);
-    const accountConfig = {
-        ...configData,
+    const oauthAccount = {
+        name: configData.name,
+        accountId: configData.accountId,
+        authType: OAUTH_AUTH_METHOD.value,
         env,
+        auth: {
+            clientId: configData.clientId,
+            clientSecret: configData.clientSecret,
+            scopes: configData.scopes,
+            tokenInfo: {},
+        },
     };
-    await authenticateWithOauth(accountConfig);
-    updateDefaultAccount(accountConfig.name);
-    return accountConfig;
+    await authenticateWithOauth(oauthAccount);
+    setConfigAccountAsDefault(configData.accountId);
+    return oauthAccount;
 }
 const AUTH_TYPE_NAMES = {
     [PERSONAL_ACCESS_KEY_AUTH_METHOD.value]: PERSONAL_ACCESS_KEY_AUTH_METHOD.name,
@@ -59,7 +66,7 @@ const AUTH_TYPE_NAMES = {
 const command = 'init';
 const describe = commands.init.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, useHiddenConfig, userProvidedAccount, } = args;
+    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, userProvidedAccount, } = args;
     let parsedUserProvidedAccountId;
     try {
         if (userProvidedAccount) {
@@ -72,8 +79,13 @@ async function handler(args) {
     }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
-    const configPath = (configFlagValue && path.join(getCwd(), configFlagValue)) ||
-        getConfigPath('', useHiddenConfig);
+    let existingConfigPath;
+    try {
+        existingConfigPath =
+            (configFlagValue && path.join(getCwd(), configFlagValue)) ||
+                getConfigFilePath();
+    }
+    catch (err) { }
     setCLILogLevel(args);
     if (!disableTracking) {
         trackCommandUsage('init', {
@@ -81,44 +93,36 @@ async function handler(args) {
         });
     }
     const env = args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
-    if (configFileExists(true)) {
+    // Only check for global config if user is not providing a custom config path
+    if (!configFlagValue && globalConfigFileExists()) {
         uiLogger.error(commands.init.errors.globalConfigFileExists);
         process.exit(EXIT_CODES.ERROR);
     }
-    if (fs.existsSync(configPath)) {
-        uiLogger.error(commands.init.errors.configFileExists(configPath));
+    // Check if the specific config file path already exists
+    if (existingConfigPath && existsSync(existingConfigPath)) {
+        uiLogger.error(commands.init.errors.configFileExists(existingConfigPath));
         uiLogger.info(commands.init.logs.updateConfig);
         process.exit(EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
         await trackAuthAction('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     }
-    const doesOtherConfigFileExist = configFileExists(!useHiddenConfig);
-    if (doesOtherConfigFileExist) {
-        const path = getConfigPath('', !useHiddenConfig);
-        uiLogger.error(commands.init.errors.bothConfigFilesNotAllowed(path));
-        process.exit(EXIT_CODES.ERROR);
-    }
-    createEmptyConfigFile({ path: configPath }, useHiddenConfig);
-    //Needed to load deprecated config
-    loadConfig(configPath, args);
-    handleExit(deleteEmptyConfigFile);
+    createEmptyConfigFile(false);
+    handleExit(deleteConfigFileIfEmpty);
     try {
         let accountId;
         let name;
         if (authType === PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
             const personalAccessKeyResult = await personalAccessKeyConfigCreationFlow(env, parsedUserProvidedAccountId);
-            if (personalAccessKeyResult) {
-                accountId = getAccountIdentifier(personalAccessKeyResult);
-                name = personalAccessKeyResult.name;
-            }
+            accountId = personalAccessKeyResult.accountId;
+            name = personalAccessKeyResult.name;
         }
         else {
-            const oauthResult = await oauthConfigCreationFlow(env);
-            accountId = oauthResult.accountId;
-            name = oauthResult.name;
+            const oauthAccount = await oauthConfigCreationFlow(env);
+            accountId = oauthAccount.accountId;
+            name = oauthAccount.name;
         }
-        const configPath = getConfigPath();
+        const configPath = getConfigFilePath();
         try {
             checkAndAddConfigToGitignore(configPath);
         }

package/commands/project/__tests__/deploy.test.js

@@ -1,6 +1,5 @@
 import { HttpStatusCode } from 'axios';
 import yargs from 'yargs';
-import chalk from 'chalk';
 import * as configUtils from '@hubspot/local-dev-lib/config';
 import * as projectApiUtils from '@hubspot/local-dev-lib/api/projects';
 import * as ui from '../../../lib/ui/index.js';
@@ -17,6 +16,7 @@ import { mockHubSpotHttpResponse, mockHubSpotHttpError, } from '../../../lib/tes
 const exampleProject = loadJson(import.meta.url, './fixtures/exampleProject.json');
 import projectDeployCommand from '../deploy.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
+import chalk from 'chalk';
 vi.mock('@hubspot/local-dev-lib/api/projects');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/commonOpts');
@@ -38,7 +38,7 @@ const projectNamePromptSpy = vi.spyOn(projectNamePrompt, 'projectNamePrompt');
 const getProjectDetailUrlSpy = vi.spyOn(projectUrlUtils, 'getProjectDetailUrl');
 const fetchProjectSpy = vi.spyOn(projectApiUtils, 'fetchProject');
 const deployProjectSpy = vi.spyOn(projectApiUtils, 'deployProject');
-const getAccountConfigSpy = vi.spyOn(configUtils, 'getAccountConfig');
+const getConfigAccountByIdSpy = vi.spyOn(configUtils, 'getConfigAccountById');
 const promptUserSpy = vi.spyOn(promptUtils, 'promptUser');
 const processExitSpy = vi.spyOn(process, 'exit');
 const optionsSpy = vi
@@ -137,7 +137,12 @@ describe('commands/project/deploy', () => {
                 projectName: projectNameFromPrompt,
             });
             getProjectDetailUrlSpy.mockReturnValue(projectDetailUrl);
-            getAccountConfigSpy.mockReturnValue({ accountType, env: 'qa' });
+            getConfigAccountByIdSpy.mockReturnValue({
+                accountId: 123,
+                name: 'SuperCoolTestAccount',
+                accountType,
+                env: 'qa',
+            });
             fetchProjectSpy.mockReturnValue(mockHubSpotHttpResponse(exampleProject));
             deployProjectSpy.mockReturnValue(mockHubSpotHttpResponse(deployDetails));
             // Spy on process.exit so our tests don't close when it's called
@@ -146,8 +151,8 @@ describe('commands/project/deploy', () => {
         });
         it('should load the account config for the correct account id', async () => {
             await projectDeployCommand.handler(args);
-            expect(getAccountConfigSpy).toHaveBeenCalledTimes(1);
-            expect(getAccountConfigSpy).toHaveBeenCalledWith(args.derivedAccountId);
+            expect(getConfigAccountByIdSpy).toHaveBeenCalledTimes(1);
+            expect(getConfigAccountByIdSpy).toHaveBeenCalledWith(args.derivedAccountId);
         });
         it('should track the command usage', async () => {
             await projectDeployCommand.handler(args);

package/commands/project/__tests__/devUnifiedFlow.test.js

@@ -1,7 +1,7 @@
 import path from 'path';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { translateForLocalDev } from '@hubspot/project-parsing-lib';
-import { getConfigAccounts, getAccountConfig, } from '@hubspot/local-dev-lib/config';
+import { getAllConfigAccounts, getConfigAccountById, getConfigAccountEnvironment, } from '@hubspot/local-dev-lib/config';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { getServerPortByInstanceId } from '@hubspot/local-dev-lib/portManager';
 import { logError } from '../../../lib/errorHandlers/index.js';
@@ -75,6 +75,7 @@ describe('unifiedProjectDevFlow', () => {
         accountId: 123,
         name: 'test-account',
         accountType: HUBSPOT_ACCOUNT_TYPES.STANDARD,
+        env: ENVIRONMENTS.PROD,
     };
     const mockProject = {
         id: 1,
@@ -119,8 +120,9 @@ describe('unifiedProjectDevFlow', () => {
         translateForLocalDev.mockResolvedValue({
             intermediateNodesIndexedByUid: mockProjectNodes,
         });
-        getAccountConfig.mockReturnValue(mockAccountConfig);
-        getConfigAccounts.mockReturnValue([mockAccountConfig]);
+        getConfigAccountById.mockReturnValue(mockAccountConfig);
+        getConfigAccountEnvironment.mockReturnValue(ENVIRONMENTS.PROD);
+        getAllConfigAccounts.mockReturnValue([mockAccountConfig]);
         isUnifiedAccount.mockResolvedValue(true);
         isTestAccountOrSandbox.mockReturnValue(false);
         ensureProjectExists.mockResolvedValue({
@@ -210,7 +212,7 @@ describe('unifiedProjectDevFlow', () => {
             expect(uiLogger.error).toHaveBeenCalledWith(commands.project.dev.errors.noRunnableComponents);
         });
         it('should exit with error when account config not found', async () => {
-            getAccountConfig.mockReturnValue(null);
+            getConfigAccountById.mockReturnValue(null);
             await expect(unifiedProjectDevFlow({
                 args: mockArgs,
                 targetProjectAccountId: mockTargetProjectAccountId,

package/commands/project/__tests__/logs.test.js

@@ -8,6 +8,8 @@ import * as ui from '../../../lib/ui/index.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import projectLogsCommand from '../logs.js';
+import * as config from '@hubspot/local-dev-lib/config';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 vi.mock('../../ui/logger.js');
 vi.mock('../../../lib/commonOpts');
 vi.mock('../../../lib/usageTracking');
@@ -25,6 +27,7 @@ const projectLogsManagerGetFunctionNamesSpy = vi.spyOn(ProjectLogsManager, 'getF
 const projectLogsManagerInitSpy = vi.spyOn(ProjectLogsManager, 'init');
 const getTableHeaderSpy = vi.spyOn(table, 'getTableHeader');
 const getTableContentsSpy = vi.spyOn(table, 'getTableContents');
+const getConfigAccountEnvironmentSpy = vi.spyOn(config, 'getConfigAccountEnvironment');
 const optionsSpy = vi
     .spyOn(yargs, 'options')
     .mockReturnValue(yargs);
@@ -34,6 +37,7 @@ const conflictsSpy = vi
 const exampleSpy = vi
     .spyOn(yargs, 'example')
     .mockReturnValue(yargs);
+getConfigAccountEnvironmentSpy.mockReturnValue(ENVIRONMENTS.PROD);
 describe('commands/project/logs', () => {
     beforeEach(() => {
         // @ts-expect-error Doesn't match the actual signature because then the linter complains about unused variables

package/commands/project/__tests__/validate.test.js

@@ -7,7 +7,7 @@ import { commands } from '../../../lang/en.js';
 import { isV2Project } from '../../../lib/projects/platformVersion.js';
 import { loadAndValidateProfile } from '../../../lib/projectProfiles.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { handleTranslate } from '../../../lib/projects/upload.js';
 import projectValidateCommand from '../validate.js';
 // Mock dependencies
@@ -79,7 +79,7 @@ describe('commands/project/validate', () => {
         vi.mocked(isV2Project).mockReturnValue(true);
         vi.mocked(validateProjectConfig).mockReturnValue(undefined);
         vi.mocked(loadAndValidateProfile).mockResolvedValue(123);
-        vi.mocked(getAccountConfig).mockReturnValue({
+        vi.mocked(getConfigAccountById).mockReturnValue({
             accountType: 'STANDARD',
             accountId: 123,
             env: 'prod',

package/commands/project/cloneApp.js

@@ -14,7 +14,7 @@ import { cloneApp, checkCloneStatus, downloadClonedProject, } from '@hubspot/loc
 import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 import { logInvalidAccountError } from '../../lib/app/migrate.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
@@ -25,7 +25,7 @@ const deprecated = true;
 async function handler(args) {
     const { derivedAccountId } = args;
     await trackCommandUsage('clone-app', {}, derivedAccountId);
-    const accountConfig = getAccountConfig(derivedAccountId);
+    const accountConfig = getConfigAccountById(derivedAccountId);
     const accountName = uiAccountDescription(derivedAccountId);
     if (!accountConfig) {
         throw new Error(commands.project.cloneApp.errors.noAccountConfig(derivedAccountId));

package/commands/project/deploy.js

@@ -1,5 +1,5 @@
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { isV2Project } from '../../lib/projects/platformVersion.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
@@ -19,7 +19,7 @@ const command = 'deploy';
 const describe = commands.project.deploy.describe;
 async function handler(args) {
     const { derivedAccountId, project: projectOption, buildId: buildIdOption, force: forceOption, deployLatestBuild: deployLatestBuildOption, json: formatOutputAsJson, } = args;
-    const accountConfig = getAccountConfig(derivedAccountId);
+    const accountConfig = getConfigAccountById(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     let targetAccountId;
     const jsonOutput = {};

package/commands/project/dev/deprecatedFlow.js

@@ -1,5 +1,4 @@
-import { getAccountConfig, getConfigAccounts, getEnv, } from '@hubspot/local-dev-lib/config';
-import { getValidEnv } from '@hubspot/local-dev-lib/environment';
+import { getConfigAccountById, getAllConfigAccounts, getConfigAccountEnvironment, } from '@hubspot/local-dev-lib/config';
 import { findProjectComponents, getProjectComponentTypes, } from '../../../lib/projects/structure.js';
 import { ComponentTypes } from '../../../types/Projects.js';
 import { commands } from '../../../lang/en.js';
@@ -14,13 +13,13 @@ import { isSandbox, isDeveloperTestAccount, } from '../../../lib/accountTypes.js
 import { ensureProjectExists } from '../../../lib/projects/ensureProjectExists.js';
 export async function deprecatedProjectDevFlow({ args, accountId, projectConfig, projectDir, }) {
     const { userProvidedAccount, derivedAccountId } = args;
-    const env = getValidEnv(getEnv(derivedAccountId));
+    const env = getConfigAccountEnvironment(derivedAccountId);
     const components = await findProjectComponents(projectDir);
     const runnableComponents = components.filter(component => component.runnable);
     const componentTypes = getProjectComponentTypes(runnableComponents);
     const hasPrivateApps = !!componentTypes[ComponentTypes.PrivateApp];
     const hasPublicApps = !!componentTypes[ComponentTypes.PublicApp];
-    const accountConfig = getAccountConfig(accountId);
+    const accountConfig = getConfigAccountById(accountId);
     if (!accountConfig) {
         uiLogger.error(commands.project.dev.errors.noAccount(accountId));
         process.exit(EXIT_CODES.ERROR);
@@ -33,7 +32,7 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
         uiLogger.error(commands.project.dev.errors.invalidProjectComponents);
         process.exit(EXIT_CODES.SUCCESS);
     }
-    const accounts = getConfigAccounts();
+    const accounts = getAllConfigAccounts();
     if (!accounts) {
         uiLogger.error(commands.project.dev.errors.noAccountsInConfig);
         process.exit(EXIT_CODES.ERROR);