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

package/lib/buildAccount.js

@@ -1,6 +1,5 @@
 import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
-import { accountNameExistsInConfig, updateAccountConfig, writeConfig, getAccountId, } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getConfigAccountIfExists, updateConfigAccount, } from '@hubspot/local-dev-lib/config';
 import { uiLogger } from './ui/logger.js';
 import { createDeveloperTestAccount, fetchDeveloperTestAccountGateSyncStatus, generateDeveloperTestAccountPersonalAccessKey, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
@@ -28,8 +27,8 @@ export async function saveAccountToConfig(accountId, accountName, env, personalA
     if (!updatedConfig?.name) {
         const nameForConfig = accountName.toLowerCase().split(' ').join('-');
         validName = nameForConfig;
-        const invalidAccountName = accountNameExistsInConfig(nameForConfig);
-        if (invalidAccountName) {
+        const existingAccount = getConfigAccountIfExists(nameForConfig);
+        if (existingAccount) {
             if (!force) {
                 uiLogger.log('');
                 uiLogger.warn(lib.prompts.accountNamePrompt.errors.accountNameExists(nameForConfig));
@@ -42,13 +41,10 @@ export async function saveAccountToConfig(accountId, accountName, env, personalA
             }
         }
     }
-    updateAccountConfig({
+    updateConfigAccount({
         ...updatedConfig,
-        env: updatedConfig?.env,
-        tokenInfo: updatedConfig?.auth?.tokenInfo,
         name: validName,
     });
-    writeConfig();
     uiLogger.log('');
     return validName;
 }
@@ -83,8 +79,7 @@ export async function createDeveloperTestAccountV2(parentAccountId, testAccountC
     return result;
 }
 export async function buildDeveloperTestAccount(testAccountName, parentAccountConfig, env, portalLimit, useV2 = false) {
-    const id = getAccountIdentifier(parentAccountConfig);
-    const parentAccountId = getAccountId(id);
+    const parentAccountId = parentAccountConfig.accountId;
     let testAccountConfig = {
         accountName: testAccountName,
     };
@@ -141,8 +136,7 @@ export async function buildSandbox(sandboxName, parentAccountConfig, sandboxType
     const sandboxTypeKey = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
         ? 'standard'
         : 'developer';
-    const id = getAccountIdentifier(parentAccountConfig);
-    const parentAccountId = getAccountId(id);
+    const parentAccountId = parentAccountConfig.accountId;
     if (!parentAccountId) {
         throw new Error(lib.sandbox.create[sandboxTypeKey].loading.fail(''));
     }
@@ -182,8 +176,7 @@ export async function buildV2Sandbox(sandboxName, parentAccountConfig, sandboxTy
     const sandboxTypeKey = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
         ? 'standard'
         : 'developer';
-    const id = getAccountIdentifier(parentAccountConfig);
-    const parentAccountId = getAccountId(id);
+    const parentAccountId = parentAccountConfig.accountId;
     if (!parentAccountId) {
         throw new Error(lib.sandbox.create[sandboxTypeKey].loading.fail(''));
     }

package/lib/commonOpts.js

@@ -3,7 +3,7 @@ import yargsParser from 'yargs-parser';
 import { LOG_LEVEL, setLogLevel } from '@hubspot/local-dev-lib/logger';
 import { uiLogger } from './ui/logger.js';
 import { DEFAULT_CMS_PUBLISH_MODE, CMS_PUBLISH_MODE, } from '@hubspot/local-dev-lib/constants/files';
-import { getAccountConfig, getAndLoadConfigIfNeeded, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById, getConfig } from '@hubspot/local-dev-lib/config';
 import { debugError } from './errorHandlers/index.js';
 import { EXIT_CODES } from './enums/exitCodes.js';
 import { uiCommandReference } from './ui/index.js';
@@ -168,14 +168,14 @@ export function getCmsPublishMode(options) {
     }
     // 2. config[account].defaultCmsPublishMode
     if (options.derivedAccountId) {
-        const accountConfig = getAccountConfig(options.derivedAccountId);
+        const accountConfig = getConfigAccountById(options.derivedAccountId);
         if (accountConfig && accountConfig.defaultCmsPublishMode) {
             return accountConfig.defaultCmsPublishMode;
         }
     }
     // 3. config.defaultCmsPublishMode
     // 4. DEFAULT_CMS_PUBLISH_MODE
-    const config = getAndLoadConfigIfNeeded();
+    const config = getConfig();
     return ((config && config.defaultCmsPublishMode) ||
         DEFAULT_CMS_PUBLISH_MODE);
 }

package/lib/configMigrate.d.ts

@@ -1,2 +1,2 @@
-export declare function handleMigration(deprecatedConfigPath?: string, hideWarning?: boolean): Promise<boolean>;
-export declare function handleMerge(deprecatedConfigPath?: string, force?: boolean, hideWarning?: boolean): Promise<boolean>;
+export declare function handleMigration(hideWarning?: boolean): Promise<boolean>;
+export declare function handleMerge(force?: boolean, hideWarning?: boolean): Promise<boolean>;

package/lib/configMigrate.js

@@ -1,8 +1,10 @@
-import { getDeprecatedConfig, getGlobalConfig, getConfigPath, migrateConfig, mergeConfigProperties, mergeExistingConfigs, } from '@hubspot/local-dev-lib/config/migrate';
+import { getConfigAtPath, migrateConfigAtPath, mergeConfigProperties, mergeConfigAccounts, archiveConfigAtPath, } from '@hubspot/local-dev-lib/config/migrate';
 import { ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
 import { promptUser } from './prompts/promptUtils.js';
 import { lib } from '../lang/en.js';
 import { uiLogger } from './ui/logger.js';
+import { getConfig, getLocalConfigFilePathIfExists, } from '@hubspot/local-dev-lib/config';
+import { debugError } from './errorHandlers/index.js';
 async function promptRenameOrOmitAccount(accountName, accountId) {
     const { shouldRename } = await promptUser({
         name: 'shouldRename',
@@ -24,7 +26,7 @@ async function promptNewAccountName(account, globalConfig, renamedAccounts) {
             if (value === account.name) {
                 return lib.configMigrate.handleAccountNameConflicts.errors.sameName;
             }
-            const existingAccount = globalConfig.accounts?.some(acc => acc.name === value);
+            const existingAccount = globalConfig.accounts.some((acc) => acc.name === value);
             const renamedAccount = renamedAccounts.some(acc => acc.name === value);
             if (existingAccount || renamedAccount) {
                 return lib.configMigrate.handleAccountNameConflicts.errors.nameAlreadyInConfig(value);
@@ -34,9 +36,10 @@ async function promptNewAccountName(account, globalConfig, renamedAccounts) {
     });
     return newAccountName;
 }
-export async function handleMigration(deprecatedConfigPath, hideWarning) {
+export async function handleMigration(hideWarning) {
+    const deprecatedConfigPath = process.env.HUBSPOT_CONFIG_PATH || getLocalConfigFilePathIfExists();
     if (!hideWarning) {
-        uiLogger.warn(lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || getConfigPath(undefined, false)));
+        uiLogger.warn(lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || ''));
         uiLogger.log('');
     }
     uiLogger.log(lib.configMigrate.handleMigration.description(ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME));
@@ -49,13 +52,20 @@ export async function handleMigration(deprecatedConfigPath, hideWarning) {
     if (!shouldMigrateConfig) {
         return false;
     }
-    const deprecatedConfig = getDeprecatedConfig(deprecatedConfigPath);
-    migrateConfig(deprecatedConfig);
+    migrateConfigAtPath(deprecatedConfigPath || '');
+    try {
+        archiveConfigAtPath(deprecatedConfigPath);
+    }
+    catch (error) {
+        debugError(error);
+        uiLogger.error(lib.configMigrate.errors.archive(deprecatedConfigPath));
+        return true;
+    }
     uiLogger.success(lib.configMigrate.handleMigration.success);
     return true;
 }
 async function handleMergeConfigProperties(globalConfig, deprecatedConfig, force) {
-    const { initialConfig, conflicts, } = mergeConfigProperties(globalConfig, deprecatedConfig, force);
+    const { configWithMergedProperties, conflicts, } = mergeConfigProperties(globalConfig, deprecatedConfig, force);
     if (conflicts.length > 0) {
         const properties = conflicts.map(c => c.property);
         const propertyList = properties.length <= 2
@@ -68,15 +78,15 @@ async function handleMergeConfigProperties(globalConfig, deprecatedConfig, force
             const { shouldOverwrite } = await promptUser({
                 name: 'shouldOverwrite',
                 type: 'confirm',
-                message: lib.configMigrate.handleMergeConfigProperties.mergeConfigConflictPrompt(property, newValue.toString(), oldValue.toString()),
+                message: lib.configMigrate.handleMergeConfigProperties.mergeConfigConflictPrompt(property, newValue.toString(), oldValue?.toString() || ''),
             });
             if (shouldOverwrite) {
                 // @ts-expect-error Cannot reconcile CLIConfig_NEW and CLIConfig_DEPRECATED
-                initialConfig[property] = oldValue;
+                configWithMergedProperties[property] = oldValue;
             }
         }
     }
-    return initialConfig;
+    return configWithMergedProperties;
 }
 async function handleAccountNameConflicts(globalConfig, deprecatedConfig, force) {
     if (!deprecatedConfig.portals?.length || !globalConfig.accounts?.length) {
@@ -84,7 +94,7 @@ async function handleAccountNameConflicts(globalConfig, deprecatedConfig, force)
     }
     const accountsWithConflictsToRemove = new Set();
     const renamedAccounts = [];
-    const accountsNotYetInGlobal = deprecatedConfig.portals.filter(portal => portal.portalId &&
+    const accountsNotYetInGlobal = (deprecatedConfig.portals || []).filter(portal => portal.portalId &&
         !globalConfig.accounts?.some(acc => acc.accountId === portal.portalId));
     const accountsWithConflicts = accountsNotYetInGlobal.filter(localAccount => globalConfig.accounts?.some(globalAccount => globalAccount.name === localAccount.name));
     if (accountsWithConflicts.length > 0) {
@@ -120,12 +130,13 @@ async function handleAccountNameConflicts(globalConfig, deprecatedConfig, force)
         }
         deprecatedConfig.portals.push(...renamedAccounts);
     }
-    const cleanedPortals = deprecatedConfig.portals.filter(portal => !accountsWithConflictsToRemove.has(portal));
+    const cleanedPortals = (deprecatedConfig.portals || []).filter(portal => !accountsWithConflictsToRemove.has(portal));
     return { ...deprecatedConfig, portals: cleanedPortals };
 }
-export async function handleMerge(deprecatedConfigPath, force, hideWarning) {
+export async function handleMerge(force, hideWarning) {
+    const deprecatedConfigPath = process.env.HUBSPOT_CONFIG_PATH || getLocalConfigFilePathIfExists();
     if (!hideWarning) {
-        uiLogger.warn(lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || getConfigPath(undefined, false)));
+        uiLogger.warn(lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || ''));
         uiLogger.log('');
     }
     uiLogger.log(lib.configMigrate.handleMerge.description(ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME));
@@ -140,19 +151,32 @@ export async function handleMerge(deprecatedConfigPath, force, hideWarning) {
             return true; // exit with "true" so the user is shown a success message instead of an error
         }
     }
-    const deprecatedConfig = getDeprecatedConfig(deprecatedConfigPath);
-    const globalConfig = getGlobalConfig();
-    if (!deprecatedConfig || !globalConfig) {
+    let deprecatedConfig;
+    let globalConfig;
+    try {
+        deprecatedConfig = getConfigAtPath(deprecatedConfigPath || '');
+        globalConfig = getConfig();
+    }
+    catch (error) {
+        debugError(error);
         return true;
     }
     const mergedConfig = await handleMergeConfigProperties(globalConfig, deprecatedConfig, force);
     const cleanedDeprecatedConfig = await handleAccountNameConflicts(mergedConfig, deprecatedConfig, force);
-    const { skippedAccountIds } = mergeExistingConfigs(mergedConfig, cleanedDeprecatedConfig);
+    const { skippedAccountIds } = mergeConfigAccounts(mergedConfig, cleanedDeprecatedConfig);
     if (skippedAccountIds.length > 0) {
         uiLogger.log('');
         uiLogger.log(lib.configMigrate.handleMerge.skippedExistingAccounts(skippedAccountIds));
         uiLogger.log('');
     }
+    try {
+        archiveConfigAtPath(deprecatedConfigPath);
+    }
+    catch (error) {
+        debugError(error);
+        uiLogger.error(lib.configMigrate.errors.archive(deprecatedConfigPath));
+        return true;
+    }
     uiLogger.success(lib.configMigrate.handleMerge.success);
     return true;
 }

package/lib/configOptions.js

@@ -1,4 +1,4 @@
-import { updateAllowUsageTracking, updateAllowAutoUpdates, updateDefaultCmsPublishMode, updateHttpTimeout, isConfigFlagEnabled, updateAutoOpenBrowser, } from '@hubspot/local-dev-lib/config';
+import { updateAllowUsageTracking, updateAllowAutoUpdates, updateDefaultCmsPublishMode, updateHttpTimeout, updateAutoOpenBrowser, getConfig, } from '@hubspot/local-dev-lib/config';
 import { CMS_PUBLISH_MODE } from '@hubspot/local-dev-lib/constants/files';
 import { commaSeparatedValues } from '@hubspot/local-dev-lib/text';
 import { trackCommandUsage } from './usageTracking.js';
@@ -110,5 +110,6 @@ export async function setAutoOpenBrowser({ accountId, autoOpenBrowser, }) {
         : lib.configOptions.setAutoOpenBrowser.disabled);
 }
 export function isAutoOpenBrowserEnabled() {
-    return isConfigFlagEnabled('autoOpenBrowser', true);
+    const config = getConfig();
+    return config?.autoOpenBrowser !== false; // Default to true
 }

package/lib/constants.d.ts

@@ -139,3 +139,4 @@ export declare const LEGACY_PRIVATE_APP_FILE = "app.json";
 export declare const THEME_FILE = "theme.json";
 export declare const CMS_ASSETS_FILE = "cms-assets.json";
 export declare const LEGACY_CONFIG_FILES: string[];
+export declare const ACCOUNT_LEVEL_CHOICES: readonly ["FREE", "STARTER", "PROFESSIONAL", "ENTERPRISE"];

package/lib/constants.js

@@ -135,3 +135,9 @@ export const LEGACY_CONFIG_FILES = [
     LEGACY_PRIVATE_APP_FILE,
     LEGACY_PUBLIC_APP_FILE,
 ];
+export const ACCOUNT_LEVEL_CHOICES = [
+    'FREE',
+    'STARTER',
+    'PROFESSIONAL',
+    'ENTERPRISE',
+];

package/lib/developerTestAccounts.d.ts

@@ -1,6 +1,6 @@
-import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { FetchDeveloperTestAccountsResponse } from '@hubspot/local-dev-lib/types/developerTestAccounts.js';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
-export declare function getHasDevTestAccounts(appDeveloperAccountConfig: CLIAccount): boolean;
-export declare function validateDevTestAccountUsageLimits(accountConfig: CLIAccount): Promise<FetchDeveloperTestAccountsResponse | null>;
+export declare function getHasDevTestAccounts(appDeveloperAccountConfig: HubSpotConfigAccount): boolean;
+export declare function validateDevTestAccountUsageLimits(accountConfig: HubSpotConfigAccount): Promise<FetchDeveloperTestAccountsResponse | null>;
 export declare function handleDeveloperTestAccountCreateError(err: unknown, accountId: number, env: Environment, portalLimit: number): never;

package/lib/developerTestAccounts.js

@@ -1,6 +1,5 @@
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
-import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getAllConfigAccounts } from '@hubspot/local-dev-lib/config';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { isMissingScopeError, isSpecifiedError, } from '@hubspot/local-dev-lib/errors/index';
 import { uiLogger } from './ui/logger.js';
@@ -9,9 +8,8 @@ import { lib } from '../lang/en.js';
 import { uiAccountDescription } from './ui/index.js';
 import { logError } from './errorHandlers/index.js';
 export function getHasDevTestAccounts(appDeveloperAccountConfig) {
-    const id = getAccountIdentifier(appDeveloperAccountConfig);
-    const parentPortalId = getAccountId(id);
-    const accountsList = getConfigAccounts();
+    const parentPortalId = appDeveloperAccountConfig.accountId;
+    const accountsList = getAllConfigAccounts();
     if (!accountsList) {
         return false;
     }
@@ -25,8 +23,7 @@ export function getHasDevTestAccounts(appDeveloperAccountConfig) {
     return false;
 }
 export async function validateDevTestAccountUsageLimits(accountConfig) {
-    const id = getAccountIdentifier(accountConfig);
-    const accountId = getAccountId(id);
+    const accountId = accountConfig.accountId;
     if (!accountId) {
         return null;
     }

package/lib/doctor/DiagnosticInfoBuilder.d.ts

@@ -44,7 +44,7 @@ export interface DiagnosticInfo extends FilesInfo {
     warningCount?: number;
 }
 export declare class DiagnosticInfoBuilder {
-    accountId: number | null;
+    accountId: number | undefined;
     readonly configSettings: {
         [key: string]: unknown;
     };

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -3,8 +3,8 @@ import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import path from 'path';
 import { pkg } from '../jsonLoader.js';
 import { uiLogger } from '../ui/logger.js';
-import { getAccountId, getDefaultAccountOverrideFilePath, isConfigFlagEnabled, } from '@hubspot/local-dev-lib/config';
-import { getAccountConfig, getConfigPath } from '@hubspot/local-dev-lib/config';
+import { isConfigFlagEnabled, getConfigFilePath, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideFilePath } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { walk } from '@hubspot/local-dev-lib/fs';
 import util from 'util';
@@ -33,15 +33,18 @@ export class DiagnosticInfoBuilder {
     files;
     processInfo;
     constructor(processInfo) {
-        this.accountId = getAccountId();
-        const accountConfig = getAccountConfig(this.accountId);
+        const accountConfig = getConfigDefaultAccountIfExists();
+        this.accountId = accountConfig?.accountId;
         this.configSettings = {
             httpUseLocalhost: isConfigFlagEnabled('httpUseLocalhost'),
         };
         this.env = accountConfig?.env;
         this.authType = accountConfig?.authType;
         this.accountType = accountConfig?.accountType;
-        this.personalAccessKey = accountConfig?.personalAccessKey;
+        this.personalAccessKey =
+            accountConfig && 'personalAccessKey' in accountConfig
+                ? accountConfig.personalAccessKey
+                : undefined;
         this.processInfo = processInfo;
     }
     async generateDiagnosticInfo() {
@@ -58,7 +61,7 @@ export class DiagnosticInfoBuilder {
             platform,
             arch,
             path: mainModule?.path,
-            config: getConfigPath(),
+            config: getConfigFilePath(),
             defaultAccountOverrideFile: getDefaultAccountOverrideFilePath(),
             configSettings: this.configSettings,
             versions: {

package/lib/doctor/Doctor.js

@@ -1,5 +1,6 @@
 import { uiLogger } from '../ui/logger.js';
-import { getAccountId, getCWDAccountOverride, } from '@hubspot/local-dev-lib/config';
+import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideAccountId } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { hasMissingPackages } from '../dependencyManagement.js';
 import { getLatestCliVersion } from '../npm.js';
@@ -25,7 +26,7 @@ export class Doctor {
     diagnosticInfoBuilder;
     constructor(diagnosticInfoBuilder = new DiagnosticInfoBuilder(process)) {
         SpinniesManager.init();
-        this.accountId = getAccountId();
+        this.accountId = getConfigDefaultAccountIfExists()?.accountId ?? null;
         this.diagnosticInfoBuilder = diagnosticInfoBuilder;
     }
     async diagnose() {
@@ -88,7 +89,7 @@ export class Doctor {
             });
             this.diagnosis?.addDefaultAccountOverrideFileSection({
                 type: 'warning',
-                message: lib.doctor.defaultAccountOverrideFileChecks.overrideAccountId(getCWDAccountOverride()),
+                message: lib.doctor.defaultAccountOverrideFileChecks.overrideAccountId(getDefaultAccountOverrideAccountId()),
             });
         }
     }

package/lib/doctor/__tests__/Diagnosis.test.js

@@ -1,8 +1,8 @@
 vi.mock('@hubspot/local-dev-lib/config');
 import { Diagnosis } from '../Diagnosis.js';
-import { getAccountConfig as __getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists as __getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
 import stripAnsi from 'strip-ansi';
-const getAccountConfig = __getAccountConfig;
+const getConfigAccountIfExists = __getConfigAccountIfExists;
 describe('lib/doctor/Diagnosis', () => {
     const diagnosticInfo = {
         account: {},
@@ -31,7 +31,8 @@ describe('lib/doctor/Diagnosis', () => {
     };
     const accountId = 123456;
     beforeEach(() => {
-        getAccountConfig.mockReturnValue({
+        getConfigAccountIfExists.mockReturnValue({
+            accountId,
             accountType: 'STANDARD',
             name: 'Standard Account',
         });

package/lib/doctor/__tests__/DiagnosticInfoBuilder.test.js

@@ -2,6 +2,7 @@ import util from 'util';
 import { vi } from 'vitest';
 vi.mock('@hubspot/local-dev-lib/fs');
 vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('@hubspot/local-dev-lib/config/defaultAccountOverride');
 vi.mock('@hubspot/local-dev-lib/personalAccessKey');
 vi.mock('../../projects/config');
 vi.mock('@hubspot/local-dev-lib/api/projects');
@@ -16,17 +17,19 @@ vi.mock('../../jsonLoader.js', () => {
     };
 });
 import { DiagnosticInfoBuilder, } from '../DiagnosticInfoBuilder.js';
-import { getAccountId as _getAccountId, getAccountConfig as _getAccountConfig, getConfigPath as _getConfigPath, getDefaultAccountOverrideFilePath as _getDefaultAccountOverrideFilePath, isConfigFlagEnabled as _isConfigFlagEnabled, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists as _getConfigAccountIfExists, getConfigAccountById as _getConfigAccountById, getConfigFilePath as _getConfigFilePath, isConfigFlagEnabled as _isConfigFlagEnabled, getConfigDefaultAccountIfExists as _getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideFilePath as _getDefaultAccountOverrideFilePath } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { getAccessToken as _getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { walk as _walk } from '@hubspot/local-dev-lib/fs';
 import { getProjectConfig as _getProjectConfig } from '../../projects/config.js';
 import { fetchProject as _fetchProject } from '@hubspot/local-dev-lib/api/projects';
 const walk = _walk;
 const getAccessToken = _getAccessToken;
-const getAccountConfig = _getAccountConfig;
-const getConfigPath = _getConfigPath;
+const getConfigAccountById = _getConfigAccountById;
+const getConfigAccountIfExists = _getConfigAccountIfExists;
+const getConfigDefaultAccountIfExists = _getConfigDefaultAccountIfExists;
+const getConfigFilePath = _getConfigFilePath;
 const getDefaultAccountOverrideFilePath = _getDefaultAccountOverrideFilePath;
-const getAccountId = _getAccountId;
 const getProjectConfig = _getProjectConfig;
 const isConfigFlagEnabled = _isConfigFlagEnabled;
 const fetchProject = _fetchProject;
@@ -36,6 +39,8 @@ util.promisify = utilPromisify;
 describe('lib/doctor/DiagnosticInfo', () => {
     const accountId = 898989;
     const accountConfig = {
+        name: 'test-account',
+        accountId: accountId,
         env: 'prod',
         authType: 'personalaccesskey',
         accountType: 'STANDARD',
@@ -73,16 +78,19 @@ describe('lib/doctor/DiagnosticInfo', () => {
     const configPath = '/path/to/config';
     const defaultAccountOverrideFile = 'path/to/default/account/override/.hsaccount';
     beforeEach(() => {
-        getAccountId.mockReturnValue(accountId);
-        getAccountConfig.mockReturnValue(accountConfig);
+        getConfigAccountIfExists.mockReturnValue({
+            accountId,
+            name: 'test',
+        });
+        getConfigAccountById.mockReturnValue(accountConfig);
+        getConfigDefaultAccountIfExists.mockReturnValue(accountConfig);
         walk.mockResolvedValue(projectFiles);
         isConfigFlagEnabled.mockReturnValue(false);
         mockPromisifyImpl.mockResolvedValue(npmVersion);
     });
     it('should initialize the required state on creation', () => {
         const builder = new DiagnosticInfoBuilder(processInfo);
-        expect(getAccountId).toHaveBeenCalledTimes(1);
-        expect(getAccountConfig).toHaveBeenCalledTimes(1);
+        expect(getConfigDefaultAccountIfExists).toHaveBeenCalledTimes(1);
         expect(builder.accountId).toEqual(accountId);
         expect(builder.env).toEqual(accountConfig.env);
         expect(builder.authType).toEqual(accountConfig.authType);
@@ -131,7 +139,7 @@ describe('lib/doctor/DiagnosticInfo', () => {
                 data: projectDetails,
             });
             getAccessToken.mockResolvedValue(accessToken);
-            getConfigPath.mockReturnValue(configPath);
+            getConfigFilePath.mockReturnValue(configPath);
             getDefaultAccountOverrideFilePath.mockReturnValue(defaultAccountOverrideFile);
         });
         it('should gather the required data and generate the diagnostic', async () => {

package/lib/doctor/__tests__/Doctor.test.js

@@ -6,6 +6,7 @@ import { HubSpotHttpError } from '@hubspot/local-dev-lib/models/HubSpotHttpError
 import { AxiosError } from 'axios';
 import { isSpecifiedError as _isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { promisify as _promisify } from 'util';
+import { getConfigDefaultAccount as _getConfigDefaultAccount, getConfigDefaultAccountIfExists as _getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 vi.mock('../../ui/logger.js');
 vi.mock('../Diagnosis');
 vi.mock('../../ui/SpinniesManager');
@@ -15,6 +16,7 @@ vi.mock('../../npm');
 vi.mock('@hubspot/local-dev-lib/portManager');
 vi.mock('@hubspot/local-dev-lib/personalAccessKey');
 vi.mock('@hubspot/local-dev-lib/errors/index');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('util');
 const hasMissingPackages = vi.mocked(_hasMissingPackages);
 const isPortManagerPortAvailable = vi.mocked(_isPortManagerPortAvailable);
@@ -23,6 +25,8 @@ const accessTokenForPersonalAccessKey = vi.mocked(_accessTokenForPersonalAccessK
 const authorizedScopesForPortalAndUser = vi.mocked(_authorizedScopesForPortalAndUser);
 const scopesOnAccessToken = vi.mocked(_scopesOnAccessToken);
 const isSpecifiedError = vi.mocked(_isSpecifiedError);
+const getConfigDefaultAccount = vi.mocked(_getConfigDefaultAccount);
+const getConfigDefaultAccountIfExists = vi.mocked(_getConfigDefaultAccountIfExists);
 describe('lib/doctor/Doctor', () => {
     let doctor;
     // @ts-ignore
@@ -57,6 +61,16 @@ describe('lib/doctor/Doctor', () => {
         },
     };
     beforeEach(() => {
+        // Mock config functions
+        const mockAccount = {
+            accountId: 123456,
+            accountType: 'STANDARD',
+            name: 'Test Account',
+            authType: 'personalaccesskey',
+            personalAccessKey: 'test-key',
+        };
+        getConfigDefaultAccount.mockReturnValue(mockAccount);
+        getConfigDefaultAccountIfExists.mockReturnValue(mockAccount);
         doctor = new Doctor({
             generateDiagnosticInfo: vi.fn().mockResolvedValue({
                 ...diagnosticInfo,

package/lib/importData.js

@@ -1,4 +1,4 @@
-import { getAccountConfig, getAccountId, getEnv, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById, getConfigAccountEnvironment, getConfigAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { createImport } from '@hubspot/local-dev-lib/api/crm';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { importDataTestAccountSelectPrompt } from './prompts/importDataTestAccountSelectPrompt.js';
@@ -7,7 +7,7 @@ import { isAppDeveloperAccount, isDeveloperTestAccount, isStandardAccount, } fro
 import { uiLogger } from './ui/logger.js';
 export async function handleImportData(targetAccountId, dataFileNames, importRequest) {
     try {
-        const baseUrl = getHubSpotWebsiteOrigin(getEnv());
+        const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(targetAccountId));
         const response = await createImport(targetAccountId, importRequest, dataFileNames);
         const importId = response.data.id;
         uiLogger.info(lib.importData.viewImportLink(baseUrl, targetAccountId, importId));
@@ -18,19 +18,20 @@ export async function handleImportData(targetAccountId, dataFileNames, importReq
     }
 }
 export async function handleTargetTestAccountSelectionFlow(derivedAccountId, userProvidedAccount) {
-    let targetAccountId = null;
+    let targetAccountId;
+    let testAccount;
     if (userProvidedAccount) {
-        targetAccountId = getAccountId(userProvidedAccount);
+        testAccount = getConfigAccountIfExists(userProvidedAccount);
+        targetAccountId = testAccount?.accountId;
     }
     // Only allow users to pass in test accounts
     if (targetAccountId) {
-        const testAccount = getAccountConfig(targetAccountId);
-        if (!testAccount || !isDeveloperTestAccount(testAccount)) {
+        if (testAccount && !isDeveloperTestAccount(testAccount)) {
             throw new Error(lib.importData.errors.notDeveloperTestAccount);
         }
     }
     else {
-        const targetProjectAccountConfig = getAccountConfig(derivedAccountId);
+        const targetProjectAccountConfig = getConfigAccountById(derivedAccountId);
         if (!targetProjectAccountConfig) {
             throw new Error(lib.importData.errors.noAccountConfig(derivedAccountId));
         }

package/lib/links.js

@@ -1,7 +1,7 @@
 import open from 'open';
-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 { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { uiLogger } from './ui/logger.js';
 import { getTableContents, getTableHeader } from './ui/table.js';
 const COMMON_SITE_LINKS = {
@@ -75,7 +75,7 @@ const COMMON_SITE_LINKS = {
     },
 };
 export function getSiteLinksAsArray(accountId) {
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
     return Object.values(COMMON_SITE_LINKS)
         .sort((a, b) => (a.shortcut < b.shortcut ? -1 : 1))
         .map(l => ({ ...l, url: l.getUrl(accountId, baseUrl) }));
@@ -95,12 +95,12 @@ export function openLink(accountId, shortcut) {
         uiLogger.error(`We couldn't find a shortcut matching ${shortcut}.  Type 'hs open list' to see a list of available shortcuts`);
         return;
     }
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
     open(match.getUrl(accountId, baseUrl), { url: true });
     uiLogger.success(`We opened ${match.getUrl(accountId, baseUrl)} in your browser`);
 }
 export function getProductUpdatesUrl(rolloutId, accountId) {
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(accountId ? getConfigAccountEnvironment(accountId) : ENVIRONMENTS.PROD);
     if (accountId) {
         return `${baseUrl}/product-updates/${accountId}/in-beta?rollout=${rolloutId}`;
     }