@hubspot/cli 7.9.0 → 7.9.1-experimental.0

package/lib/projects/__tests__/projects.test.js

@@ -1,83 +1,54 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { validateProjectConfig } from '../../projects/config.js';
-import { uiLogger } from '../../ui/logger.js';
+import ProjectValidationError from '../../errors/ProjectValidationError.js';
 vi.mock('../../ui/logger.js');
 describe('lib/projects', () => {
     describe('validateProjectConfig()', () => {
         let projectDir;
-        let exitMock;
         beforeAll(() => {
             projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'projects-'));
             fs.mkdirSync(path.join(projectDir, 'src'));
         });
-        beforeEach(() => {
-            // @ts-expect-error - Mocking process.exit
-            exitMock = vi
-                .spyOn(process, 'exit')
-                .mockImplementation(() => undefined);
-        });
-        afterEach(() => {
-            exitMock.mockRestore();
-        });
         it('rejects undefined configuration', () => {
             // @ts-ignore Testing invalid input
-            validateProjectConfig(null, projectDir);
-            expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*Unable to locate a project configuration file. Try running again from a project directory, or run*/));
+            expect(() => validateProjectConfig(null, projectDir)).toThrow(/.*Unable to locate a project configuration file. Try running again from a project directory, or run*/);
         });
         it('rejects configuration with missing name', () => {
             // @ts-ignore Testing invalid input
-            validateProjectConfig({ srcDir: '.' }, projectDir);
-            expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*missing required fields*/));
+            expect(() => validateProjectConfig({ srcDir: '.' }, projectDir)).toThrow(/.*missing required fields*/);
         });
         it('rejects configuration with missing srcDir', () => {
+            expect(() => 
             // @ts-ignore Testing invalid input
-            validateProjectConfig({ name: 'hello' }, projectDir);
-            expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*missing required fields.*/));
+            validateProjectConfig({ name: 'hello' }, projectDir)).toThrow(/.*missing required fields.*/);
         });
         describe('rejects configuration with srcDir outside project directory', () => {
             it('for parent directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: '..', platformVersion: '' }, projectDir);
-                expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('srcDir: ".."'));
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: '..', platformVersion: '' }, projectDir)).toThrow(/srcDir: "\.\."/);
             });
             it('for root directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: '/', platformVersion: '' }, projectDir);
-                expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('srcDir: "/"'));
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: '/', platformVersion: '' }, projectDir)).toThrow(/srcDir: "\/"/);
             });
             it('for complicated directory', () => {
                 const srcDir = './src/././../src/../../src';
-                validateProjectConfig({ name: 'hello', srcDir, platformVersion: '' }, projectDir);
-                expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-                expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining(`srcDir: "${srcDir}"`));
+                expect(() => validateProjectConfig({ name: 'hello', srcDir, platformVersion: '' }, projectDir)).toThrow(ProjectValidationError);
+                expect(() => validateProjectConfig({ name: 'hello', srcDir, platformVersion: '' }, projectDir)).toThrow(/srcDir:/);
             });
         });
         it('rejects configuration with srcDir that does not exist', () => {
-            validateProjectConfig({ name: 'hello', srcDir: 'foo', platformVersion: '' }, projectDir);
-            expect(exitMock).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(/.*could not be found in.*/));
+            expect(() => validateProjectConfig({ name: 'hello', srcDir: 'foo', platformVersion: '' }, projectDir)).toThrow(/.*could not be found in.*/);
         });
         describe('accepts configuration with valid srcDir', () => {
             it('for current directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: '.', platformVersion: '' }, projectDir);
-                expect(exitMock).not.toHaveBeenCalled();
-                expect(uiLogger.error).not.toHaveBeenCalled();
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: '.', platformVersion: '' }, projectDir)).not.toThrow();
             });
             it('for relative directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: './src', platformVersion: '' }, projectDir);
-                expect(exitMock).not.toHaveBeenCalled();
-                expect(uiLogger.error).not.toHaveBeenCalled();
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: './src', platformVersion: '' }, projectDir)).not.toThrow();
             });
             it('for implied relative directory', () => {
-                validateProjectConfig({ name: 'hello', srcDir: 'src', platformVersion: '' }, projectDir);
-                expect(exitMock).not.toHaveBeenCalled();
-                expect(uiLogger.error).not.toHaveBeenCalled();
+                expect(() => validateProjectConfig({ name: 'hello', srcDir: 'src', platformVersion: '' }, projectDir)).not.toThrow();
             });
         });
     });

