@hubspot/cli 8.0.10-experimental.1 → 8.0.10-experimental.3

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/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__/watch.test.js

@@ -64,7 +64,6 @@ describe('commands/cms/watch', () => {
             expect(positionalSpy).toHaveBeenCalledWith('dest', expect.objectContaining({ type: 'string' }));
             expect(optionSpy).toHaveBeenCalledWith('remove', expect.objectContaining({ type: 'boolean', alias: 'r' }));
             expect(optionSpy).toHaveBeenCalledWith('initial-upload', expect.objectContaining({ type: 'boolean', alias: 'i' }));
-            expect(optionSpy).toHaveBeenCalledWith('disable-initial', expect.objectContaining({ type: 'boolean' }));
             expect(optionSpy).toHaveBeenCalledWith('notify', expect.objectContaining({ type: 'string', alias: 'n' }));
             expect(optionSpy).toHaveBeenCalledWith('convert-fields', expect.objectContaining({ type: 'boolean' }));
         });
@@ -78,7 +77,6 @@ describe('commands/cms/watch', () => {
                 derivedAccountId: 123456,
                 remove: false,
                 initialUpload: false,
-                disableInitial: false,
             };
             statSyncSpy.mockReturnValue({
                 isFile: () => false,
@@ -134,7 +132,6 @@ describe('commands/cms/watch', () => {
             });
             it('should start watching without initial upload by default', async () => {
                 await watchCommand.handler(args);
-                expect(uiLogger.info).toHaveBeenCalledWith(expect.stringContaining('not'));
                 expect(getUploadableFileListSpy).not.toHaveBeenCalled();
                 expect(watchSpy).toHaveBeenCalledWith(123456, path.resolve('/test/cwd', 'src'), '/dest', expect.objectContaining({
                     cmsPublishMode: 'publish',
@@ -152,11 +149,6 @@ describe('commands/cms/watch', () => {
                     filePaths: ['file1.js', 'file2.js'],
                 }), null, expect.any(Function), undefined, expect.any(Function));
             });
-            it('should show disable initial message when disableInitial is true', async () => {
-                args.disableInitial = true;
-                await watchCommand.handler(args);
-                expect(uiLogger.info).toHaveBeenCalledWith(expect.stringContaining('disable'));
-            });
             it('should pass remove option to watch', async () => {
                 args.remove = true;
                 await watchCommand.handler(args);

package/commands/cms/function/logs.js

@@ -35,6 +35,7 @@ const endpointLog = async (accountId, functionPath, options) => {
             }
         };
         await tailLogs(accountId, functionPath, fetchLatest, tailCall, compact);
+        process.exit(EXIT_CODES.SUCCESS);
     }
     else if (latest) {
         try {

package/commands/cms/theme/preview.js

@@ -3,9 +3,7 @@ import path from 'path';
 import { commands } from '../../../lang/en.js';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { getThemeJSONPath } from '@hubspot/local-dev-lib/cms/themes';
-// Use subprocess approach to avoid React version conflicts
-// import { createDevServer } from '@hubspot/cms-dev-server';
-import { spawnDevServer } from '../../../lib/cms/devServerProcess.js';
+import { spawnDevServer } from '../../../lib/theme/cmsDevServerProcess.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { previewPrompt, previewProjectPrompt, } from '../../../lib/prompts/previewPrompt.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
@@ -74,7 +72,7 @@ async function handler(args) {
     trackCommandUsage('preview', {}, derivedAccountId);
     // Spawn dev server in isolated subprocess to avoid React version conflicts
     // File listing and progress bars are handled within the subprocess
-    spawnDevServer({
+    await spawnDevServer({
         absoluteSrc,
         accountName: derivedAccountId?.toString(),
         noSsl,

package/commands/cms/watch.d.ts

@@ -5,7 +5,6 @@ export type WatchCommandArgs = ConfigArgs & AccountArgs & EnvironmentArgs & Comm
     fieldOptions?: string[];
     remove?: boolean;
     initialUpload?: boolean;
-    disableInitial?: boolean;
     notify?: string;
     convertFields?: boolean;
     saveOutput?: boolean;

package/commands/cms/watch.js

@@ -15,7 +15,7 @@ import { uiLogger } from '../../lib/ui/logger.js';
 const command = 'watch [src] [dest]';
 const describe = commands.cms.subcommands.watch.describe;
 const handler = async (args) => {
-    const { remove, initialUpload, disableInitial, notify, derivedAccountId } = args;
+    const { remove, initialUpload, notify, derivedAccountId } = args;
     if (!validateCmsPublishMode(args)) {
         process.exit(EXIT_CODES.ERROR);
     }
@@ -40,13 +40,6 @@ const handler = async (args) => {
         return;
     }
     let filesToUpload = [];
-    if (disableInitial) {
-        uiLogger.info(commands.cms.subcommands.watch.warnings.disableInitial);
-    }
-    else if (!initialUpload) {
-        uiLogger.info(commands.cms.subcommands.watch.warnings.notUploaded(src));
-        uiLogger.info(commands.cms.subcommands.watch.warnings.initialUpload);
-    }
     if (initialUpload) {
         filesToUpload = await getUploadableFileList(absoluteSrcPath, args.convertFields);
     }
@@ -99,6 +92,7 @@ function watchBuilder(yargs) {
         describe: commands.cms.subcommands.watch.options.initialUpload,
         type: 'boolean',
     });
+    // TODO: remove this before the next major release
     yargs.option('disable-initial', {
         describe: commands.cms.subcommands.watch.options.disableInitial,
         type: 'boolean',

package/commands/feedback.js

@@ -4,7 +4,7 @@ import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { commands } from '../lang/en.js';
 import { uiLogger } from '../lib/ui/logger.js';
-const FEEDBACK_URL = 'https://developers.hubspot.com/feedback';
+import { FEEDBACK_URL } from '../lib/constants.js';
 const command = 'feedback';
 const describe = commands.project.feedback.describe;
 async function handler() {

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/mcp/__tests__/start.test.js

@@ -7,14 +7,20 @@ import * as errorHandlers from '../../../lib/errorHandlers/index.js';
 import * as usageTrackingLib from '../../../lib/usageTracking.js';
 import * as processLib from '../../../lib/process.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import startCommand from '../start.js';
+// Create a mock execAsync function before importing the module
+const execAsyncMock = vi.fn();
 vi.mock('yargs');
 vi.mock('../../../lib/commonOpts');
 vi.mock('node:child_process');
+vi.mock('node:util', () => ({
+    promisify: vi.fn(() => execAsyncMock),
+}));
 vi.mock('fs');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/errorHandlers/index.js');
 vi.mock('../../../lib/process.js');
+// Import after mocks are set up
+const startCommand = await import('../start.js').then(m => m.default);
 const spawnSpy = vi.mocked(spawn);
 const existsSyncSpy = vi.spyOn(fs, 'existsSync');
 const trackCommandUsageSpy = vi.spyOn(usageTrackingLib, 'trackCommandUsage');
@@ -36,6 +42,7 @@ describe('commands/mcp/start', () => {
         processExitSpy.mockImplementation(() => { });
         // Mock config to prevent reading actual config file in CI
         getConfigAccountIfExistsSpy.mockReturnValue(undefined);
+        execAsyncMock.mockClear();
     });
     describe('command', () => {
         it('should have the correct command structure', () => {

package/commands/mcp/setup.js

@@ -1,21 +1,13 @@
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
-import { uiLogger } from '../../lib/ui/logger.js';
 import { addMcpServerToConfig, supportedTools } from '../../lib/mcp/setup.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { hasFeature } from '../../lib/hasFeature.js';
-import { FEATURES } from '../../lib/constants.js';
 const command = ['setup'];
 const describe = commands.mcp.setup.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
-    const hasMcpAccess = await hasFeature(derivedAccountId, FEATURES.MCP_ACCESS);
-    if (!hasMcpAccess) {
-        uiLogger.error(commands.mcp.setup.errors.needsMcpAccess(derivedAccountId));
-        process.exit(EXIT_CODES.ERROR);
-    }
-    trackCommandUsage('mcp-setup', {}, args.derivedAccountId);
+    await trackCommandUsage('mcp-setup', {}, derivedAccountId);
     try {
         await addMcpServerToConfig(args.client);
     }

package/commands/mcp/start.js

@@ -28,7 +28,6 @@ async function startMcpServer(aiAgent) {
         uiLogger.debug(commands.mcp.start.startingServer);
         uiLogger.debug(commands.mcp.start.stopInstructions);
         const args = [serverPath];
-        // Start the server using ts-node
         const child = spawn(`node`, args, {
             stdio: 'inherit',
             env: {

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

@@ -50,7 +50,7 @@ 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'],
+                choices: ['2025.1', '2025.2', '2026.03-beta'],
                 default: '2025.2',
             }));
         });

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 } = PLATFORM_VERSIONS;
+const { v2025_1, v2025_2, v2026_03_beta } = PLATFORM_VERSIONS;
 async function handler(args) {
     const { derivedAccountId, platformVersion, templateSource } = args;
     if (templateSource && !templateSource.includes('/')) {
@@ -125,7 +125,7 @@ function projectCreateBuilder(yargs) {
         'platform-version': {
             describe: commands.project.create.options.platformVersion.describe,
             type: 'string',
-            choices: [v2025_1, v2025_2],
+            choices: [v2025_1, v2025_2, v2026_03_beta],
             default: v2025_2,
         },
         'project-base': {

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

@@ -76,18 +76,30 @@ async function handler(args) {
     try {
         const { data: { results: builds }, } = await fetchProjectBuilds(derivedAccountId, projectConfig.name);
         const hasNoBuilds = !builds || !builds.length;
+        const handleWatchTermination = (error) => {
+            if (error) {
+                logError(error, new ApiErrorContext({ accountId: derivedAccountId }));
+                process.exit(EXIT_CODES.ERROR);
+            }
+            else {
+                process.exit(EXIT_CODES.SUCCESS);
+            }
+        };
         const startWatching = async () => {
-            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput);
+            await createWatcher(derivedAccountId, projectConfig, projectDir, handleBuildStatus, handleUserInput, handleWatchTermination);
         };
         // Upload all files if no build exists for this project yet
         if (initialUpload || hasNoBuilds) {
-            const { uploadError } = await handleProjectUpload({
+            const { uploadError, projectNotFound } = await handleProjectUpload({
                 accountId: derivedAccountId,
                 projectConfig,
                 projectDir,
                 callbackFunc: startWatching,
                 isUploadCommand: false,
             });
+            if (projectNotFound) {
+                process.exit(EXIT_CODES.ERROR);
+            }
             if (uploadError) {
                 if (isSpecifiedError(uploadError, {
                     subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
@@ -111,6 +123,7 @@ async function handler(args) {
     }
     catch (e) {
         logError(e, new ApiErrorContext({ accountId: derivedAccountId }));
+        process.exit(EXIT_CODES.ERROR);
     }
 }
 function projectWatchBuilder(yargs) {

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, {