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

package/commands/project/dev/index.js

@@ -1,5 +1,5 @@
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
-import { getAccountId } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiLine } from '../../../lib/ui/index.js';
@@ -10,6 +10,7 @@ import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { loadProfile, exitIfUsingProfiles, } from '../../../lib/projectProfiles.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
+import { logError } from '../../../lib/errorHandlers/index.js';
 const command = 'dev';
 const describe = commands.project.dev.describe;
 function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2) {
@@ -26,7 +27,13 @@ function validateAccountFlags(testingAccount, projectAccount, userProvidedAccoun
 async function handler(args) {
     const { derivedAccountId, userProvidedAccount, testingAccount, projectAccount, } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
-    validateProjectConfig(projectConfig, projectDir);
+    try {
+        validateProjectConfig(projectConfig, projectDir);
+    }
+    catch (error) {
+        logError(error);
+        process.exit(EXIT_CODES.ERROR);
+    }
     const useV2Projects = isV2Project(projectConfig.platformVersion);
     if (!projectDir) {
         uiLogger.error(commands.project.dev.errors.noProjectConfig);
@@ -44,7 +51,8 @@ async function handler(args) {
     let profile;
     // Using the new --projectAccount flag
     if (projectAccount) {
-        targetProjectAccountId = getAccountId(projectAccount);
+        targetProjectAccountId =
+            getConfigAccountIfExists(projectAccount)?.accountId;
         if (targetProjectAccountId) {
             uiLogger.log('');
             uiLogger.log(commands.project.dev.logs.projectAccountFlagExplanation(targetProjectAccountId));
@@ -80,7 +88,9 @@ async function handler(args) {
     }
     trackCommandUsage('project-dev', {}, targetProjectAccountId);
     if (isV2Project(projectConfig.platformVersion)) {
-        const targetTestingAccountId = (testingAccount && getAccountId(testingAccount)) || undefined;
+        const targetTestingAccountId = testingAccount
+            ? getConfigAccountIfExists(testingAccount)?.accountId
+            : undefined;
         await unifiedProjectDevFlow({
             args,
             targetProjectAccountId,

package/commands/project/dev/unifiedFlow.js

@@ -4,8 +4,7 @@ import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { startPortManagerServer, stopPortManagerServer, } from '@hubspot/local-dev-lib/portManager';
 import { isTranslationError } from '@hubspot/project-parsing-lib/src/lib/errors.js';
 import { translateForLocalDev } from '@hubspot/project-parsing-lib';
-import { getEnv, getConfigAccounts, getAccountConfig, } from '@hubspot/local-dev-lib/config';
-import { getValidEnv } from '@hubspot/local-dev-lib/environment';
+import { getConfigAccountEnvironment, getAllConfigAccounts, getConfigAccountById, } from '@hubspot/local-dev-lib/config';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { ensureProjectExists } from '../../../lib/projects/ensureProjectExists.js';
@@ -23,7 +22,7 @@ import LocalDevWebsocketServer from '../../../lib/projects/localDev/LocalDevWebs
 import { confirmLocalDevIsNotRunning } from '../../../lib/projects/localDev/helpers/process.js';
 export async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTargetTestingAccountId, projectConfig, projectDir, }) {
     await confirmLocalDevIsNotRunning();
-    const env = getValidEnv(getEnv(targetProjectAccountId));
+    const env = getConfigAccountEnvironment(targetProjectAccountId);
     let projectNodes;
     let projectProfileData;
     // Get IR
@@ -50,12 +49,12 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         uiLogger.error(commands.project.dev.errors.noRunnableComponents);
         process.exit(EXIT_CODES.SUCCESS);
     }
-    const targetProjectAccountConfig = getAccountConfig(targetProjectAccountId);
+    const targetProjectAccountConfig = getConfigAccountById(targetProjectAccountId);
     if (!targetProjectAccountConfig) {
         uiLogger.error(commands.project.dev.errors.noAccount(targetProjectAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
-    const accounts = getConfigAccounts();
+    const accounts = getAllConfigAccounts();
     const accountIsCombined = await isUnifiedAccount(targetProjectAccountConfig);
     const targetProjectAccountIsTestAccountOrSandbox = isTestAccountOrSandbox(targetProjectAccountConfig);
     if (!accountIsCombined) {

package/commands/project/listBuilds.js

@@ -68,7 +68,13 @@ async function handler(args) {
     let projectName = projectFlagValue;
     if (!projectName) {
         const { projectConfig, projectDir } = await getProjectConfig();
-        validateProjectConfig(projectConfig, projectDir);
+        try {
+            validateProjectConfig(projectConfig, projectDir);
+        }
+        catch (error) {
+            logError(error);
+            process.exit(EXIT_CODES.ERROR);
+        }
         projectName = projectConfig.name;
     }
     try {

package/commands/project/logs.js

@@ -1,6 +1,5 @@
-import { getEnv } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
-import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
 import { logError } from '../../lib/errorHandlers/index.js';
@@ -12,7 +11,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { ProjectLogsManager } from '../../lib/projects/ProjectLogsManager.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 function getPrivateAppsUrl(accountId) {
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
     return `${baseUrl}/private-apps/${accountId}`;
 }
 function logTable(tableHeader, logsInfo) {

package/commands/project/profile/add.js

@@ -1,7 +1,6 @@
 import path from 'path';
 import fs from 'fs';
-import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getConfigAccountIfExists, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
 import { getAllHsProfiles, getHsProfileFilename, loadHsProfileFile, } from '@hubspot/project-parsing-lib';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
@@ -102,9 +101,9 @@ async function handler(args) {
         profileName = promptResponse.name;
     }
     if (targetAccountId) {
-        const accountId = getAccountId(targetAccountId);
-        if (accountId) {
-            targetAccountId = accountId;
+        const account = getConfigAccountIfExists(targetAccountId);
+        if (account) {
+            targetAccountId = account.accountId;
         }
         else {
             uiLogger.error(commands.project.profile.add.errors.invalidTargetAccount);
@@ -113,14 +112,14 @@ async function handler(args) {
         }
     }
     if (!targetAccountId) {
-        const configuredAccounts = getConfigAccounts();
+        const configuredAccounts = getAllConfigAccounts();
         if (!configuredAccounts || !configuredAccounts.length) {
             uiLogger.error(commands.project.profile.add.errors.noAccountsConfigured);
             process.exit(EXIT_CODES.ERROR);
         }
         const promptResponse = await listPrompt(commands.project.profile.add.prompts.targetAccountPrompt, {
             choices: configuredAccounts.map(account => {
-                const accountId = getAccountIdentifier(account);
+                const accountId = account.accountId;
                 return {
                     name: uiAccountDescription(accountId),
                     value: accountId,

package/commands/project/profile/delete.js

@@ -2,7 +2,7 @@ import fs from 'fs';
 import path from 'path';
 import { getAllHsProfiles, getHsProfileFilename, loadHsProfileFile, } from '@hubspot/project-parsing-lib';
 import { fetchProject, deleteProject, } from '@hubspot/local-dev-lib/api/projects';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
@@ -80,7 +80,7 @@ async function handler(args) {
         catch (err) {
             debugError(err);
         }
-        const targetAccountConfig = getAccountConfig(targetAccountId);
+        const targetAccountConfig = getConfigAccountById(targetAccountId);
         if (projectExists &&
             targetAccountConfig &&
             (isDeveloperTestAccount(targetAccountConfig) ||

package/commands/project/upload.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { isV2Project } from '../../lib/projects/platformVersion.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
@@ -20,13 +20,19 @@ async function handler(args) {
     const { forceCreate, message, derivedAccountId, skipValidation, formatOutputAsJson, profile, } = args;
     const jsonOutput = {};
     const { projectConfig, projectDir } = await getProjectConfig();
-    validateProjectConfig(projectConfig, projectDir);
+    try {
+        validateProjectConfig(projectConfig, projectDir);
+    }
+    catch (error) {
+        logError(error);
+        process.exit(EXIT_CODES.ERROR);
+    }
     let targetAccountId;
     if (isV2Project(projectConfig.platformVersion)) {
         targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile);
     }
     targetAccountId = targetAccountId || derivedAccountId;
-    const accountConfig = getAccountConfig(targetAccountId);
+    const accountConfig = getConfigAccountById(targetAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     trackCommandUsage('project-upload', { type: accountType, assetType: projectConfig.platformVersion }, targetAccountId);
     try {

package/commands/project/validate.js

@@ -1,5 +1,5 @@
 import path from 'path';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { isV2Project } from '../../lib/projects/platformVersion.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -23,10 +23,16 @@ async function handler(args) {
         uiLogger.error(commands.project.validate.badVersion);
         process.exit(EXIT_CODES.ERROR);
     }
-    validateProjectConfig(projectConfig, projectDir);
+    try {
+        validateProjectConfig(projectConfig, projectDir);
+    }
+    catch (error) {
+        logError(error);
+        process.exit(EXIT_CODES.ERROR);
+    }
     let targetAccountId = await loadAndValidateProfile(projectConfig, projectDir, profile);
     targetAccountId = targetAccountId || derivedAccountId;
-    const accountConfig = getAccountConfig(targetAccountId);
+    const accountConfig = getConfigAccountById(targetAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     trackCommandUsage('project-validate', { type: accountType }, targetAccountId);
     const srcDir = path.resolve(projectDir, projectConfig.srcDir);

package/commands/project/watch.js

@@ -58,7 +58,13 @@ async function handler(args) {
     const { initialUpload, derivedAccountId } = args;
     trackCommandUsage('project-watch', undefined, derivedAccountId);
     const { projectConfig, projectDir } = await getProjectConfig();
-    validateProjectConfig(projectConfig, projectDir);
+    try {
+        validateProjectConfig(projectConfig, projectDir);
+    }
+    catch (error) {
+        logError(error);
+        process.exit(EXIT_CODES.ERROR);
+    }
     if (!projectConfig || !projectDir) {
         uiLogger.error(commands.project.watch.errors.projectConfigNotFound);
         return process.exit(EXIT_CODES.ERROR);
@@ -67,7 +73,6 @@ async function handler(args) {
         uiLogger.error(projectConfig.platformVersion);
         return process.exit(EXIT_CODES.ERROR);
     }
-    validateProjectConfig(projectConfig, projectDir);
     try {
         const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name);
         const hasNoBuilds = !builds || !builds.length;

package/commands/sandbox/__tests__/create.test.js

@@ -14,6 +14,7 @@ import { uiLogger } from '../../../lib/ui/logger.js';
 import * as sandboxesLib from '../../../lib/sandboxes.js';
 import * as sandboxSync from '../../../lib/sandboxSync.js';
 import { vi } from 'vitest';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 vi.mock('../../../lib/ui/logger.js');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/commonOpts');
@@ -26,12 +27,13 @@ vi.mock('../../../lib/usageTracking');
 vi.mock('../../../lib/buildAccount');
 vi.mock('../../../lib/sandboxes');
 vi.mock('../../../lib/commonOpts');
-const getAccountConfigSpy = vi.spyOn(configUtils, 'getAccountConfig');
+const getConfigAccountByIdSpy = vi.spyOn(configUtils, 'getConfigAccountById');
 const promptUserSpy = vi.spyOn(promptUtils, 'promptUser');
 const sandboxTypePromptSpy = vi.spyOn(sandboxPrompts, 'sandboxTypePrompt');
 const processExitSpy = vi.spyOn(process, 'exit');
 const buildSandboxSpy = vi.spyOn(buildAccount, 'buildSandbox');
 const buildV2SandboxSpy = vi.spyOn(buildAccount, 'buildV2Sandbox');
+const getConfigAccountEnvironmentSpy = vi.spyOn(configUtils, 'getConfigAccountEnvironment');
 const getAvailableSyncTypesSpy = vi.spyOn(sandboxesLib, 'getAvailableSyncTypes');
 const syncSandboxSpy = vi.spyOn(sandboxSync, 'syncSandbox');
 const validateSandboxUsageLimitsSpy = vi.spyOn(sandboxesLib, 'validateSandboxUsageLimits');
@@ -88,7 +90,8 @@ describe('commands/sandbox/create', () => {
             args = {
                 derivedAccountId: 1234567890,
             };
-            getAccountConfigSpy.mockReturnValue({
+            getConfigAccountByIdSpy.mockReturnValue({
+                accountId: 1234567890,
                 accountType: HUBSPOT_ACCOUNT_TYPES.STANDARD,
                 env: 'prod',
             });
@@ -104,6 +107,7 @@ describe('commands/sandbox/create', () => {
             validateSandboxUsageLimitsSpy.mockResolvedValue(undefined);
             mockedHasFeatureV2Sandboxes.mockResolvedValue(false);
             mockedHasFeatureV2Cli.mockResolvedValue(false);
+            getConfigAccountEnvironmentSpy.mockReturnValue(ENVIRONMENTS.PROD);
             buildSandboxSpy.mockResolvedValue({
                 sandbox: mockSandbox,
                 personalAccessKey: 'mock-personal-access-key',
@@ -123,8 +127,8 @@ describe('commands/sandbox/create', () => {
         });
         it('should load the account config for the correct account id', async () => {
             await sandboxCreateCommand.handler(args);
-            expect(getAccountConfigSpy).toHaveBeenCalledTimes(2); // 1st is for parent account, 2nd is for sandbox account
-            expect(getAccountConfigSpy).toHaveBeenCalledWith(args.derivedAccountId);
+            expect(getConfigAccountByIdSpy).toHaveBeenCalledTimes(2); // 1st is for parent account, 2nd is for sandbox account
+            expect(getConfigAccountByIdSpy).toHaveBeenCalledWith(args.derivedAccountId);
         });
         it('should track the command usage', async () => {
             await sandboxCreateCommand.handler(args);
@@ -135,6 +139,7 @@ describe('commands/sandbox/create', () => {
             await sandboxCreateCommand.handler(args);
             expect(validateSandboxUsageLimitsSpy).toHaveBeenCalledTimes(1);
             expect(validateSandboxUsageLimitsSpy).toHaveBeenCalledWith({
+                accountId: 1234567890,
                 accountType: HUBSPOT_ACCOUNT_TYPES.STANDARD,
                 env: 'prod',
             }, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX, 'prod');
@@ -168,6 +173,7 @@ describe('commands/sandbox/create', () => {
             await sandboxCreateCommand.handler(args);
             expect(buildSandboxSpy).toHaveBeenCalledTimes(1);
             expect(buildSandboxSpy).toHaveBeenCalledWith(sandboxNameFromPrompt, {
+                accountId: 1234567890,
                 accountType: HUBSPOT_ACCOUNT_TYPES.STANDARD,
                 env: 'prod',
             }, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX, 'prod', undefined // force
@@ -181,6 +187,7 @@ describe('commands/sandbox/create', () => {
             await sandboxCreateCommand.handler(args);
             expect(buildSandboxSpy).toHaveBeenCalledTimes(1);
             expect(buildSandboxSpy).toHaveBeenCalledWith(sandboxNameFromPrompt, {
+                accountId: 1234567890,
                 accountType: HUBSPOT_ACCOUNT_TYPES.STANDARD,
                 env: 'prod',
             }, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX, 'prod', undefined // force
@@ -194,6 +201,7 @@ describe('commands/sandbox/create', () => {
             await sandboxCreateCommand.handler(args);
             expect(buildV2SandboxSpy).toHaveBeenCalledTimes(1);
             expect(buildV2SandboxSpy).toHaveBeenCalledWith(sandboxNameFromPrompt, {
+                accountId: 1234567890,
                 accountType: HUBSPOT_ACCOUNT_TYPES.STANDARD,
                 env: 'prod',
             }, HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX, false, // syncObjectRecords
@@ -222,7 +230,8 @@ describe('commands/sandbox/create', () => {
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
         it('should error out if the default account type is not standard', async () => {
-            getAccountConfigSpy.mockReturnValue({
+            getConfigAccountByIdSpy.mockReturnValue({
+                accountId: 1234567890,
                 accountType: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
                 env: 'prod',
             });

package/commands/sandbox/create.js

@@ -1,9 +1,8 @@
-import { getAccountConfig, getEnv } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById, getConfigAccountEnvironment, } from '@hubspot/local-dev-lib/config';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { isMissingScopeError } from '@hubspot/local-dev-lib/errors/index';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
-import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { commands, lib } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiFeatureHighlight, uiBetaTag } from '../../lib/ui/index.js';
@@ -22,8 +21,8 @@ const command = 'create';
 const describe = uiBetaTag(commands.sandbox.subcommands.create.describe, false);
 async function handler(args) {
     const { name, type, force, derivedAccountId } = args;
-    const accountConfig = getAccountConfig(derivedAccountId);
-    const env = getValidEnv(getEnv(derivedAccountId));
+    const accountConfig = getConfigAccountById(derivedAccountId);
+    const env = getConfigAccountEnvironment(derivedAccountId);
     trackCommandUsage('sandbox-create', {}, derivedAccountId);
     // Check if account config exists
     if (!accountConfig) {
@@ -111,7 +110,7 @@ async function handler(args) {
         else {
             result = await buildSandbox(sandboxName, accountConfig, sandboxType, env, force);
         }
-        const sandboxAccountConfig = getAccountConfig(result.sandbox.sandboxHubId);
+        const sandboxAccountConfig = getConfigAccountById(result.sandbox.sandboxHubId);
         // Check if sandbox account config exists
         if (!sandboxAccountConfig) {
             uiLogger.error(commands.sandbox.subcommands.create.failure.noSandboxAccountConfig(result.sandbox.sandboxHubId));

package/commands/sandbox/delete.js

@@ -1,8 +1,7 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { deleteSandbox } from '@hubspot/local-dev-lib/api/sandboxHubs';
-import { getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, getAccountId, getConfigAccounts, } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getConfigAccountEnvironment, removeAccountFromConfig, setConfigAccountAsDefault, getAllConfigAccounts, getConfigAccountIfExists, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
@@ -36,17 +35,20 @@ async function handler(args) {
             process.exit(EXIT_CODES.ERROR);
         }
     }
-    const sandboxAccountId = getAccountId(userProvidedAccount || accountPrompt.account);
-    if (!sandboxAccountId) {
+    const accountIdentifier = userProvidedAccount || accountPrompt.account;
+    const sandboxAccount = getConfigAccountIfExists(accountIdentifier);
+    if (!sandboxAccount) {
         uiLogger.error(commands.sandbox.subcommands.delete.failure.noSandboxAccountId);
         process.exit(EXIT_CODES.ERROR);
     }
-    const isDefaultAccount = sandboxAccountId === getAccountId();
-    const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getEnv(sandboxAccountId)));
+    const sandboxAccountId = sandboxAccount.accountId;
+    const defaultAccount = getConfigDefaultAccountIfExists();
+    const isDefaultAccount = sandboxAccountId === defaultAccount?.accountId;
+    const baseUrl = getHubSpotWebsiteOrigin(getValidEnv(getConfigAccountEnvironment(sandboxAccountId)));
     let parentAccountId;
-    const accountsList = getConfigAccounts() || [];
+    const accountsList = getAllConfigAccounts() || [];
     for (const portal of accountsList) {
-        if (getAccountIdentifier(portal) === sandboxAccountId) {
+        if (portal.accountId === sandboxAccountId) {
             if (portal.parentAccountId) {
                 parentAccountId = portal.parentAccountId;
             }
@@ -56,7 +58,8 @@ async function handler(args) {
                     uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
                     process.exit(EXIT_CODES.ERROR);
                 }
-                parentAccountId = getAccountId(parentAccountPrompt.account);
+                const parentAccount = getConfigAccountIfExists(parentAccountPrompt.account);
+                parentAccountId = parentAccount?.accountId;
             }
             else {
                 uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentAccount);
@@ -67,9 +70,9 @@ async function handler(args) {
     const url = `${baseUrl}/sandboxes/${parentAccountId}`;
     const command = uiAuthCommandReference({
         accountId: parentAccountId || undefined,
-        qa: getEnv(sandboxAccountId) === 'qa',
+        qa: getConfigAccountEnvironment(sandboxAccountId) === 'qa',
     });
-    if (parentAccountId && !getAccountId(parentAccountId)) {
+    if (parentAccountId && !getConfigAccountIfExists(parentAccountId)) {
         uiLogger.log('');
         uiLogger.error(commands.sandbox.subcommands.delete.failure.noParentPortalAvailable(command, url));
         uiLogger.log('');
@@ -99,14 +102,14 @@ async function handler(args) {
             ? commands.sandbox.subcommands.delete.success.deleteDefault(userProvidedAccount || accountPrompt.account, sandboxAccountId)
             : commands.sandbox.subcommands.delete.success.delete(userProvidedAccount || accountPrompt.account, sandboxAccountId));
         uiLogger.log('');
-        const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
-        if (promptDefaultAccount && !force) {
+        removeAccountFromConfig(sandboxAccountId);
+        if (isDefaultAccount && !force) {
             const newDefaultAccount = await selectAccountFromConfig();
-            updateDefaultAccount(newDefaultAccount);
+            setConfigAccountAsDefault(newDefaultAccount);
         }
         else if (isDefaultAccount && force) {
             // If force is specified, skip prompt and set the parent account id as the default account
-            updateDefaultAccount(parentAccountId);
+            setConfigAccountAsDefault(parentAccountId);
         }
         process.exit(EXIT_CODES.SUCCESS);
     }
@@ -135,14 +138,14 @@ async function handler(args) {
             uiLogger.log('');
             uiLogger.warn(commands.sandbox.subcommands.delete.failure.objectNotFound(sandboxAccountId));
             uiLogger.log('');
-            const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
-            if (promptDefaultAccount && !force) {
+            removeAccountFromConfig(sandboxAccountId);
+            if (isDefaultAccount && !force) {
                 const newDefaultAccount = await selectAccountFromConfig();
-                updateDefaultAccount(newDefaultAccount);
+                setConfigAccountAsDefault(newDefaultAccount);
             }
-            else {
+            else if (isDefaultAccount) {
                 // If force is specified, skip prompt and set the parent account id as the default account
-                updateDefaultAccount(parentAccountId);
+                setConfigAccountAsDefault(parentAccountId);
             }
             process.exit(EXIT_CODES.SUCCESS);
         }

package/commands/testAccount/__tests__/create.test.js

@@ -1,6 +1,7 @@
 import yargs from 'yargs';
 import { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, addJSONOutputOptions, } from '../../../lib/commonOpts.js';
 import testAccountCreateCommand from '../create.js';
+import { ACCOUNT_LEVEL_CHOICES } from '../../../lib/constants.js';
 vi.mock('../../../lib/commonOpts');
 describe('commands/testAccount/create', () => {
     const yargsMock = yargs;
@@ -29,5 +30,72 @@ describe('commands/testAccount/create', () => {
             expect(addJSONOutputOptions).toHaveBeenCalledTimes(1);
             expect(addJSONOutputOptions).toHaveBeenCalledWith(yargsMock);
         });
+        it('should add account-name option', () => {
+            testAccountCreateCommand.builder(yargsMock);
+            expect(yargsMock.option).toHaveBeenCalledWith('name', {
+                type: 'string',
+                description: 'Name for the test account',
+            });
+        });
+        it('should add description option', () => {
+            testAccountCreateCommand.builder(yargsMock);
+            expect(yargsMock.option).toHaveBeenCalledWith('description', {
+                type: 'string',
+                description: 'Description for the test account',
+            });
+        });
+        it('should add hub level options', () => {
+            testAccountCreateCommand.builder(yargsMock);
+            expect(yargsMock.option).toHaveBeenCalledWith('marketing-level', {
+                type: 'string',
+                description: 'Marketing Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('ops-level', {
+                type: 'string',
+                description: 'Operations Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('service-level', {
+                type: 'string',
+                description: 'Service Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('sales-level', {
+                type: 'string',
+                description: 'Sales Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+            expect(yargsMock.option).toHaveBeenCalledWith('content-level', {
+                type: 'string',
+                description: 'CMS Hub tier. Options: FREE, STARTER, PROFESSIONAL, ENTERPRISE',
+                choices: ACCOUNT_LEVEL_CHOICES,
+            });
+        });
+        it('should add examples for all usage scenarios', () => {
+            testAccountCreateCommand.builder(yargsMock);
+            expect(yargsMock.example).toHaveBeenCalledWith([
+                [
+                    '$0 test-account create',
+                    'Interactive mode - prompts for all options',
+                ],
+                [
+                    '$0 test-account create --name "MyTestAccount"',
+                    'Provide name via flag, prompt for description and tier selection',
+                ],
+                [
+                    '$0 test-account create --name "MyTestAccount" --description "Test account"',
+                    'Provide name and description, prompt for tier selection',
+                ],
+                [
+                    '$0 test-account create --name "MyTestAccount" --marketing-level PROFESSIONAL',
+                    'Specify marketing tier, other tiers default to ENTERPRISE',
+                ],
+                [
+                    '$0 test-account create --config-path ./test-account-config.json',
+                    'Create from config file (mutually exclusive with other flags)',
+                ],
+            ]);
+        });
     });
 });

package/commands/testAccount/create.d.ts

@@ -1,6 +1,14 @@
+import { AccountLevel } from '@hubspot/local-dev-lib/types/developerTestAccounts.js';
 import { CommonArgs, ConfigArgs, AccountArgs, TestingArgs, YargsCommandModule, EnvironmentArgs, JSONOutputArgs } from '../../types/Yargs.js';
 type CreateTestAccountArgs = CommonArgs & AccountArgs & ConfigArgs & TestingArgs & EnvironmentArgs & JSONOutputArgs & {
     configPath?: string;
+    name?: string;
+    description?: string;
+    marketingLevel?: AccountLevel;
+    opsLevel?: AccountLevel;
+    serviceLevel?: AccountLevel;
+    salesLevel?: AccountLevel;
+    contentLevel?: AccountLevel;
 };
 declare const createTestAccountCommand: YargsCommandModule<unknown, CreateTestAccountArgs>;
 export default createTestAccountCommand;