package/lib/projects/components.js

@@ -1,9 +1,51 @@
 import path from 'path';
 import fs from 'fs';
 import { coerceToValidUid, metafileExtension, } from '@hubspot/project-parsing-lib';
+import { fileExists } from '../validation.js';
 import { uiLogger } from '../ui/logger.js';
 import { AppKey } from '@hubspot/project-parsing-lib/src/lib/constants.js';
 import { lib } from '../../lang/en.js';
+import { debugError } from '../errorHandlers/index.js';
+// Prefix for the metafile extension
+const metafileExtensionPrefix = path.parse(metafileExtension).name;
+function applyDifferentiatorToFilename(filename, differentiator, isHsMetaFile) {
+    const { name, ext, dir } = path.parse(filename);
+    if (isHsMetaFile) {
+        return path.join(dir, `${name.replace(metafileExtensionPrefix, '')}-${differentiator}${metafileExtension}`);
+    }
+    return path.join(dir, `${name}-${differentiator}${ext}`);
+}
+// Generates safe filename differentiators, avoiding collisions with existing filenames
+// E.x. "NewCard.tsx" -> "NewCard-1.tsx"
+function generateSafeFilenameDifferentiator(sourceFiles, hsMetaFiles) {
+    let differentiator = 1;
+    let isDifferentiatorUnique = false;
+    let maxAttempts = 10;
+    while (!isDifferentiatorUnique) {
+        differentiator++;
+        maxAttempts--;
+        try {
+            const isDifferentiatorUniqueForSourceFiles = sourceFiles.every(file => {
+                return !fileExists(applyDifferentiatorToFilename(file, differentiator, false));
+            });
+            const isDifferentiatorUniqueForHsMetaFiles = hsMetaFiles.every(file => {
+                return !fileExists(applyDifferentiatorToFilename(file, differentiator, true));
+            });
+            isDifferentiatorUnique =
+                isDifferentiatorUniqueForSourceFiles &&
+                    isDifferentiatorUniqueForHsMetaFiles;
+        }
+        catch (error) {
+            uiLogger.debug(lib.projects.generateSafeFilenameDifferentiator.failedToCheckFiles);
+            maxAttempts = 0;
+        }
+        // If we've tried too many times, just use a timestamp
+        if (maxAttempts <= 0) {
+            return Date.now();
+        }
+    }
+    return differentiator;
+}
 // Handles a collision between component source files
 export function handleComponentCollision({ dest, src, collisions }) {
     const hsMetaFiles = [];
@@ -20,19 +62,20 @@ export function handleComponentCollision({ dest, src, collisions }) {
             sourceFiles.push(collision);
         }
     });
