@hubspot/cli 7.10.0 → 7.10.1-experimental.0

package/lib/projects/localDev/AppDevModeInterface.js

@@ -1,6 +1,6 @@
 import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { fetchAppMetadataByUid, fetchPublicAppProductionInstallCounts, installStaticAuthAppOnTestAccount, } from '@hubspot/local-dev-lib/api/appsDev';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, APP_INSTALLATION_STATES, LOCAL_DEV_SERVER_MESSAGE_TYPES, } from '../../constants.js';
 import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { isAppIRNode } from '../../projects/structure.js';
@@ -67,7 +67,7 @@ class AppDevModeInterface {
         return (this.appNode?.config.auth.type.toLowerCase() === APP_AUTH_TYPES.OAUTH);
     }
     isAutomaticallyInstallable() {
-        const targetTestingAccount = getAccountConfig(this.localDevState.targetTestingAccountId);
+        const targetTestingAccount = getConfigAccountById(this.localDevState.targetTestingAccountId);
         if (!targetTestingAccount) {
             return false;
         }

package/lib/projects/localDev/DevServerManager_DEPRECATED.js

@@ -2,7 +2,7 @@ import { logger } from '@hubspot/local-dev-lib/logger';
 import { DevModeInterface as UIEDevModeInterface } from '@hubspot/ui-extensions-dev-server';
 import { startPortManagerServer, stopPortManagerServer, requestPorts, } from '@hubspot/local-dev-lib/portManager';
 import { getHubSpotApiOrigin, getHubSpotWebsiteOrigin, } from '@hubspot/local-dev-lib/urls';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { ComponentTypes, } from '../../../types/Projects.js';
 import { lib } from '../../../lang/en.js';
 import { uiLogger } from '../../ui/logger.js';
@@ -58,7 +58,7 @@ class DevServerManager_DEPRECATED {
     async setup({ components, onUploadRequired, accountId, setActiveApp, }) {
         this.componentsByType = this.arrangeComponentsByType(components);
         let env;
-        const accountConfig = getAccountConfig(accountId);
+        const accountConfig = getConfigAccountById(accountId);
         if (accountConfig) {
             env = accountConfig.env;
         }

package/lib/projects/localDev/LocalDevLogger.js

@@ -1,5 +1,5 @@
-import { getAccountId, hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
-import { getConfigDefaultAccount } from '@hubspot/local-dev-lib/config';
+import { hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
+import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { uiLogger } from '../../ui/logger.js';
 import { uiLine, uiAccountDescription, uiCommandReference, } from '../../ui/index.js';
 import { lib } from '../../../lang/en.js';
@@ -30,9 +30,9 @@ class LocalDevLogger {
         uiLogger.error(langFunction(e instanceof Error ? e.message : ''));
     }
     getUploadCommand() {
-        const currentDefaultAccount = getConfigDefaultAccount() || undefined;
+        const currentDefaultAccount = getConfigDefaultAccountIfExists();
         return this.state.targetProjectAccountId !==
-            getAccountId(currentDefaultAccount)
+            currentDefaultAccount?.accountId
             ? uiCommandReference(`hs project upload --account=${this.state.targetProjectAccountId}`)
             : uiCommandReference('hs project upload');
     }

package/lib/projects/localDev/LocalDevManager_DEPRECATED.js

@@ -3,7 +3,7 @@ import chokidar from 'chokidar';
 import chalk from 'chalk';
 import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { fetchPublicAppsForPortal, fetchPublicAppProductionInstallCounts, } from '@hubspot/local-dev-lib/api/appsDev';
-import { getAccountId, getConfigDefaultAccount, } from '@hubspot/local-dev-lib/config';
+import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { PROJECT_CONFIG_FILE } from '../../constants.js';
 import SpinniesManager from '../../ui/SpinniesManager.js';
 import DevServerManager_DEPRECATED from './DevServerManager_DEPRECATED.js';
@@ -200,8 +200,8 @@ class LocalDevManager {
         });
     }
     getUploadCommand() {
-        const currentDefaultAccount = getConfigDefaultAccount() || undefined;
-        return this.targetProjectAccountId !== getAccountId(currentDefaultAccount)
+        const currentDefaultAccount = getConfigDefaultAccountIfExists();
+        return this.targetProjectAccountId !== currentDefaultAccount?.accountId
             ? uiCommandReference(`hs project upload --account=${this.targetProjectAccountId}`)
             : uiCommandReference('hs project upload');
     }

package/lib/projects/localDev/helpers/account.d.ts

@@ -1,14 +1,14 @@
-import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
 import { DeveloperTestAccount } from '@hubspot/local-dev-lib/types/developerTestAccounts.js';
 import { ProjectDevTargetAccountPromptResponse } from '../../../prompts/projectDevTargetAccountPrompt.js';
-export declare function confirmDefaultAccountIsTarget(accountConfig: CLIAccount): Promise<void>;
-export declare function checkIfDefaultAccountIsSupported(accountConfig: CLIAccount, hasPublicApps: boolean): Promise<void>;
-export declare function checkIfParentAccountIsAuthed(accountConfig: CLIAccount): void;
-export declare function checkIfAccountFlagIsSupported(accountConfig: CLIAccount, hasPublicApps: boolean): void;
-export declare function suggestRecommendedNestedAccount(accounts: CLIAccount[], accountConfig: CLIAccount, hasPublicApps: boolean): Promise<ProjectDevTargetAccountPromptResponse>;
-export declare function createSandboxForLocalDev(accountId: number, accountConfig: CLIAccount, env: Environment): Promise<number>;
-export declare function createDeveloperTestAccountForLocalDev(accountId: number, accountConfig: CLIAccount, env: Environment, useV2?: boolean): Promise<number>;
+export declare function confirmDefaultAccountIsTarget(accountConfig: HubSpotConfigAccount): Promise<void>;
+export declare function checkIfDefaultAccountIsSupported(accountConfig: HubSpotConfigAccount, hasPublicApps: boolean): Promise<void>;
+export declare function checkIfParentAccountIsAuthed(accountConfig: HubSpotConfigAccount): void;
+export declare function checkIfAccountFlagIsSupported(accountConfig: HubSpotConfigAccount, hasPublicApps: boolean): void;
+export declare function suggestRecommendedNestedAccount(accounts: HubSpotConfigAccount[], accountConfig: HubSpotConfigAccount, hasPublicApps: boolean): Promise<ProjectDevTargetAccountPromptResponse>;
+export declare function createSandboxForLocalDev(accountId: number, accountConfig: HubSpotConfigAccount, env: Environment): Promise<number>;
+export declare function createDeveloperTestAccountForLocalDev(accountId: number, accountConfig: HubSpotConfigAccount, env: Environment, useV2?: boolean): Promise<number>;
 export declare function useExistingDevTestAccount(env: Environment, account: DeveloperTestAccount): Promise<void>;
-export declare function hasSandboxes(account: CLIAccount): Promise<boolean>;
-export declare function selectAccountTypePrompt(accountConfig: CLIAccount): Promise<string | null>;
+export declare function hasSandboxes(account: HubSpotConfigAccount): Promise<boolean>;
+export declare function selectAccountTypePrompt(accountConfig: HubSpotConfigAccount): Promise<string | null>;

package/lib/projects/localDev/helpers/account.js

@@ -1,6 +1,5 @@
 import { HUBSPOT_ACCOUNT_TYPE_STRINGS } from '@hubspot/local-dev-lib/constants/config';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getConfigAccountById, getConfigAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { isMissingScopeError } from '@hubspot/local-dev-lib/errors/index';
@@ -60,8 +59,8 @@ export async function checkIfDefaultAccountIsSupported(accountConfig, hasPublicA
 }
 export function checkIfParentAccountIsAuthed(accountConfig) {
     if (!accountConfig.parentAccountId ||
-        !getAccountConfig(accountConfig.parentAccountId)) {
-        uiLogger.error(lib.localDevHelpers.account.checkIfParentAccountIsAuthed.notAuthedError(accountConfig.parentAccountId || '', uiAccountDescription(getAccountIdentifier(accountConfig))));
+        !getConfigAccountIfExists(accountConfig.parentAccountId)?.accountId) {
+        uiLogger.error(lib.localDevHelpers.account.checkIfParentAccountIsAuthed.notAuthedError(accountConfig.parentAccountId || '', uiAccountDescription(accountConfig.accountId)));
         process.exit(EXIT_CODES.SUCCESS);
     }
 }
@@ -122,11 +121,7 @@ export async function createSandboxForLocalDev(accountId, accountConfig, env) {
         trackCommandMetadataUsage('sandbox-create', { step: 'project-dev' }, accountId);
         const result = await buildSandbox(name, accountConfig, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX, env);
         const targetAccountId = result.sandbox.sandboxHubId;
-        const sandboxAccountConfig = getAccountConfig(result.sandbox.sandboxHubId);
-        if (!sandboxAccountConfig) {
-            uiLogger.error(lib.sandbox.create.developer.failure.generic);
-            process.exit(EXIT_CODES.ERROR);
-        }
+        const sandboxAccountConfig = getConfigAccountById(result.sandbox.sandboxHubId);
         const syncTasks = await getAvailableSyncTypes(accountConfig, sandboxAccountConfig);
         // For v1 sandboxes, keep sync here. Once we migrate to v2, this will be handled by BE automatically
         await syncSandbox(sandboxAccountConfig, accountConfig, env, syncTasks, true);
@@ -190,7 +185,7 @@ export async function useExistingDevTestAccount(env, account) {
     uiLogger.success(lib.developerTestAccount.create.success.configFileUpdated(devTestAcctConfigName, PERSONAL_ACCESS_KEY_AUTH_METHOD.name));
 }
 export async function hasSandboxes(account) {
-    const accountId = getAccountIdentifier(account);
+    const accountId = account.accountId;
     if (!accountId) {
         return false;
     }
@@ -206,7 +201,7 @@ export async function hasSandboxes(account) {
 // Top level prompt to choose the type of account to test on
 export async function selectAccountTypePrompt(accountConfig) {
     const hasAccessToSandboxes = await hasSandboxes(accountConfig);
-    const accountId = getAccountIdentifier(accountConfig);
+    const accountId = accountConfig.accountId;
     const result = await listPrompt(lib.localDevHelpers.account.selectAccountTypePrompt.message, {
         choices: [
             {

package/lib/projects/uieLinting.d.ts

@@ -0,0 +1,33 @@
+export declare const REQUIRED_PACKAGES_AND_MIN_VERSIONS: {
+    readonly eslint: "9.0.0";
+    readonly '@typescript-eslint/eslint-plugin': "8.46.4";
+    readonly '@typescript-eslint/parser': "8.46.4";
+    readonly 'typescript-eslint': "8.46.4";
+    readonly jiti: "2.6.1";
+};
+export declare function isEslintInstalled(directory: string): boolean;
+export declare function areAllLintPackagesInstalled(directory: string): boolean;
+export declare function getMissingLintPackages(directory: string): {
+    missingPackages: string[];
+};
+export declare function hasEslintConfig(directory: string): boolean;
+export declare function hasDeprecatedEslintConfig(directory: string): boolean;
+export declare function getDeprecatedEslintConfigFiles(directory: string): string[];
+export declare function createEslintConfig(directory: string): string;
+export declare function lintPackagesInDirectory(directory: string, projectDir?: string): Promise<{
+    success: boolean;
+    output: string;
+}>;
+export declare function lintPackages(lintLocations?: string[], projectDir?: string): Promise<{
+    success: boolean;
+    results: Array<{
+        location: string;
+        success: boolean;
+        output: string;
+    }>;
+}>;
+export declare function displayLintResults(results: Array<{
+    location: string;
+    success: boolean;
+    output: string;
+}>): void;

package/lib/projects/uieLinting.js

@@ -0,0 +1,222 @@
+import fs from 'fs';
+import path from 'path';
+import util from 'util';
+import semver from 'semver';
+import { exec as execAsync } from 'node:child_process';
+import { getProjectPackageJsonLocations, isPackageInstalled, } from '../dependencyManagement.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../ui/logger.js';
+export const REQUIRED_PACKAGES_AND_MIN_VERSIONS = {
+    eslint: '9.0.0',
+    '@typescript-eslint/eslint-plugin': '8.46.4',
+    '@typescript-eslint/parser': '8.46.4',
+    'typescript-eslint': '8.46.4',
+    jiti: '2.6.1',
+};
+const ESLINT_CONFIG_FILES = [
+    'eslint.config.mts',
+    'eslint.config.ts',
+    'eslint.config.cts',
+    'eslint.config.js',
+    'eslint.config.mjs',
+    'eslint.config.cjs',
+];
+const DEPRECATED_ESLINT_CONFIG_FILES = [
+    '.eslintrc.js',
+    '.eslintrc.cjs',
+    '.eslintrc.yaml',
+    '.eslintrc.yml',
+    '.eslintrc.json',
+    '.eslintrc',
+];
+const ESLINT_CONFIG_TEMPLATE = `import { defineConfig } from "eslint/config";
+import tsParser from "@typescript-eslint/parser";
+
+export default defineConfig([
+  {
+    files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"],
+    languageOptions: {
+      parser: tsParser,
+      parserOptions: {
+        ecmaVersion: "latest",
+        sourceType: "module",
+        ecmaFeatures: {
+          jsx: true
+        }
+      }
+    },
+    rules: {
+      "no-console": ["warn", { allow: ["warn", "error"] }]
+    }
+  },
+]);
+`;
+function getPackageVersionFromPackageJson(directory, packageName) {
+    const packageJsonPath = path.join(directory, 'package.json');
+    try {
+        const packageJsonContent = fs.readFileSync(packageJsonPath, 'utf-8');
+        const packageJson = JSON.parse(packageJsonContent);
+        const version = packageJson.dependencies?.[packageName] ||
+            packageJson.devDependencies?.[packageName];
+        return version || null;
+    }
+    catch (error) {
+        return null;
+    }
+}
+function isPackageVersionValid(directory, packageName) {
+    const versionRange = getPackageVersionFromPackageJson(directory, packageName);
+    if (!versionRange) {
+        return false;
+    }
+    const minimumVersion = REQUIRED_PACKAGES_AND_MIN_VERSIONS[packageName];
+    if (!minimumVersion) {
+        // If no minimum version specified, any version is valid
+        return true;
+    }
+    try {
+        // Check if the version range satisfies the minimum version
+        // For ranges like ^9.0.0, ~8.5.0, >=9.0.0, etc.
+        const minVersionSatisfied = semver.satisfies(minimumVersion, versionRange, {
+            includePrerelease: true,
+        });
+        const coercedVersion = semver.minVersion(versionRange);
+        if (coercedVersion) {
+            return semver.gte(coercedVersion, minimumVersion);
+        }
+        return minVersionSatisfied;
+    }
+    catch (error) {
+        return false;
+    }
+}
+export function isEslintInstalled(directory) {
+    return isPackageInstalled(directory, 'eslint');
+}
+export function areAllLintPackagesInstalled(directory) {
+    return Object.keys(REQUIRED_PACKAGES_AND_MIN_VERSIONS).every(pkg => {
+        const installed = isPackageInstalled(directory, pkg);
+        const validVersion = isPackageVersionValid(directory, pkg);
+        return installed && validVersion;
+    });
+}
+export function getMissingLintPackages(directory) {
+    const missingPackages = [];
+    for (const packageName of Object.keys(REQUIRED_PACKAGES_AND_MIN_VERSIONS)) {
+        const isInstalled = isPackageInstalled(directory, packageName);
+        const isValidVersion = isPackageVersionValid(directory, packageName);
+        if (!isInstalled || !isValidVersion) {
+            missingPackages.push(packageName);
+        }
+    }
+    return { missingPackages };
+}
+export function hasEslintConfig(directory) {
+    return ESLINT_CONFIG_FILES.some(configFile => {
+        const configPath = path.join(directory, configFile);
+        return fs.existsSync(configPath);
+    });
+}
+export function hasDeprecatedEslintConfig(directory) {
+    return DEPRECATED_ESLINT_CONFIG_FILES.some(configFile => {
+        const configPath = path.join(directory, configFile);
+        return fs.existsSync(configPath);
+    });
+}
+export function getDeprecatedEslintConfigFiles(directory) {
+    return DEPRECATED_ESLINT_CONFIG_FILES.filter(configFile => {
+        const configPath = path.join(directory, configFile);
+        return fs.existsSync(configPath);
+    });
+}
+export function createEslintConfig(directory) {
+    const configPath = path.join(directory, 'eslint.config.mts');
+    try {
+        fs.writeFileSync(configPath, ESLINT_CONFIG_TEMPLATE, 'utf-8');
+        return path.relative(process.cwd(), configPath);
+    }
+    catch (error) {
+        uiLogger.error(commands.project.lint.failedToCreateEslintConfig(configPath));
+        throw error;
+    }
+}
+export async function lintPackagesInDirectory(directory, projectDir) {
+    const displayPath = projectDir
+        ? path.relative(projectDir, directory)
+        : directory;
+    const exec = util.promisify(execAsync);
+    const lintCommand = 'npx eslint . --color';
+    try {
+        const { stdout, stderr } = await exec(lintCommand, {
+            cwd: directory,
+            maxBuffer: 10 * 1024 * 1024, // 10MB buffer for large outputs
+        });
+        let output = `\n${displayPath}:\n`;
+        if (stdout && stdout.trim()) {
+            output += stdout;
+        }
+        else {
+            output += '  No linting issues found.\n';
+        }
+        if (stderr && stderr.trim()) {
+            output += stderr;
+        }
+        return { success: true, output };
+    }
+    catch (error) {
+        // ESLint returns exit code 1 when there are linting errors
+        // but still provides useful output in stdout/stderr
+        let output = `\n${displayPath}:\n`;
+        if (error && typeof error === 'object' && 'stdout' in error) {
+            const execError = error;
+            if (execError.stdout) {
+                output += execError.stdout;
+            }
+            if (execError.stderr) {
+                output += execError.stderr;
+            }
+        }
+        return { success: false, output };
+    }
+}
+export async function lintPackages(lintLocations, projectDir) {
+    const locations = lintLocations || (await getProjectPackageJsonLocations());
+    const results = [];
+    for (const location of locations) {
+        const result = await lintPackagesInDirectory(location, projectDir);
+        const displayPath = projectDir
+            ? path.relative(projectDir, location)
+            : location;
+        results.push({ location: displayPath, ...result });
+    }
+    const failedLocations = results.filter(r => !r.success);
+    return {
+        success: failedLocations.length === 0,
+        results,
+    };
+}
+export function displayLintResults(results) {
+    // Display all output
+    results.forEach(r => {
+        uiLogger.log(r.output);
+    });
+    // Summary
+    const failedLocations = results.filter(r => !r.success);
+    const passedLocations = results.filter(r => r.success);
+    uiLogger.log('\n' + '='.repeat(50));
+    if (passedLocations.length > 0) {
+        uiLogger.success(`Linting passed in ${passedLocations.length} ${passedLocations.length === 1 ? 'directory' : 'directories'}:`);
+        passedLocations.forEach(r => {
+            uiLogger.log(`  ✓ ${r.location}`);
+        });
+    }
+    if (failedLocations.length > 0) {
+        if (passedLocations.length > 0) {
+            uiLogger.log('');
+        }
+        uiLogger.error(`Linting failed in ${failedLocations.length} ${failedLocations.length === 1 ? 'directory' : 'directories'}:`);
+        failedLocations.forEach(r => {
+            uiLogger.log(`  ✗ ${r.location}`);
+        });
+    }
+}

package/lib/projects/urls.js

@@ -1,18 +1,17 @@
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
-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';
 function getBaseUrl(accountId) {
-    return getHubSpotWebsiteOrigin(getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    return getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
 }
 function getProjectHomeUrl(accountId) {
     return `${getBaseUrl(accountId)}/developer-projects/${accountId}`;
 }
 export function getProjectComponentDistributionUrl(projectName, componentName, accountId) {
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
     return `${baseUrl}/developer-projects/${accountId}/project/${projectName}/component/${componentName}/distribution`;
 }
 export function getDeveloperOverviewUrl(accountId) {
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
     return `${baseUrl}/developer-overview/${accountId}`;
 }
 export function getProjectDetailUrl(projectName, accountId) {
@@ -38,6 +37,6 @@ export function getLocalDevUiUrl(accountId, showWelcomeScreen) {
     return `${getBaseUrl(accountId)}/developer-projects-local-dev/${accountId}${showWelcomeScreen ? '?welcome' : ''}`;
 }
 export function getAccountHomeUrl(accountId) {
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
     return `${baseUrl}/home?portalId=${accountId}`;
 }

package/lib/prompts/__tests__/downloadProjectPrompt.test.js

@@ -1,4 +1,4 @@
-import { getAccountId } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { fetchProjects } from '@hubspot/local-dev-lib/api/projects';
 import { downloadProjectPrompt } from '../downloadProjectPrompt.js';
 vi.mock('../promptUtils', () => ({
@@ -10,15 +10,17 @@ vi.mock('@hubspot/local-dev-lib/api/projects', () => ({
     }),
 }));
 vi.mock('@hubspot/local-dev-lib/config', () => ({
-    getAccountId: vi.fn().mockImplementation(() => 123456789),
-    configFileExists: vi.fn().mockImplementation(() => true),
+    getConfigAccountIfExists: vi
+        .fn()
+        .mockImplementation(() => ({ accountId: 123456789 })),
+    globalConfigFileExists: vi.fn().mockReturnValue(true),
 }));
 describe('lib/prompts/downloadProjectPrompt', () => {
     it('should honor the account passed as an option', async () => {
         const account = 'Prod';
         await downloadProjectPrompt({ account });
-        expect(getAccountId).toHaveBeenCalledTimes(1);
-        expect(getAccountId).toHaveBeenCalledWith(account);
+        expect(getConfigAccountIfExists).toHaveBeenCalledTimes(1);
+        expect(getConfigAccountIfExists).toHaveBeenCalledWith(account);
     });
     it('should fetch the projects for the correct accountId', async () => {
         const account = 'Prod';

package/lib/prompts/accountNamePrompt.js

@@ -1,4 +1,4 @@
-import { accountNameExistsInConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { promptUser } from './promptUtils.js';
 import { lib } from '../../lang/en.js';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
@@ -17,7 +17,7 @@ export function getCliAccountNamePromptConfig(defaultName) {
             else if (val.indexOf(' ') >= 0) {
                 return lib.prompts.accountNamePrompt.errors.spacesInName;
             }
-            return accountNameExistsInConfig(val)
+            return getConfigAccountIfExists(val)
                 ? lib.prompts.accountNamePrompt.errors.accountNameExists(val)
                 : true;
         },
@@ -54,7 +54,7 @@ export function hubspotAccountNamePrompt({ accountType, currentPortalCount = 0,
                 else if (!val.trim().length) {
                     return lib.prompts.accountNamePrompt.errors.nameRequired;
                 }
-                return accountNameExistsInConfig(val)
+                return getConfigAccountIfExists(val)
                     ? lib.prompts.accountNamePrompt.errors.accountNameExists(val)
                     : true;
             },

package/lib/prompts/accountsPrompt.d.ts

@@ -1 +1 @@
-export declare function selectAccountFromConfig(prompt?: string): Promise<string>;
+export declare function selectAccountFromConfig(prompt?: string): Promise<number>;

package/lib/prompts/accountsPrompt.js

@@ -1,17 +1,16 @@
-import { getConfigDefaultAccount, getConfigAccounts, } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getConfigDefaultAccountIfExists, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
 import { promptUser } from './promptUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiAccountDescription } from '../ui/index.js';
 function mapAccountChoices(portals) {
     return (portals?.map(p => ({
-        name: uiAccountDescription(getAccountIdentifier(p), false),
-        value: String(p.name || getAccountIdentifier(p)),
+        name: uiAccountDescription(p.accountId, false),
+        value: p.accountId,
     })) || []);
 }
 export async function selectAccountFromConfig(prompt = '') {
-    const accountsList = getConfigAccounts();
-    const defaultAccount = getConfigDefaultAccount();
+    const accountsList = getAllConfigAccounts();
+    const defaultAccount = getConfigDefaultAccountIfExists();
     const { default: selectedDefault } = await promptUser([
         {
             type: 'list',
@@ -19,7 +18,7 @@ export async function selectAccountFromConfig(prompt = '') {
             pageSize: 20,
             message: prompt || commands.account.subcommands.use.promptMessage,
             choices: mapAccountChoices(accountsList),
-            default: defaultAccount ?? undefined,
+            default: defaultAccount?.accountId ?? undefined,
         },
     ]);
     return selectedDefault;

package/lib/prompts/confirmImportDataPrompt.js

@@ -1,8 +1,8 @@
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { promptUser } from './promptUtils.js';
 import { lib } from '../../lang/en.js';
 export async function confirmImportDataPrompt(targetAccountId, dataFileNames) {
-    const account = getAccountConfig(targetAccountId);
+    const account = getConfigAccountById(targetAccountId);
     const { confirmImportData } = await promptUser({
         type: 'confirm',
         name: 'confirmImportData',

package/lib/prompts/downloadProjectPrompt.d.ts

@@ -3,6 +3,7 @@ type DownloadProjectPromptResponse = {
 };
 export declare function downloadProjectPrompt(promptOptions: {
     account?: string;
+    derivedAccountId?: number;
     project?: string;
     name?: string;
 }): Promise<DownloadProjectPromptResponse>;

package/lib/prompts/downloadProjectPrompt.js

@@ -1,5 +1,5 @@
 import { promptUser } from './promptUtils.js';
-import { getAccountId } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { fetchProjects } from '@hubspot/local-dev-lib/api/projects';
 import { logError, ApiErrorContext } from '../errorHandlers/index.js';
 import { uiLogger } from '../ui/logger.js';
@@ -20,7 +20,10 @@ async function createProjectsList(accountId) {
     }
 }
 export async function downloadProjectPrompt(promptOptions) {
-    const accountId = getAccountId(promptOptions.account);
+    const account = promptOptions.account
+        ? getConfigAccountIfExists(promptOptions.account)
+        : undefined;
+    const accountId = account?.accountId || promptOptions.derivedAccountId || null;
     const projectsList = await createProjectsList(accountId);
     const response = await promptUser([
         {

package/lib/prompts/importDataTestAccountSelectPrompt.js

@@ -1,10 +1,9 @@
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { promptUser } from './promptUtils.js';
-import { getConfigAccounts } from '@hubspot/local-dev-lib/config';
+import { getAllConfigAccounts } from '@hubspot/local-dev-lib/config';
 import { uiAccountDescription } from '../ui/index.js';
 import { lib } from '../../lang/en.js';
 export async function importDataTestAccountSelectPrompt(parentAccountId) {
-    const accounts = getConfigAccounts();
+    const accounts = getAllConfigAccounts();
     if (!accounts) {
         throw new Error(lib.prompts.importDataTestAccountSelectPrompt.errors.noAccountsFound);
     }
@@ -12,8 +11,8 @@ export async function importDataTestAccountSelectPrompt(parentAccountId) {
         .filter(account => account.parentAccountId === parentAccountId)
         .map(account => {
         return {
-            name: uiAccountDescription(getAccountIdentifier(account)),
-            value: getAccountIdentifier(account),
+            name: uiAccountDescription(account.accountId),
+            value: account.accountId,
         };
     })
         .filter(account => account.value !== undefined && account.name !== undefined);

package/lib/prompts/personalAccessKeyPrompt.js

@@ -1,6 +1,6 @@
 import open from 'open';
 import { OAUTH_SCOPES, DEFAULT_OAUTH_SCOPES, } from '@hubspot/local-dev-lib/constants/auth';
-import { deleteEmptyConfigFile } from '@hubspot/local-dev-lib/config';
+import { deleteConfigFileIfEmpty } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { uiLogger } from '../ui/logger.js';
 import { promptUser } from './promptUtils.js';
@@ -26,7 +26,7 @@ export async function personalAccessKeyPrompt({ env, account, }) {
             PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP,
         ]);
         if (!choice) {
-            deleteEmptyConfigFile();
+            deleteConfigFileIfEmpty();
             process.exit(EXIT_CODES.SUCCESS);
         }
         if (choice ===

package/lib/prompts/projectDevTargetAccountPrompt.d.ts

@@ -1,4 +1,4 @@
-import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { DeveloperTestAccount } from '@hubspot/local-dev-lib/types/developerTestAccounts.js';
 export type ProjectDevTargetAccountPromptResponse = {
     targetAccountId: number | null;
@@ -6,7 +6,7 @@ export type ProjectDevTargetAccountPromptResponse = {
     parentAccountId?: number | null;
     notInConfigAccount?: DeveloperTestAccount | null;
 };
-export declare function selectSandboxTargetAccountPrompt(accounts: CLIAccount[], defaultAccountConfig: CLIAccount): Promise<ProjectDevTargetAccountPromptResponse>;
-export declare function selectDeveloperTestTargetAccountPrompt(accounts: CLIAccount[], defaultAccountConfig: CLIAccount): Promise<ProjectDevTargetAccountPromptResponse>;
+export declare function selectSandboxTargetAccountPrompt(accounts: HubSpotConfigAccount[], defaultAccountConfig: HubSpotConfigAccount): Promise<ProjectDevTargetAccountPromptResponse>;
+export declare function selectDeveloperTestTargetAccountPrompt(accounts: HubSpotConfigAccount[], defaultAccountConfig: HubSpotConfigAccount): Promise<ProjectDevTargetAccountPromptResponse>;
 export declare function confirmDefaultAccountPrompt(accountName: string, accountType: string): Promise<boolean>;
 export declare function confirmUseExistingDeveloperTestAccountPrompt(account: DeveloperTestAccount): Promise<boolean>;