@hubspot/cli 8.2.0 → 8.3.0-beta.1

package/api/migrate.js

@@ -23,7 +23,11 @@ function mapPlatformVersionToEnum(platformVersion) {
     if (platformVersion === PLATFORM_VERSIONS.unstable) {
         return PLATFORM_VERSIONS.unstable.toUpperCase();
     }
-    return `V${platformVersion.replace('.', '_')}`;
+    const reformattedPlatformVersion = platformVersion
+        .replaceAll('.', '_')
+        .replaceAll('-', '_')
+        .toUpperCase();
+    return `V${reformattedPlatformVersion}`;
 }
 export async function initializeAppMigration(accountId, applicationId, platformVersion) {
     return http.post(accountId, {

package/commands/account/auth.js

@@ -10,6 +10,7 @@ import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { authenticateNewAccount } from '../../lib/accountAuth.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -35,11 +36,20 @@ async function handler(args) {
         await trackAuthAction('account-auth', authType, TRACKING_STATUS.STARTED);
     }
     handleExit(deleteConfigFileIfEmpty);
-    const updatedConfig = await authenticateNewAccount({
-        env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
-        providedPersonalAccessKey,
-        accountId: parsedUserProvidedAccountId,
-    });
+    let updatedConfig;
+    try {
+        updatedConfig = await authenticateNewAccount({
+            env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
+            providedPersonalAccessKey,
+            accountId: parsedUserProvidedAccountId,
+        });
+    }
+    catch (e) {
+        if (e instanceof PromptExitError) {
+            process.exit(e.exitCode);
+        }
+        throw e;
+    }
     if (!updatedConfig) {
         if (!disableTracking) {
             await trackAuthAction('account-auth', authType, TRACKING_STATUS.ERROR);

package/commands/account/use.js

@@ -7,6 +7,7 @@ import { uiLogger } from '../../lib/ui/logger.js';
 import { selectAccountFromConfig, AUTHENTICATE_NEW_ACCOUNT_VALUE, } from '../../lib/prompts/accountsPrompt.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { authenticateNewAccount } from '../../lib/accountAuth.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 const command = 'use [account]';
 const describe = commands.account.subcommands.use.describe;
@@ -24,10 +25,19 @@ async function handler(args) {
         }
     }
     if (newDefaultAccount === AUTHENTICATE_NEW_ACCOUNT_VALUE) {
-        const updatedConfig = await authenticateNewAccount({
-            env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
-            setAsDefaultAccount: true,
-        });
+        let updatedConfig;
+        try {
+            updatedConfig = await authenticateNewAccount({
+                env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
+                setAsDefaultAccount: true,
+            });
+        }
+        catch (e) {
+            if (e instanceof PromptExitError) {
+                process.exit(e.exitCode);
+            }
+            throw e;
+        }
         if (!updatedConfig) {
             process.exit(EXIT_CODES.ERROR);
         }

package/commands/app/__tests__/migrate.test.js

@@ -89,7 +89,7 @@ describe('commands/app/migrate', () => {
                 }),
                 'platform-version': expect.objectContaining({
                     type: 'string',
-                    default: '2025.2',
+                    default: '2026.03',
                 }),
             }));
         });
@@ -97,7 +97,7 @@ describe('commands/app/migrate', () => {
             await migrateCommand.builder(mockYargs);
             expect(optionsSpy).toHaveBeenCalledWith(expect.objectContaining({
                 'platform-version': expect.objectContaining({
-                    default: '2025.2',
+                    default: '2026.03',
                 }),
             }));
         });

package/commands/app/migrate.js

@@ -8,7 +8,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { migrateApp } from '../../lib/app/migrate.js';
 import { getIsInProject } from '../../lib/projects/config.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-const { v2025_2 } = PLATFORM_VERSIONS;