-    const sourceFilenameMapping = sourceFiles.reduce((acc, filename) => {
-        const { name, ext, dir } = path.parse(filename);
+    const filenameDifferentiator = generateSafeFilenameDifferentiator(sourceFiles, hsMetaFiles);
+    // Exclude markdown files fromthe rename process because they should not be duplicated
+    const sourceFilenameMapping = sourceFiles
+        .filter(filename => !filename.endsWith('.md'))
+        .reduce((acc, filename) => {
         return {
             ...acc,
-            [filename]: path.join(dir, `${name}-${Date.now()}${ext}`),
+            [filename]: applyDifferentiatorToFilename(filename, filenameDifferentiator, false),
         };
     }, {});
-    const metafileExtensionPrefix = path.parse(metafileExtension).name;
     const metaFilenameMapping = hsMetaFiles.reduce((acc, filename) => {
-        const { name, dir } = path.parse(filename);
         return {
             ...acc,
-            [filename]: path.join(dir, `${name.replace(metafileExtensionPrefix, '')}-${Date.now()}${metafileExtension}`),
+            [filename]: applyDifferentiatorToFilename(filename, filenameDifferentiator, true),
         };
     }, {});
     // Update the metafiles that might contain references to the old filenames
@@ -81,22 +124,35 @@ export function updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMetaFile
     uiLogger.log('');
     uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.header);
     for (const hsMetaFile of hsMetaFilePaths) {
-        const component = JSON.parse(fs.readFileSync(hsMetaFile).toString());
-        let uid = coerceToValidUid(`${component.type}-${projectName}`) || component.uid;
-        if (existingUids.includes(uid)) {
-            uid =
-                coerceToValidUid(`${component.type}-${Date.now()}-${projectName}`) ||
-                    component.uid;
+        try {
+            const component = JSON.parse(fs.readFileSync(hsMetaFile).toString());
+            const getBaseUid = () => {
+                const customUid = coerceToValidUid(`${projectName}_${component.type}`);
+                if (customUid) {
+                    return customUid.replace(/-/g, '_');
+                }
+                return component.uid;
+            };
+            let uid = getBaseUid();
+            let differentiator = 1;
+            while (existingUids.includes(uid)) {
+                differentiator++;
+                uid = `${getBaseUid()}_${differentiator}`;
+            }
+            component.uid = uid;
+            if (component.type === AppKey && component.config) {
+                component.config.name = `${projectName}-Application`;
+                uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.applicationLog(component.type, component.uid, component.config.name));
+            }
+            else {
+                uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.componentLog(component.type, component.uid));
+            }
+            fs.writeFileSync(hsMetaFile, JSON.stringify(component, null, 2));
         }
-        component.uid = uid;
-        if (component.type === AppKey && component.config) {
-            component.config.name = `${projectName}-Application`;
-            uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.applicationLog(component.type, component.uid, component.config.name));
-        }
-        else {
-            uiLogger.log(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.componentLog(component.type, component.uid));
+        catch (error) {
+            debugError(error);
+            uiLogger.error(lib.projects.updateHsMetaFilesWithAutoGeneratedFields.failedToUpdate(hsMetaFile));
         }
-        fs.writeFileSync(hsMetaFile, JSON.stringify(component, null, 2));
     }
     uiLogger.log('');
 }

package/lib/projects/config.js

@@ -4,8 +4,8 @@ import findup from 'findup-sync';
 import { getAbsoluteFilePath, getCwd } from '@hubspot/local-dev-lib/path';
 import { PROJECT_CONFIG_FILE } from '../constants.js';
 import { lib } from '../../lang/en.js';
-import { EXIT_CODES } from '../enums/exitCodes.js';
 import { uiLogger } from '../ui/logger.js';
