@hubspot/cli 7.9.0 → 7.9.1-experimental.0

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;

package/commands/testAccount/create.js

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
-import { getEnv } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser, listPrompt } from '../../lib/prompts/promptUtils.js';
@@ -14,53 +14,83 @@ import { createDeveloperTestAccountConfigPrompt } from '../../lib/prompts/create
 import { debugError, logError } from '../../lib/errorHandlers/index.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 import { createDeveloperTestAccountV2, saveAccountToConfig, } from '../../lib/buildAccount.js';
+import { ACCOUNT_LEVEL_CHOICES } from '../../lib/constants.js';
 const command = 'create';
 const describe = commands.testAccount.create.describe;
-async function handler(args) {
-    const { derivedAccountId, configPath, formatOutputAsJson } = args;
-    trackCommandUsage('test-account-create', {}, derivedAccountId);
-    const env = getValidEnv(getEnv(derivedAccountId));
-    let accountConfigPath = configPath;
-    let testAccountConfig;
-    if (!accountConfigPath) {
-        const createTestAccountFromConfig = await listPrompt(commands.testAccount.create.createTestAccountFromConfigPrompt, {
-            choices: [
-                {
-                    name: commands.testAccount.create.createFromConfigOption,
-                    value: true,
-                },
-                {
-                    name: commands.testAccount.create.createFromScratchOption,
-                    value: false,
-                },
-            ],
+function hasAnyFlags(args) {
+    const { name, description, marketingLevel, opsLevel, serviceLevel, salesLevel, contentLevel, } = args;
+    return !!(name ||
+        description ||
+        marketingLevel ||
+        opsLevel ||
+        serviceLevel ||
+        salesLevel ||
+        contentLevel);
+}
+async function readConfigFile(configPath) {
+    const absoluteConfigPath = path.resolve(getCwd(), configPath);
+    if (!fileExists(absoluteConfigPath)) {
+        uiLogger.error(commands.testAccount.create.errors.configFileNotFound(absoluteConfigPath));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    try {
+        return JSON.parse(fs.readFileSync(absoluteConfigPath, 'utf8'));
+    }
+    catch (err) {
+        uiLogger.error(commands.testAccount.create.errors.configFileParseFailed(absoluteConfigPath));
+        process.exit(EXIT_CODES.ERROR);
+    }
+}
+async function promptForConfigPath() {
+    const createTestAccountFromConfig = await listPrompt(commands.testAccount.create.createTestAccountFromConfigPrompt, {
+        choices: [
+            {
+                name: commands.testAccount.create.createFromConfigOption,
+                value: true,
+            },
+            {
+                name: commands.testAccount.create.createFromScratchOption,
+                value: false,
+            },
+        ],
+    });
+    if (createTestAccountFromConfig) {
+        const configPathPromptResult = await promptUser({
+            name: 'configPath',
+            message: commands.testAccount.create.configPathPrompt,
+            type: 'input',
         });
-        if (createTestAccountFromConfig) {
-            const configPathPromptResult = await promptUser({
-                name: 'configPath',
-                message: commands.testAccount.create.configPathPrompt,
-                type: 'input',
-            });
-            accountConfigPath = configPathPromptResult.configPath;
-        }
+        return configPathPromptResult.configPath;
     }
-    if (accountConfigPath) {
-        const absoluteConfigPath = path.resolve(getCwd(), accountConfigPath);
-        if (!fileExists(absoluteConfigPath)) {
-            uiLogger.error(commands.testAccount.create.errors.configFileNotFound(absoluteConfigPath));
-            process.exit(EXIT_CODES.ERROR);
-        }
-        try {
-            testAccountConfig = JSON.parse(fs.readFileSync(absoluteConfigPath, 'utf8'));
-        }
-        catch (err) {
-            uiLogger.error(commands.testAccount.create.errors.configFileParseFailed(absoluteConfigPath));
-            process.exit(EXIT_CODES.ERROR);
-        }
+    return undefined;
+}
+async function buildTestAccountConfig(args) {
+    const { configPath, name, description, marketingLevel, opsLevel, serviceLevel, salesLevel, contentLevel, } = args;
+    if (configPath) {
+        return readConfigFile(configPath);
     }
-    else {
-        testAccountConfig = await createDeveloperTestAccountConfigPrompt();
+    let accountConfigPath;
+    if (!hasAnyFlags(args)) {
+        accountConfigPath = await promptForConfigPath();
+    }
+    if (accountConfigPath) {
+        return readConfigFile(accountConfigPath);
     }
+    return createDeveloperTestAccountConfigPrompt({
+        name,
+        description,
+        marketingLevel,
+        opsLevel,
+        serviceLevel,
+        salesLevel,
+        contentLevel,
+    });
+}
+async function handler(args) {
+    const { derivedAccountId, formatOutputAsJson } = args;
+    trackCommandUsage('test-account-create', {}, derivedAccountId);
+    const env = getValidEnv(getConfigAccountEnvironment(derivedAccountId));
+    const testAccountConfig = await buildTestAccountConfig(args);
     const resultJson = {};
     SpinniesManager.init({
         succeedColor: 'white',
@@ -90,7 +120,12 @@ async function handler(args) {
     else {
         // Only save to config if not using json output
         try {
-            await saveAccountToConfig(resultJson.accountId, testAccountConfig.accountName, env, resultJson.personalAccessKey);
+            const savedAccountName = await saveAccountToConfig(resultJson.accountId, testAccountConfig.accountName, env, resultJson.personalAccessKey);
+            // Inform user if the account name was normalized
+            if (savedAccountName !== testAccountConfig.accountName) {
+                uiLogger.log('');
+                uiLogger.info(commands.testAccount.create.savedAccountNameDiffers(testAccountConfig.accountName, savedAccountName));
+            }
         }
         catch (e) {
             debugError(e);
@@ -105,10 +140,65 @@ function createTestAccountBuilder(yargs) {
         type: 'string',
         description: commands.testAccount.create.options.configPath,
     });
+    yargs.option('name', {
+        type: 'string',
+        description: commands.testAccount.create.options.accountName,
+    });
+    yargs.option('description', {
+        type: 'string',
+        description: commands.testAccount.create.options.description,
+    });
+    yargs.option('marketing-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.marketingLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.option('ops-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.opsLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.option('service-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.serviceLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.option('sales-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.salesLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.option('content-level', {
+        type: 'string',
+        description: commands.testAccount.create.options.contentLevel,
+        choices: ACCOUNT_LEVEL_CHOICES,
+    });
+    yargs.conflicts('config-path', [
+        'name',
+        'description',
+        'marketing-level',
+        'ops-level',
+        'service-level',
+        'sales-level',
+        'content-level',
+    ]);
     yargs.example([
+        ['$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 create --config-path ./test-account-config.json',
-            commands.testAccount.create.example('./test-account-config.json'),
+            '$0 test-account create --config-path ./test-account-config.json',
+            'Create from config file (mutually exclusive with other flags)',
         ],
     ]);
     return yargs;

package/commands/testAccount/delete.js

@@ -4,7 +4,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
-import { deleteAccount, getAccountConfig, getAccountId, getConfigPath, loadConfig, updateDefaultAccount, } from '@hubspot/local-dev-lib/config';
+import { removeAccountFromConfig, getConfigAccountById, getConfigAccountIfExists, setConfigAccountAsDefault, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { debugError } from '../../lib/errorHandlers/index.js';
 const command = 'delete [test-account]';
@@ -64,12 +64,12 @@ async function deleteTestAccountFromConfig(testAccountId, parentAccountName, acc
         // If the account isn't in the local config then it wasn't auth'd on the local machine
         if (account && account.name && account.accountType) {
             // If the deleted test account was the default account, replace the default account with the parent account
-            loadConfig(getConfigPath()); // Get updated version of the config
-            const defaultAccountId = getAccountId(); // We need to get the current default accountId before delete the test account
-            await deleteAccount(account.name);
+            const defaultAccount = getConfigDefaultAccountIfExists();
+            const defaultAccountId = defaultAccount?.accountId;
+            removeAccountFromConfig(account.accountId);
             uiLogger.success(commands.testAccount.delete.success.testAccountDeletedFromConfig(testAccountId));
             if (testAccountId === defaultAccountId) {
-                updateDefaultAccount(parentAccountName);
+                setConfigAccountAsDefault(parentAccountName);
                 uiLogger.info(commands.testAccount.delete.info.replaceDefaultAccount(testAccountId, parentAccountName));
             }
         }
@@ -84,12 +84,12 @@ async function validateTestAccountConfigs(testAccountId) {
         uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
-    const testAccountConfig = getAccountConfig(testAccountId);
+    const testAccountConfig = getConfigAccountById(testAccountId);
     if (!testAccountConfig) {
         uiLogger.error(commands.testAccount.delete.errors.testAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
     }
-    const parentAccountConfig = getAccountConfig(testAccountConfig.parentAccountId);
+    const parentAccountConfig = getConfigAccountById(testAccountConfig.parentAccountId);
     if (!parentAccountConfig) {
         uiLogger.error(commands.testAccount.delete.errors.parentAccountNotFound(testAccountId));
         process.exit(EXIT_CODES.ERROR);
@@ -103,7 +103,8 @@ async function handler(args) {
     let testAccountIdToDelete = 0;
     // See if the account exists
     if (testAccount) {
-        const accountId = getAccountId(testAccount);
+        const account = getConfigAccountIfExists(testAccount);
+        const accountId = account?.accountId || null;
         await validateTestAccountConfigs(accountId);
         if (accountId) {
             testAccountIdToDelete = accountId;

package/commands/testAccount/importData.d.ts

@@ -1,6 +1,6 @@
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
 export declare const command = "import-data";
-export declare const describe: "Import data into the CRM";
+export declare const describe: string;
 type CrmImportDataArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     filePath: string | undefined;
     skipConfirm: boolean | undefined;