+const { v2025_2, v2026_03_beta, v2026_03 } = PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = commands.project.migrateApp.describe;
 export function handlerGenerator(commandTrackingName) {
@@ -67,8 +67,8 @@ function appMigrateBuilder(yargs) {
         },
         'platform-version': {
             type: 'string',
-            choices: [v2025_2],
-            default: v2025_2,
+            choices: [v2025_2, v2026_03_beta, v2026_03],
+            default: v2026_03,
         },
         unstable: {
             type: 'boolean',

package/commands/auth.js

@@ -16,6 +16,7 @@ import { authenticateWithOauth } from '../lib/oauth.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { uiFeatureHighlight } from '../lib/ui/index.js';
 import { logError } from '../lib/errorHandlers/index.js';
+import { PromptExitError } from '../lib/errors/PromptExitError.js';
 import { commands } from '../lang/en.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { parseStringToNumber } from '../lib/parsing.js';
@@ -90,18 +91,21 @@ async function handler(args) {
             }
             break;
         case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-            const { personalAccessKey } = providedPersonalAccessKey
-                ? { personalAccessKey: providedPersonalAccessKey }
-                : await personalAccessKeyPrompt({
-                    env,
-                    account: parsedUserProvidedAccountId,
-                });
             try {
+                const { personalAccessKey } = providedPersonalAccessKey
+                    ? { personalAccessKey: providedPersonalAccessKey }
+                    : await personalAccessKeyPrompt({
+                        env,
+                        account: parsedUserProvidedAccountId,
+                    });
                 token = await getAccessToken(personalAccessKey, env);
                 defaultName = token.hubName ? toKebabCase(token.hubName) : undefined;
                 updatedConfig = await updateConfigWithAccessToken(token, personalAccessKey, env);
             }
             catch (e) {
+                if (e instanceof PromptExitError) {
+                    process.exit(e.exitCode);
+                }
                 logError(e);
             }
             if (!updatedConfig) {

package/commands/cms/__tests__/upload.test.js

@@ -8,6 +8,7 @@ import * as modulesLib from '@hubspot/local-dev-lib/cms/modules';
 import * as ignoreRulesLib from '@hubspot/local-dev-lib/ignoreRules';
 import * as themesLib from '@hubspot/local-dev-lib/cms/themes';
 import * as configLib from '@hubspot/local-dev-lib/config';
+import * as handleFieldsJSLib from '@hubspot/local-dev-lib/cms/handleFieldsJS';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import * as errorHandlers from '../../../lib/errorHandlers/index.js';
 import * as commonOpts from '../../../lib/commonOpts.js';
@@ -26,6 +27,7 @@ vi.mock('@hubspot/local-dev-lib/cms/modules');
 vi.mock('@hubspot/local-dev-lib/ignoreRules');
 vi.mock('@hubspot/local-dev-lib/cms/themes');
 vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('@hubspot/local-dev-lib/cms/handleFieldsJS');
 vi.mock('../../../lib/errorHandlers/index.js');
 vi.mock('../../../lib/commonOpts.js');
 vi.mock('../../../lib/prompts/uploadPrompt.js');
@@ -53,6 +55,7 @@ const hasUploadErrorsSpy = vi.spyOn(uploadFolderLib, 'hasUploadErrors');
 const processExitSpy = vi.spyOn(process, 'exit');
 const logErrorSpy = vi.spyOn(errorHandlers, 'logError');
 const getConfigAccountIfExistsSpy = vi.spyOn(configLib, 'getConfigAccountIfExists');
+const isConvertableFieldJsSpy = vi.spyOn(handleFieldsJSLib, 'isConvertableFieldJs');
 describe('commands/cms/upload', () => {
     beforeEach(() => {
         // @ts-expect-error Mock implementation
@@ -67,6 +70,7 @@ describe('commands/cms/upload', () => {
         getThemePreviewUrlSpy.mockReturnValue(undefined);
         // Mock config to prevent reading actual config file in CI
         getConfigAccountIfExistsSpy.mockReturnValue(undefined);
+        isConvertableFieldJsSpy.mockReturnValue(false);
     });
     describe('command', () => {
         it('should have the correct command structure', () => {

package/commands/getStarted.js

@@ -115,7 +115,7 @@ async function handler(args) {
         // 4. Clone the project template from GitHub
         try {
             await cloneGithubRepo(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, projectDest, {
-                sourceDir: '2025.2/private-app-get-started-template',
+                sourceDir: '2026.03/private-app-get-started-template',
                 hideLogs: true,
             });
             await trackCommandMetadataUsage('get-started', {

package/commands/hubdb/clear.js

@@ -1,5 +1,6 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 import { clearHubDbTableRows } from '@hubspot/local-dev-lib/hubdb';
 import { publishTable } from '@hubspot/local-dev-lib/api/hubdb';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.js';
@@ -29,6 +30,9 @@ async function handler(args) {
         }
     }
     catch (e) {
+        if (e instanceof PromptExitError) {
+            process.exit(e.exitCode);
+        }
         logError(e);
     }
 }

package/commands/hubdb/delete.js

@@ -1,5 +1,6 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 import { deleteTable } from '@hubspot/local-dev-lib/api/hubdb';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.js';
@@ -34,6 +35,9 @@ async function handler(args) {
         process.exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
+        if (e instanceof PromptExitError) {
+            process.exit(e.exitCode);
+        }
         uiLogger.error(commands.hubdb.subcommands.delete.errors.delete(args.tableId || ''));
         logError(e);
     }

package/commands/hubdb/fetch.js

@@ -1,5 +1,6 @@
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 import { downloadHubDbTable } from '@hubspot/local-dev-lib/hubdb';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
@@ -22,6 +23,9 @@ async function handler(args) {
         uiLogger.success(commands.hubdb.subcommands.fetch.success.fetch(tableId, filePath));
     }
     catch (e) {
+        if (e instanceof PromptExitError) {
+            process.exit(e.exitCode);
+        }
         logError(e);
     }
 }

package/commands/init.js

@@ -12,6 +12,7 @@ import { setCLILogLevel } from '../lib/commonOpts.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { handleExit } from '../lib/process.js';
 import { debugError, logError } from '../lib/errorHandlers/index.js';
+import { PromptExitError } from '../lib/errors/PromptExitError.js';
 import { trackCommandUsage, trackAuthAction } from '../lib/usageTracking.js';
 import { promptUser } from '../lib/prompts/promptUtils.js';
 import { OAUTH_FLOW, personalAccessKeyPrompt, } from '../lib/prompts/personalAccessKeyPrompt.js';
@@ -150,6 +151,9 @@ async function handler(args) {
         process.exit(EXIT_CODES.SUCCESS);
     }
     catch (err) {
+        if (err instanceof PromptExitError) {
+            process.exit(err.exitCode);
+        }
         logError(err);
         if (!disableTracking) {
             await trackAuthAction('init', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);

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

@@ -50,8 +50,8 @@ describe('commands/project/create', () => {
             expect(optionsCall['platform-version']).toEqual(expect.objectContaining({
                 describe: 'The target platform version for the new project.',
                 type: 'string',
-                choices: ['2025.1', '2025.2', '2026.03-beta'],
-                default: '2025.2',
+                choices: ['2025.1', '2025.2', '2026.03-beta', '2026.03'],
+                default: '2026.03',
             }));
         });
         it('should define project base option with correct choices', () => {

package/commands/project/__tests__/migrate.test.js

@@ -9,7 +9,7 @@ import { uiBetaTag, uiCommandReference } from '../../../lib/ui/index.js';
 vi.mock('../../../lib/app/migrate');
 vi.mock('../../../lib/projects/config');
 vi.mock('../../../lib/ui');
-const { v2025_2 } = PLATFORM_VERSIONS;
+const { v2025_2, v2026_03_beta, v2026_03 } = PLATFORM_VERSIONS;
 describe('commands/project/migrate', () => {
     const yargsMock = yargs;
     const optionsSpy = vi.spyOn(yargsMock, 'option').mockReturnValue(yargsMock);
@@ -48,8 +48,8 @@ describe('commands/project/migrate', () => {
             migrateCommand.builder(yargsMock);
             expect(optionsSpy).toHaveBeenCalledWith('platform-version', {
                 type: 'string',
-                choices: [v2025_2],
-                default: v2025_2,
+                choices: [v2025_2, v2026_03_beta, v2026_03],
+                default: v2026_03,
             });
             expect(optionsSpy).toHaveBeenCalledWith('unstable', {
                 type: 'boolean',

package/commands/project/create.js

@@ -20,7 +20,7 @@ import { updateHsMetaFilesWithAutoGeneratedFields } from '../../lib/projects/com
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 const command = ['create', 'init'];
 const describe = commands.project.create.describe;
-const { v2025_1, v2025_2, v2026_03_beta } = PLATFORM_VERSIONS;
+const { v2025_1, v2025_2, v2026_03_beta, v2026_03 } = PLATFORM_VERSIONS;
 async function handler(args) {
     const { derivedAccountId, platformVersion, templateSource } = args;
     if (templateSource && !templateSource.includes('/')) {
@@ -125,8 +125,8 @@ function projectCreateBuilder(yargs) {
         'platform-version': {
             describe: commands.project.create.options.platformVersion.describe,
             type: 'string',
-            choices: [v2025_1, v2025_2, v2026_03_beta],
-            default: v2025_2,
+            choices: [v2025_1, v2025_2, v2026_03_beta, v2026_03],
+            default: v2026_03,
         },
         'project-base': {
             describe: commands.project.create.options.projectBase.describe,

package/commands/project/dev/index.js

@@ -12,6 +12,7 @@ import { loadProfile } from '../../../lib/projects/projectProfiles.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
+import { PromptExitError } from '../../../lib/errors/PromptExitError.js';
 import path from 'path';
 import { listPrompt } from '../../../lib/prompts/promptUtils.js';
 const command = 'dev';
@@ -99,26 +100,35 @@ async function handler(args) {
         }
     }
     trackCommandUsage('project-dev', {}, targetProjectAccountId);
-    if (isV2Project(projectConfig.platformVersion)) {
-        const targetTestingAccountId = testingAccount
-            ? getConfigAccountIfExists(testingAccount)?.accountId
-            : undefined;
-        await unifiedProjectDevFlow({
-            args,
-            targetProjectAccountId,
-            providedTargetTestingAccountId: targetTestingAccountId,
-            projectConfig,
-            projectDir,
-            profileConfig: profile,
-        });
+    try {
+        if (isV2Project(projectConfig.platformVersion)) {
+            const targetTestingAccountId = testingAccount
+                ? getConfigAccountIfExists(testingAccount)?.accountId
+                : undefined;
+            await unifiedProjectDevFlow({
+                args,
+                targetProjectAccountId,
+                providedTargetTestingAccountId: targetTestingAccountId,
+                projectConfig,
+                projectDir,
+                profileConfig: profile,
+            });
+        }
+        else {
+            await deprecatedProjectDevFlow({
+                args,
+                accountId: targetProjectAccountId,
+                projectConfig,
+                projectDir,
+            });
+        }
     }
-    else {
-        await deprecatedProjectDevFlow({
-            args,
-            accountId: targetProjectAccountId,
-            projectConfig,
-            projectDir,
-        });
+    catch (e) {
+        if (e instanceof PromptExitError) {
+            process.exit(e.exitCode);
+        }
+        logError(e);
+        process.exit(EXIT_CODES.ERROR);
     }
 }
 function projectDevBuilder(yargs) {

package/commands/project/download.js

@@ -3,6 +3,7 @@ import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
 import { downloadProject, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { downloadProjectPrompt } from '../../lib/prompts/downloadProjectPrompt.js';
 import { commands } from '../../lang/en.js';
@@ -19,10 +20,10 @@ async function handler(args) {
         process.exit(EXIT_CODES.ERROR);
     }
     const { dest, build, derivedAccountId } = args;
-    const { project: projectName } = await downloadProjectPrompt(args);
     let buildNumberToDownload = build;
     trackCommandUsage('project-download', undefined, derivedAccountId);
     try {
+        const { project: projectName } = await downloadProjectPrompt(args);
         if (!buildNumberToDownload) {
             const { data: projectBuildsResult } = await fetchProjectBuilds(derivedAccountId, projectName);
             const { results: projectBuilds } = projectBuildsResult;
@@ -45,6 +46,9 @@ async function handler(args) {
         process.exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
+        if (e instanceof PromptExitError) {
+            process.exit(e.exitCode);
+        }
         logError(e, new ApiErrorContext({
             accountId: derivedAccountId,
             request: 'project download',

package/commands/project/migrate.js

@@ -9,11 +9,11 @@ import { commands, lib } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { renderInline } from '../../ui/render.js';
 import { getWarningBox } from '../../ui/components/StatusMessageBoxes.js';
-import { getHasMigratableThemes, migrateThemes2025_2, } from '../../lib/theme/migrate.js';
+import { getHasMigratableThemes, migrateThemesV2, } from '../../lib/theme/migrate.js';
 import { hasFeature } from '../../lib/hasFeature.js';
 import { FEATURES } from '../../lib/constants.js';
 import { trackCommandMetadataUsage, trackCommandUsage, } from '../../lib/usageTracking.js';
-const { v2025_2 } = PLATFORM_VERSIONS;
+const { v2025_2, v2026_03_beta, v2026_03 } = PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = commands.project.migrate.describe;
 async function handler(args) {
@@ -26,8 +26,8 @@ async function handler(args) {
     }
     if (projectConfig?.projectConfig) {
         await renderInline(getWarningBox({
-            title: lib.migrate.projectMigrationWarningTitle,
-            message: lib.migrate.projectMigrationWarning,
+            title: lib.migrate.projectMigrationWarningTitle(platformVersion),
+            message: lib.migrate.projectMigrationWarning(platformVersion),
         }));
     }
     try {
@@ -38,7 +38,7 @@ async function handler(args) {
                 uiLogger.error(commands.project.migrate.errors.noThemeMigrationAccess(derivedAccountId));
                 return process.exit(EXIT_CODES.ERROR);
             }
-            await migrateThemes2025_2(derivedAccountId, {
+            await migrateThemesV2(derivedAccountId, {
                 ...args,
                 platformVersion: unstable
                     ? PLATFORM_VERSIONS.unstable
@@ -67,8 +67,8 @@ function projectMigrateBuilder(yargs) {
     yargs
         .option('platform-version', {
         type: 'string',
-        choices: [v2025_2],
-        default: v2025_2,
+        choices: [v2025_2, v2026_03_beta, v2026_03],
+        default: v2026_03,
     })
         .option('unstable', {
         type: 'boolean',

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

@@ -1,7 +1,6 @@
 import yargs from 'yargs';
 import { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, addTestingOptions, } from '../../../lib/commonOpts.js';
 import sandboxCreateCommand from '../create.js';
-import { hasFeature } from '../../../lib/hasFeature.js';
 import * as sandboxPrompts from '../../../lib/prompts/sandboxesPrompt.js';
 import * as accountNamePrompt from '../../../lib/prompts/accountNamePrompt.js';
 import * as configUtils from '@hubspot/local-dev-lib/config';
@@ -12,7 +11,6 @@ import * as buildAccount from '../../../lib/buildAccount.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 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('@hubspot/local-dev-lib/config');
@@ -29,15 +27,10 @@ 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');
 const hubspotAccountNamePromptSpy = vi.spyOn(accountNamePrompt, 'hubspotAccountNamePrompt');
-const mockedHasFeatureV2Sandboxes = hasFeature;
-const mockedHasFeatureV2Cli = hasFeature;
 describe('commands/sandbox/create', () => {
     const yargsMock = yargs;
     describe('command', () => {
@@ -103,22 +96,10 @@ describe('commands/sandbox/create', () => {
                 contactRecordsSyncPrompt: false,
             });
             validateSandboxUsageLimitsSpy.mockResolvedValue(undefined);
-            mockedHasFeatureV2Sandboxes.mockResolvedValue(false);
-            mockedHasFeatureV2Cli.mockResolvedValue(false);
             getConfigAccountEnvironmentSpy.mockReturnValue(ENVIRONMENTS.PROD);
-            buildSandboxSpy.mockResolvedValue({
-                sandbox: mockSandbox,
-                personalAccessKey: 'mock-personal-access-key',
-                name: sandboxNameFromPrompt,
-            });
             buildV2SandboxSpy.mockResolvedValue({
                 sandbox: { ...mockSandbox, version: 'V2' },
             });
-            getAvailableSyncTypesSpy.mockResolvedValue([
-                { type: 'object-schemas' },
-                { type: 'workflows' },
-            ]);
-            syncSandboxSpy.mockResolvedValue(undefined);
             // Spy on process.exit so our tests don't close when it's called
             // @ts-expect-error Doesn't match the actual signature because then the linter complains about unused variables
             processExitSpy.mockImplementation(() => { });
@@ -167,35 +148,7 @@ describe('commands/sandbox/create', () => {
             });
             expect(promptUserSpy).toHaveBeenCalledTimes(1);
         });
-        it('should build a v1 sandbox if the parent account is not ungated for sandboxes:v2:enabled and not ungated for sandboxes:v2:cliEnabled', async () => {
-            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
-            );
-            expect(getAvailableSyncTypesSpy).toHaveBeenCalledTimes(1);
-            expect(syncSandboxSpy).toHaveBeenCalledTimes(1);
-        });
-        it('should build a v1 sandbox if the parent account is ungated for sandboxes:v2:enabled but not ungated for sandboxes:v2:cliEnabled', async () => {
-            mockedHasFeatureV2Sandboxes.mockResolvedValue(true);
-            mockedHasFeatureV2Cli.mockResolvedValue(false);
-            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
-            );
-            expect(getAvailableSyncTypesSpy).toHaveBeenCalledTimes(1);
-            expect(syncSandboxSpy).toHaveBeenCalledTimes(1);
-        });
-        it('should build a v2 sandbox if the parent account is ungated for both sandboxes:v2:enabled and sandboxes:v2:cliEnabled', async () => {
-            mockedHasFeatureV2Sandboxes.mockResolvedValue(true);
-            mockedHasFeatureV2Cli.mockResolvedValue(true);
+        it('should build a v2 sandbox', async () => {
             await sandboxCreateCommand.handler(args);
             expect(buildV2SandboxSpy).toHaveBeenCalledTimes(1);
             expect(buildV2SandboxSpy).toHaveBeenCalledWith(sandboxNameFromPrompt, {

package/commands/sandbox/create.js

@@ -6,17 +6,14 @@ import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/l
 import { commands, lib } from '../../lang/en.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiFeatureHighlight, uiBetaTag } from '../../lib/ui/index.js';
-import { SANDBOX_TYPE_MAP, getAvailableSyncTypes, SYNC_TYPES, validateSandboxUsageLimits, } from '../../lib/sandboxes.js';
+import { SANDBOX_TYPE_MAP, validateSandboxUsageLimits, } from '../../lib/sandboxes.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { sandboxTypePrompt } from '../../lib/prompts/sandboxesPrompt.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { syncSandbox } from '../../lib/sandboxSync.js';
 import { logError } from '../../lib/errorHandlers/index.js';
-import { buildSandbox, buildV2Sandbox } from '../../lib/buildAccount.js';
+import { buildV2Sandbox } from '../../lib/buildAccount.js';
 import { hubspotAccountNamePrompt } from '../../lib/prompts/accountNamePrompt.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
-import { hasFeature } from '../../lib/hasFeature.js';
-import { FEATURES } from '../../lib/constants.js';
 const command = 'create';
 const describe = uiBetaTag(commands.sandbox.subcommands.create.describe, false);
 async function handler(args) {
@@ -98,38 +95,14 @@ async function handler(args) {
             contactRecordsSyncPromptResult = contactRecordsSyncPrompt;
         }
     }
-    // Check if parent portal is ungated for v2 sandboxes
-    const isUngatedForV2Cli = await hasFeature(derivedAccountId, FEATURES.SANDBOXES_V2_CLI);
-    const isUngatedForV2Sandboxes = await hasFeature(derivedAccountId, FEATURES.SANDBOXES_V2);
-    const canCreateV2Sandbox = isUngatedForV2Sandboxes && isUngatedForV2Cli;
     try {
-        let result;
-        if (canCreateV2Sandbox) {
-            result = await buildV2Sandbox(sandboxName, accountConfig, sandboxType, contactRecordsSyncPromptResult, env, force);
-        }
-        else {
-            result = await buildSandbox(sandboxName, accountConfig, sandboxType, env, force);
-        }
+        const result = await buildV2Sandbox(sandboxName, accountConfig, sandboxType, contactRecordsSyncPromptResult, env, force);
         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));
             process.exit(EXIT_CODES.ERROR);
         }
-        if (result && !canCreateV2Sandbox) {
-            // For v1 sandboxes, keep sync here. Once we migrate to v2, this will be handled by BE automatically
-            try {
-                let availableSyncTasks = await getAvailableSyncTypes(accountConfig, sandboxAccountConfig);
-                if (!contactRecordsSyncPromptResult) {
-                    availableSyncTasks = availableSyncTasks.filter(t => t.type !== SYNC_TYPES.OBJECT_RECORDS);
-                }
-                await syncSandbox(sandboxAccountConfig, accountConfig, env, availableSyncTasks);
-            }
-            catch (err) {
-                logError(err);
-                throw err;
-            }
-        }
         const highlightItems = ['accountsUseCommand', 'projectCreateCommand'];
         if (sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
             highlightItems.push('projectDevCommand');

package/commands/testAccount/create.js

@@ -12,6 +12,7 @@ import { fileExists } from '../../lib/validation.js';
 import { commands } from '../../lang/en.js';
 import { createDeveloperTestAccountConfigPrompt } from '../../lib/prompts/createDeveloperTestAccountConfigPrompt.js';
 import { debugError, logError } from '../../lib/errorHandlers/index.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 import { createDeveloperTestAccountV2, saveAccountToConfig, } from '../../lib/buildAccount.js';
 import { ACCOUNT_LEVEL_CHOICES, ACCOUNT_LEVELS } from '../../lib/constants.js';
@@ -130,6 +131,9 @@ async function handler(args) {
             }
         }
         catch (e) {
+            if (e instanceof PromptExitError) {
+                process.exit(e.exitCode);
+            }
             debugError(e);
             uiLogger.error(commands.testAccount.create.errors.saveAccountToConfigFailure(testAccountConfig.accountName));
             process.exit(EXIT_CODES.ERROR);