+import ProjectValidationError from '../errors/ProjectValidationError.js';
 export function writeProjectConfig(configPath, config) {
     try {
         fs.ensureFileSync(configPath);
@@ -50,21 +50,17 @@ export async function getProjectConfig(dir) {
 }
 export function validateProjectConfig(projectConfig, projectDir) {
     if (!projectConfig || !projectDir) {
-        uiLogger.error(lib.projects.validateProjectConfig.configNotFound);
-        return process.exit(EXIT_CODES.ERROR);
+        throw new ProjectValidationError(lib.projects.validateProjectConfig.configNotFound);
     }
     if (!projectConfig.name || !projectConfig.srcDir) {
-        uiLogger.error(lib.projects.validateProjectConfig.configMissingFields);
-        return process.exit(EXIT_CODES.ERROR);
+        throw new ProjectValidationError(lib.projects.validateProjectConfig.configMissingFields);
     }
     const resolvedPath = path.resolve(projectDir, projectConfig.srcDir);
     if (!resolvedPath.startsWith(projectDir)) {
         const projectConfigFile = path.relative('.', path.join(projectDir, PROJECT_CONFIG_FILE));
-        uiLogger.error(lib.projects.validateProjectConfig.srcOutsideProjectDir(projectConfigFile, projectConfig.srcDir));
-        return process.exit(EXIT_CODES.ERROR);
+        throw new ProjectValidationError(lib.projects.validateProjectConfig.srcOutsideProjectDir(projectConfigFile, projectConfig.srcDir));
     }
     if (!fs.existsSync(resolvedPath)) {
-        uiLogger.error(lib.projects.validateProjectConfig.srcDirNotFound(projectConfig.srcDir, projectDir));
-        return process.exit(EXIT_CODES.ERROR);
+        throw new ProjectValidationError(lib.projects.validateProjectConfig.srcDirNotFound(projectConfig.srcDir, projectDir));
     }
 }

package/lib/projects/create/__tests__/v2.test.js

@@ -1,12 +1,23 @@
 import { calculateComponentTemplateChoices } from '../v2.js';
 import { hasFeature } from '../../../hasFeature.js';
+import { getConfigAccountById as __getConfigAccountById } from '@hubspot/local-dev-lib/config';
+const getConfigAccountById = __getConfigAccountById;
 vi.mock('../../ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/api/github');
 vi.mock('../../../hasFeature.js');
+vi.mock('@hubspot/local-dev-lib/config');
 const mockHasFeature = vi.mocked(hasFeature);
 describe('lib/projects/create/v2', () => {
     beforeEach(() => {
         mockHasFeature.mockResolvedValue(true);
+        // Mock account config
+        getConfigAccountById.mockReturnValue({
+            accountId: 123,
+            name: 'Test Account',
+            authType: 'personalaccesskey',
+            personalAccessKey: 'test-key',
+            env: 'prod',
+        });
     });
     describe('calculateComponentTemplateChoices()', () => {
         beforeEach(() => {

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/platformVersion.js

@@ -5,6 +5,6 @@ export function isV2Project(platformVersion) {
     if (platformVersion.toLowerCase() === 'unstable') {
         return true;
     }
-    const [year, minor] = platformVersion.split('.');
+    const [year, minor] = platformVersion.split(/[.-]/);
     return Number(year) >= 2025 && Number(minor) >= 2;
 }

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__/createDeveloperTestAccountConfigPrompt.test.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,153 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { createDeveloperTestAccountConfigPrompt } from '../createDeveloperTestAccountConfigPrompt.js';
+import * as promptUtils from '../promptUtils.js';
+vi.mock('../promptUtils.js');
+describe('createDeveloperTestAccountConfigPrompt', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+    });
+    describe('with name and description provided via args', () => {
+        it('should skip name and description prompts when provided', async () => {
+            const mockPromptUser = vi.mocked(promptUtils.promptUser);
+            mockPromptUser.mockResolvedValueOnce({}); // name/description prompts skipped
+            mockPromptUser.mockResolvedValueOnce({
+                useDefaultAccountLevels: 'default',
+            }); // tier selection
+            const result = await createDeveloperTestAccountConfigPrompt({
+                name: 'TestAccount',
+                description: 'Test description',
+            });
+            expect(result).toEqual({
+                accountName: 'TestAccount',
+                description: 'Test description',
+                marketingLevel: 'ENTERPRISE',
+                opsLevel: 'ENTERPRISE',
+                serviceLevel: 'ENTERPRISE',
+                salesLevel: 'ENTERPRISE',
+                contentLevel: 'ENTERPRISE',
+            });
+            expect(mockPromptUser).toHaveBeenCalledTimes(2);
+        });
+    });
+    describe('with tier flags provided', () => {
+        it('should skip tier prompts and use provided values with defaults', async () => {
+            const mockPromptUser = vi.mocked(promptUtils.promptUser);
+            mockPromptUser.mockResolvedValueOnce({}); // name/description prompts skipped
+            const result = await createDeveloperTestAccountConfigPrompt({
+                name: 'TestAccount',
+                description: 'Test',
+                marketingLevel: 'PROFESSIONAL',
+                salesLevel: 'STARTER',
+            });
+            expect(result).toEqual({
+                accountName: 'TestAccount',
+                description: 'Test',
+                marketingLevel: 'PROFESSIONAL',
+                opsLevel: 'ENTERPRISE',
+                serviceLevel: 'ENTERPRISE',
+                salesLevel: 'STARTER',
+                contentLevel: 'ENTERPRISE',
+            });
+            // Should only call promptUser once (for name/description which are skipped)
+            expect(mockPromptUser).toHaveBeenCalledTimes(1);
+        });
+        it('should default unprovided tiers to ENTERPRISE', async () => {
+            const mockPromptUser = vi.mocked(promptUtils.promptUser);
+            mockPromptUser.mockResolvedValueOnce({
+                description: 'Test',
+            }); // description prompt (name provided via args, description not provided)
+            const result = await createDeveloperTestAccountConfigPrompt({
+                name: 'TestAccount',
+                contentLevel: 'FREE',
+            });
+            expect(result).toEqual({
+                accountName: 'TestAccount',
+                description: 'Test',
+                marketingLevel: 'ENTERPRISE',
+                opsLevel: 'ENTERPRISE',
+                serviceLevel: 'ENTERPRISE',
+                salesLevel: 'ENTERPRISE',
+                contentLevel: 'FREE',
+            });
+        });
+    });
+    describe('with no flags provided', () => {
+        it('should prompt for name, description, and tier selection', async () => {
+            const mockPromptUser = vi.mocked(promptUtils.promptUser);
+            // First call: name/description prompts
+            mockPromptUser.mockResolvedValueOnce({
+                accountName: 'PromptedAccount',
+                description: 'Prompted description',
+            });
+            // Second call: tier selection
+            mockPromptUser.mockResolvedValueOnce({
+                useDefaultAccountLevels: 'default',
+            });
+            const result = await createDeveloperTestAccountConfigPrompt({});
+            expect(result).toEqual({
+                accountName: 'PromptedAccount',
+                description: 'Prompted description',
+                marketingLevel: 'ENTERPRISE',
+                opsLevel: 'ENTERPRISE',
+                serviceLevel: 'ENTERPRISE',
+                salesLevel: 'ENTERPRISE',
+                contentLevel: 'ENTERPRISE',
+            });
+            expect(mockPromptUser).toHaveBeenCalledTimes(2);
+        });
+        it('should allow manual tier selection', async () => {
+            const mockPromptUser = vi.mocked(promptUtils.promptUser);
+            mockPromptUser.mockResolvedValueOnce({
+                accountName: 'TestAccount',
+                description: 'Test',
+            }); // name/description
+            mockPromptUser.mockResolvedValueOnce({
+                useDefaultAccountLevels: 'manual',
+            }); // tier choice
+            mockPromptUser.mockResolvedValueOnce({
+                testAccountLevels: [
+                    { hub: 'MARKETING', tier: 'PROFESSIONAL' },
+                    { hub: 'OPS', tier: 'STARTER' },
+                    { hub: 'SERVICE', tier: 'ENTERPRISE' },
+                    { hub: 'SALES', tier: 'FREE' },
+                    { hub: 'CONTENT', tier: 'ENTERPRISE' },
+                ],
+            }); // manual tier selection
+            const result = await createDeveloperTestAccountConfigPrompt({});
+            expect(result).toEqual({
+                accountName: 'TestAccount',
+                description: 'Test',
+                marketingLevel: 'PROFESSIONAL',
+                opsLevel: 'STARTER',
+                serviceLevel: 'ENTERPRISE',
+                salesLevel: 'FREE',
+                contentLevel: 'ENTERPRISE',
+            });
+            expect(mockPromptUser).toHaveBeenCalledTimes(3);
+        });
+    });
+    describe('with only name provided', () => {
+        it('should skip name prompt but show description and tier prompts', async () => {
+            const mockPromptUser = vi.mocked(promptUtils.promptUser);
+            mockPromptUser.mockResolvedValueOnce({
+                description: 'Prompted description',
+            }); // description prompt (name skipped)
+            mockPromptUser.mockResolvedValueOnce({
+                useDefaultAccountLevels: 'default',
+            }); // tier selection
+            const result = await createDeveloperTestAccountConfigPrompt({
+                name: 'TestAccount',
+            });
+            expect(result).toEqual({
+                accountName: 'TestAccount',
+                description: 'Prompted description',
+                marketingLevel: 'ENTERPRISE',
+                opsLevel: 'ENTERPRISE',
+                serviceLevel: 'ENTERPRISE',
+                salesLevel: 'ENTERPRISE',
+                contentLevel: 'ENTERPRISE',
+            });
+            expect(mockPromptUser).toHaveBeenCalledTimes(2);
+        });
+    });
+});