@hubspot/cli 8.0.1-experimental.0 → 8.0.3-experimental.0

package/bin/cli.js

@@ -33,6 +33,7 @@ import mcpCommand from '../commands/mcp.js';
 import upgradeCommand from '../commands/upgrade.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { initializeSpinniesManager } from '../lib/middleware/spinniesMiddleware.js';
+import { addCommandSuggestions } from '../lib/commandSuggestion.js';
 function getTerminalWidth() {
     const width = yargs().terminalWidth();
     if (width >= 100)
@@ -114,20 +115,22 @@ const argv = yargs(process.argv.slice(2))
     .command(completionCommand)
     .command(doctorCommand)
     .command(mcpCommand)
-    .command(upgradeCommand)
+    .command(upgradeCommand);
+const argvWithSuggestions = addCommandSuggestions(argv)
     .help()
     .alias('h', 'help')
     .recommendCommands()
     .demandCommand(1, '')
     .wrap(getTerminalWidth())
     .strict().argv;
-if ('help' in argv && argv.help !== undefined) {
+if ('help' in argvWithSuggestions && argvWithSuggestions.help !== undefined) {
     (async () => {
-        await trackHelpUsage(getCommandName(argv));
+        await trackHelpUsage(getCommandName(argvWithSuggestions));
     })();
 }
-if ('convertFields' in argv && argv.convertFields !== undefined) {
+if ('convertFields' in argvWithSuggestions &&
+    argvWithSuggestions.convertFields !== undefined) {
     (async () => {
-        await trackConvertFieldsUsage(getCommandName(argv));
+        await trackConvertFieldsUsage(getCommandName(argvWithSuggestions));
     })();
 }

package/commands/__tests__/getStarted.test.js

@@ -9,6 +9,8 @@ import { getProjectPackageJsonLocations, installPackages, } from '../../lib/depe
 import { GET_STARTED_OPTIONS } from '../../lib/constants.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import open from 'open';
+import { renderInteractive } from '../../ui/render.js';
+import { getGetStartedFlow } from '../../ui/components/getStarted/GetStartedFlow.js';
 vi.mock('../../lib/prompts/promptUtils');
 vi.mock('../../lib/prompts/projectNameAndDestPrompt');
 vi.mock('../../lib/projects/config');
@@ -16,6 +18,8 @@ vi.mock('../../lib/errorHandlers');
 vi.mock('@hubspot/local-dev-lib/github');
 vi.mock('../../lib/dependencyManagement');
 vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../ui/render');
+vi.mock('../../ui/components/getStarted/GetStartedFlow');
 vi.mock('open');
 vi.mock('fs-extra', () => ({
     default: {
@@ -103,6 +107,14 @@ describe('commands/get-started', () => {
                 await getStartedCommand.handler(mockArgs);
                 expect(open).toHaveBeenCalledWith(expect.stringContaining('design-manager'), { url: true });
             });
+            it('should use Ink flow when v2 flag is enabled', async () => {
+                getGetStartedFlow.mockImplementation(() => null);
+                renderInteractive.mockResolvedValue(undefined);
+                await getStartedCommand.handler({ ...mockArgs, v2: true });
+                expect(renderInteractive).toHaveBeenCalled();
+                expect(promptUser).not.toHaveBeenCalled();
+                expect(process.exit).toHaveBeenCalledWith(EXIT_CODES.SUCCESS);
+            });
         });
         describe('App flow', () => {
             beforeEach(() => {

package/commands/__tests__/project.test.js

@@ -17,6 +17,9 @@ import validate from '../project/validate.js';
 import profileCommands from '../project/profile.js';
 import list from '../project/list.js';
 import projectCommand from '../project.js';
+import * as projectConfigLib from '../../lib/projects/config.js';
+import * as platformVersionLib from '../../lib/projects/platformVersion.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 vi.mock('../project/deploy');
 vi.mock('../project/create');
 vi.mock('../project/upload');
@@ -40,13 +43,24 @@ vi.mock('../project/installDeps');
 vi.mock('../project/lint');
 vi.mock('../project/profile');
 vi.mock('../../lib/commonOpts');
+vi.mock('../../lib/projects/config.js');
+vi.mock('../../lib/projects/platformVersion.js');
 const commandSpy = vi
     .spyOn(yargs, 'command')
     .mockReturnValue(yargs);
 const demandCommandSpy = vi
     .spyOn(yargs, 'demandCommand')
     .mockReturnValue(yargs);
+const getProjectConfigSpy = vi.spyOn(projectConfigLib, 'getProjectConfig');
+const isUnsupportedPlatformVersionSpy = vi.spyOn(platformVersionLib, 'isUnsupportedPlatformVersion');
+const processExitSpy = vi.spyOn(process, 'exit');
+const uiLoggerErrorSpy = vi.spyOn(uiLogger, 'error');
 describe('commands/project', () => {
+    beforeEach(() => {
+        vi.clearAllMocks();
+        // @ts-expect-error Mock implementation
+        processExitSpy.mockImplementation(() => { });
+    });
     describe('command', () => {
         it('should have the correct command structure', () => {
             expect(projectCommand.command).toEqual(['project', 'projects']);
@@ -92,4 +106,20 @@ describe('commands/project', () => {
             expect(commandSpy).toHaveBeenCalledWith(module);
         });
     });
+    describe('middleware - validatePlatformVersion', () => {
+        it('should have platform version validation functions available', () => {
+            // Verify the necessary functions are available for middleware
+            expect(getProjectConfigSpy).toBeDefined();
+            expect(isUnsupportedPlatformVersionSpy).toBeDefined();
+            expect(uiLoggerErrorSpy).toBeDefined();
+            expect(processExitSpy).toBeDefined();
+        });
+        it('should register middleware when building', async () => {
+            // Verify middleware is registered during builder execution
+            await projectCommand.builder(yargs);
+            // The middleware should be registered (we can't easily test async middleware execution)
+            // but we verify the builder completes successfully
+            expect(projectCommand.builder).toBeDefined();
+        });
+    });
 });

package/commands/account/auth.js

@@ -1,96 +1,21 @@
-import { updateConfigAccount, createEmptyConfigFile, deleteConfigFileIfEmpty, getConfigFilePath, localConfigFileExists, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
-import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
-import { toKebabCase } from '@hubspot/local-dev-lib/text';
 import { PERSONAL_ACCESS_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
-import { handleMerge, handleMigration } from '../../lib/configMigrate.js';
+import { deleteConfigFileIfEmpty } from '@hubspot/local-dev-lib/config';
 import { handleExit } from '../../lib/process.js';
-import { debugError } from '../../lib/errorHandlers/index.js';
 import { trackCommandUsage, trackAuthAction } from '../../lib/usageTracking.js';
-import { personalAccessKeyPrompt } from '../../lib/prompts/personalAccessKeyPrompt.js';
-import { cliAccountNamePrompt } from '../../lib/prompts/accountNamePrompt.js';
-import { setAsDefaultAccountPrompt } from '../../lib/prompts/setAsDefaultAccountPrompt.js';
-import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiFeatureHighlight } from '../../lib/ui/index.js';
 import { parseStringToNumber } from '../../lib/parsing.js';
 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';
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
     COMPLETE: 'complete',
 };
 const authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
-async function updateConfigWithNewAccount(env, configAlreadyExists, providedPersonalAccessKey, accountId) {
-    try {
-        const { personalAccessKey } = providedPersonalAccessKey
-            ? { personalAccessKey: providedPersonalAccessKey }
-            : await personalAccessKeyPrompt({
-                env,
-                account: accountId,
-            });
-        const token = await getAccessToken(personalAccessKey, env);
-        const defaultAccountName = token.hubName
-            ? toKebabCase(token.hubName)
-            : undefined;
-        const accountName = configAlreadyExists
-            ? undefined
-            : (await cliAccountNamePrompt(defaultAccountName)).name;
-        const updatedConfig = await updateConfigWithAccessToken(token, personalAccessKey, env, accountName, !configAlreadyExists);
-        if (!updatedConfig)
-            return null;
-        // Can happen if the user is re-authenticating an account with no name
-        if (configAlreadyExists && !updatedConfig.name) {
-            updatedConfig.name = (await cliAccountNamePrompt(defaultAccountName)).name;
-            updateConfigAccount({
-                ...updatedConfig,
-            });
-        }
-        return updatedConfig;
-    }
-    catch (e) {
-        debugError(e);
-        return null;
-    }
-}
-async function handleConfigMigration() {
-    const deprecatedConfigExists = localConfigFileExists();
-    const globalConfigExists = globalConfigFileExists();
-    // No deprecated config exists, so no migration is needed
-    if (!deprecatedConfigExists) {
-        return true;
-    }
-    // Global config exists, so we need to merge the deprecated config with the global config
-    if (globalConfigExists) {
-        try {
-            const mergeConfirmed = await handleMerge();
-            if (!mergeConfirmed) {
-                uiLogger.log('');
-                uiLogger.log(commands.account.subcommands.auth.errors.mergeNotConfirmed);
-            }
-            return mergeConfirmed;
-        }
-        catch (error) {
-            logError(error);
-            return false;
-        }
-    }
-    // Global config does not exist, so we only need to migrate the deprecated config
-    try {
-        const migrationConfirmed = await handleMigration();
-        if (!migrationConfirmed) {
-            uiLogger.log('');
-            uiLogger.log(commands.account.subcommands.auth.errors.migrationNotConfirmed);
-        }
-        return migrationConfirmed;
-    }
-    catch (error) {
-        logError(error);
-        return false;
-    }
-}
 const describe = commands.account.subcommands.auth.describe;
 const command = 'auth';
 async function handler(args) {
@@ -109,33 +34,19 @@ async function handler(args) {
         trackCommandUsage('account-auth', {}, parsedUserProvidedAccountId);
         await trackAuthAction('account-auth', authType, TRACKING_STATUS.STARTED);
     }
-    const configMigrationSuccess = await handleConfigMigration();
-    if (!configMigrationSuccess) {
-        await trackAuthAction('account-auth', authType, TRACKING_STATUS.ERROR);
-        process.exit(EXIT_CODES.ERROR);
-    }
-    const configAlreadyExists = globalConfigFileExists();
-    if (!configAlreadyExists) {
-        createEmptyConfigFile(true);
-    }
     handleExit(deleteConfigFileIfEmpty);
-    const updatedConfig = await updateConfigWithNewAccount(args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, parsedUserProvidedAccountId);
+    const updatedConfig = await authenticateNewAccount({
+        env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
+        providedPersonalAccessKey,
+        accountId: parsedUserProvidedAccountId,
+    });
     if (!updatedConfig) {
         if (!disableTracking) {
             await trackAuthAction('account-auth', authType, TRACKING_STATUS.ERROR);
         }
-        uiLogger.error(commands.account.subcommands.auth.errors.failedToUpdateConfig);
         return process.exit(EXIT_CODES.ERROR);
     }
-    const { accountId, name } = updatedConfig;
-    if (!configAlreadyExists) {
-        uiLogger.log('');
-        uiLogger.success(commands.account.subcommands.auth.success.configFileCreated(getConfigFilePath()));
-        uiLogger.success(commands.account.subcommands.auth.success.configFileUpdated(accountId));
-    }
-    else {
-        await setAsDefaultAccountPrompt(name);
-    }
+    const { accountId } = updatedConfig;
     uiFeatureHighlight([
         'getStartedCommand',
         'helpCommand',

package/commands/account/use.js

@@ -1,24 +1,39 @@
-import { getConfigFilePath, setConfigAccountAsDefault, getConfigAccountIfExists, getConfigAccountByName, getConfigAccountById, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
+import { getConfigFilePath, setConfigAccountAsDefault, getConfigAccountIfExists, getConfigAccountByName, getConfigAccountById, globalConfigFileExists, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
 import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
-import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.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 { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 const command = 'use [account]';
 const describe = commands.account.subcommands.use.describe;
 async function handler(args) {
     let newDefaultAccount = args.account;
+    const usingGlobalConfig = globalConfigFileExists();
     if (!newDefaultAccount) {
-        newDefaultAccount = await selectAccountFromConfig();
+        newDefaultAccount = await selectAccountFromConfig('', usingGlobalConfig);
     }
     else {
         const account = getConfigAccountIfExists(newDefaultAccount);
         if (!account) {
             uiLogger.error(commands.account.subcommands.use.errors.accountNotFound(newDefaultAccount, getConfigFilePath()));
-            newDefaultAccount = await selectAccountFromConfig();
+            newDefaultAccount = await selectAccountFromConfig('', usingGlobalConfig);
         }
     }
+    if (newDefaultAccount === AUTHENTICATE_NEW_ACCOUNT_VALUE) {
+        const updatedConfig = await authenticateNewAccount({
+            env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
+            setAsDefaultAccount: true,
+        });
+        if (!updatedConfig) {
+            process.exit(EXIT_CODES.ERROR);
+        }
+        trackCommandUsage('accounts-use', undefined, updatedConfig.accountId);
+        return;
+    }
     let account;
     if (!isNaN(Number(newDefaultAccount))) {
         account = getConfigAccountById(Number(newDefaultAccount));

package/commands/cms/module/marketplace-validate.js

@@ -1,9 +1,10 @@
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
-import { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } from '../../../lib/marketplaceValidate.js';
+import { kickOffValidation, pollForValidationFinish, fetchValidationResults, hasProcessValidationErrors, displayValidationResults, } from '../../../lib/marketplaceValidate.js';
 import { commands } from '../../../lang/en.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
+import { logError } from '../../../lib/errorHandlers/index.js';
 const command = 'marketplace-validate <src>';
 const describe = commands.cms.subcommands.module.subcommands.marketplaceValidate.describe;
 async function handler(args) {
@@ -13,12 +14,29 @@ async function handler(args) {
         text: commands.cms.subcommands.module.subcommands.marketplaceValidate.logs.validatingModule(src),
     });
     const assetType = 'MODULE';
-    const validationId = await kickOffValidation(derivedAccountId, assetType, src);
-    await pollForValidationFinish(derivedAccountId, validationId);
+    let validationId;
+    try {
+        validationId = await kickOffValidation(derivedAccountId, assetType, src);
+        await pollForValidationFinish(derivedAccountId, validationId);
+    }
+    catch (e) {
+        logError(e);
+        process.exit(EXIT_CODES.ERROR);
+    }
     SpinniesManager.remove('marketplaceValidation');
-    const validationResults = await fetchValidationResults(derivedAccountId, validationId);
-    processValidationErrors(commands.cms.subcommands.module.subcommands.marketplaceValidate.errors
+    let validationResults;
+    try {
+        validationResults = await fetchValidationResults(derivedAccountId, validationId);
+    }
+    catch (e) {
+        logError(e);
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const hasErrors = hasProcessValidationErrors(commands.cms.subcommands.module.subcommands.marketplaceValidate.errors
         .invalidPath, validationResults);
+    if (hasErrors) {
+        process.exit(EXIT_CODES.ERROR);
+    }
     displayValidationResults(commands.cms.subcommands.module.subcommands.marketplaceValidate.results, validationResults);
     process.exit(EXIT_CODES.SUCCESS);
 }

package/commands/cms/theme/marketplace-validate.js

@@ -1,8 +1,10 @@
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
-import { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } from '../../../lib/marketplaceValidate.js';
+import { kickOffValidation, pollForValidationFinish, fetchValidationResults, hasProcessValidationErrors, displayValidationResults, } from '../../../lib/marketplaceValidate.js';
 import { commands } from '../../../lang/en.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
+import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
+import { logError } from '../../../lib/errorHandlers/index.js';
 const command = 'marketplace-validate <path>';
 const describe = commands.cms.subcommands.theme.subcommands.marketplaceValidate.describe;
 async function handler(args) {
@@ -12,14 +14,31 @@ async function handler(args) {
         text: commands.cms.subcommands.theme.subcommands.marketplaceValidate.logs.validatingTheme(path),
     });
     const assetType = 'THEME';
-    const validationId = await kickOffValidation(derivedAccountId, assetType, path);
-    await pollForValidationFinish(derivedAccountId, validationId);
+    let validationId;
+    try {
+        validationId = await kickOffValidation(derivedAccountId, assetType, path);
+        await pollForValidationFinish(derivedAccountId, validationId);
+    }
+    catch (e) {
+        logError(e);
+        process.exit(EXIT_CODES.ERROR);
+    }
     SpinniesManager.remove('marketplaceValidation');
-    const validationResults = await fetchValidationResults(derivedAccountId, validationId);
-    processValidationErrors(commands.cms.subcommands.theme.subcommands.marketplaceValidate.errors
+    let validationResults;
+    try {
+        validationResults = await fetchValidationResults(derivedAccountId, validationId);
+    }
+    catch (e) {
+        logError(e);
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const hasErrors = hasProcessValidationErrors(commands.cms.subcommands.theme.subcommands.marketplaceValidate.errors
         .invalidPath, validationResults);
+    if (hasErrors) {
+        process.exit(EXIT_CODES.ERROR);
+    }
     displayValidationResults(commands.cms.subcommands.theme.subcommands.marketplaceValidate.results, validationResults);
-    process.exit();
+    process.exit(EXIT_CODES.SUCCESS);
 }
 function themeValidateBuilder(yargs) {
     yargs.positional('path', {

package/commands/getStarted.d.ts

@@ -1,7 +1,8 @@
-import { AccountArgs, YargsCommandModule, CommonArgs, ConfigArgs, EnvironmentArgs } from '../types/Yargs.js';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../types/Yargs.js';
 type GetStartedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     name?: string;
     dest?: string;
+    v2?: boolean;
 };
 declare const getStartedCommand: YargsCommandModule<unknown, GetStartedArgs>;
 export default getStartedCommand;

package/commands/getStarted.js

@@ -1,27 +1,28 @@
+import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
+import { getCwd } from '@hubspot/local-dev-lib/path';
 import fs from 'fs-extra';
-import path from 'path';
 import open from 'open';
-import { getCwd } from '@hubspot/local-dev-lib/path';
-import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
+import path from 'path';
 import { commands } from '../lang/en.js';
-import { trackCommandMetadataUsage, trackCommandUsage, } from '../lib/usageTracking.js';
+import { GET_STARTED_OPTIONS, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, PROJECT_CONFIG_FILE, } from '../lib/constants.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
-import { makeYargsBuilder } from '../lib/yargsUtils.js';
-import { promptUser } from '../lib/prompts/promptUtils.js';
+import { debugError, logError } from '../lib/errorHandlers/index.js';
+import { getProjectConfig, validateProjectConfig, writeProjectConfig, } from '../lib/projects/config.js';
+import { handleProjectUpload } from '../lib/projects/upload.js';
 import { projectNameAndDestPrompt } from '../lib/prompts/projectNameAndDestPrompt.js';
+import { promptUser } from '../lib/prompts/promptUtils.js';
 import { uiAccountDescription, uiFeatureHighlight, uiInfoSection, } from '../lib/ui/index.js';
 import { uiLogger } from '../lib/ui/logger.js';
-import { debugError } from '../lib/errorHandlers/index.js';
-import ProjectValidationError from '../lib/errors/ProjectValidationError.js';
-import { handleProjectUpload } from '../lib/projects/upload.js';
-import { PROJECT_CONFIG_FILE, GET_STARTED_OPTIONS, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, } from '../lib/constants.js';
-import { writeProjectConfig, getProjectConfig, validateProjectConfig, } from '../lib/projects/config.js';
-import { pollProjectBuildAndDeploy } from '../lib/projects/pollProjectBuildAndDeploy.js';
+import { trackCommandMetadataUsage, trackCommandUsage, } from '../lib/usageTracking.js';
+import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { isV2Project } from '../lib/projects/platformVersion.js';
-import { openLink } from '../lib/links.js';
-import { getStaticAuthAppInstallUrl } from '../lib/app/urls.js';
-import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
+import { pollProjectBuildAndDeploy } from '../lib/projects/pollProjectBuildAndDeploy.js';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
+import { getStaticAuthAppInstallUrl } from '../lib/app/urls.js';
+import ProjectValidationError from '../lib/errors/ProjectValidationError.js';
+import { openLink } from '../lib/links.js';
+import { runGetStartedV2 } from '../lib/getStarted/getStartedV2.js';
 const command = 'get-started';
 const describe = commands.getStarted.describe;
 async function handler(args) {
@@ -29,6 +30,22 @@ async function handler(args) {
     const env = getConfigAccountEnvironment(derivedAccountId);
     await trackCommandUsage('get-started', {}, derivedAccountId);
     const accountName = uiAccountDescription(derivedAccountId);
+    if (args.v2) {
+        try {
+            await runGetStartedV2({
+                ...args,
+                name: args.name,
+                dest: args.dest,
+            });
+            process.exit(EXIT_CODES.SUCCESS);
+            return;
+        }
+        catch (error) {
+            logError(error);
+            process.exit(EXIT_CODES.ERROR);
+            return;
+        }
+    }
     uiInfoSection(commands.getStarted.startTitle, () => {
         uiLogger.log(commands.getStarted.startDescription);
         uiLogger.log(commands.getStarted.guideOverview(accountName));
@@ -277,6 +294,12 @@ function getStartedBuilder(yargs) {
             describe: commands.getStarted.options.dest.describe,
             type: 'string',
         },
+        v2: {
+            describe: commands.getStarted.options.v2.describe,
+            type: 'boolean',
+            default: false,
+            hidden: true,
+        },
         'template-source': {
             describe: commands.getStarted.options.templateSource.describe,
             type: 'string',

package/commands/mcp/__tests__/start.test.js

@@ -7,20 +7,14 @@ 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';
-// Create a mock execAsync function before importing the module
-const execAsyncMock = vi.fn();
+import startCommand from '../start.js';
 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');
@@ -42,7 +36,6 @@ 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', () => {
@@ -140,64 +133,5 @@ describe('commands/mcp/start', () => {
             expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('Failed to start'));
             expect(logErrorSpy).toHaveBeenCalledWith(error);
         });
-        it('should fetch CLI version in standalone mode', async () => {
-            const originalEnv = process.env.HUBSPOT_MCP_STANDALONE;
-            process.env.HUBSPOT_MCP_STANDALONE = 'true';
-            execAsyncMock.mockResolvedValue({
-                stdout: '8.0.0',
-                stderr: '',
-            });
-            await startCommand.handler(args);
-            expect(execAsyncMock).toHaveBeenCalledWith('npm view @hubspot/cli version');
-            expect(spawnSpy).toHaveBeenCalledWith('node', expect.any(Array), expect.objectContaining({
-                env: expect.objectContaining({
-                    HUBSPOT_CLI_VERSION: '8.0.0',
-                }),
-            }));
-            // Restore original env
-            if (originalEnv === undefined) {
-                delete process.env.HUBSPOT_MCP_STANDALONE;
-            }
-            else {
-                process.env.HUBSPOT_MCP_STANDALONE = originalEnv;
-            }
-        });
-        it('should not fetch CLI version when not in standalone mode', async () => {
-            const originalEnv = process.env.HUBSPOT_MCP_STANDALONE;
-            delete process.env.HUBSPOT_MCP_STANDALONE;
-            await startCommand.handler(args);
-            expect(execAsyncMock).not.toHaveBeenCalled();
-            expect(spawnSpy).toHaveBeenCalledWith('node', expect.any(Array), expect.objectContaining({
-                env: expect.not.objectContaining({
-                    HUBSPOT_CLI_VERSION: expect.anything(),
-                }),
-            }));
-            // Restore original env
-            if (originalEnv !== undefined) {
-                process.env.HUBSPOT_MCP_STANDALONE = originalEnv;
-            }
-        });
-        it('should handle version fetch errors gracefully', async () => {
-            const originalEnv = process.env.HUBSPOT_MCP_STANDALONE;
-            process.env.HUBSPOT_MCP_STANDALONE = 'true';
-            const error = new Error('Version fetch failed');
-            execAsyncMock.mockRejectedValue(error);
-            await startCommand.handler(args);
-            expect(execAsyncMock).toHaveBeenCalledWith('npm view @hubspot/cli version');
-            expect(uiLogger.warn).toHaveBeenCalledWith(expect.stringContaining('Failed to get CLI version'));
-            expect(logErrorSpy).toHaveBeenCalledWith(error);
-            expect(spawnSpy).toHaveBeenCalledWith('node', expect.any(Array), expect.objectContaining({
-                env: expect.not.objectContaining({
-                    HUBSPOT_CLI_VERSION: expect.anything(),
-                }),
-            }));
-            // Restore original env
-            if (originalEnv === undefined) {
-                delete process.env.HUBSPOT_MCP_STANDALONE;
-            }
-            else {
-                process.env.HUBSPOT_MCP_STANDALONE = originalEnv;
-            }
-        });
     });
 });

package/commands/mcp/setup.js

@@ -6,9 +6,8 @@ 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';
-import { uiBetaTag } from '../../lib/ui/index.js';
 const command = ['setup'];
-const describe = uiBetaTag(commands.mcp.setup.describe, false);
+const describe = commands.mcp.setup.describe;
 async function handler(args) {
     const { derivedAccountId } = args;
     const hasMcpAccess = await hasFeature(derivedAccountId, FEATURES.MCP_ACCESS);

package/commands/mcp/start.js

@@ -1,5 +1,4 @@
-import { spawn, exec } from 'node:child_process';
-import { promisify } from 'node:util';
+import { spawn } from 'node:child_process';
 import path from 'path';
 import fs from 'fs';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
@@ -10,7 +9,6 @@ import { commands } from '../../lang/en.js';
 import { handleExit } from '../../lib/process.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { fileURLToPath } from 'url';
-const execAsync = promisify(exec);
 const command = 'start';
 const describe = undefined; // Leave hidden for now
 const __filename = fileURLToPath(import.meta.url);
@@ -30,28 +28,12 @@ async function startMcpServer(aiAgent) {
         uiLogger.debug(commands.mcp.start.startingServer);
         uiLogger.debug(commands.mcp.start.stopInstructions);
         const args = [serverPath];
-        // Get CLI version if running in standalone mode
-        let cliVersion;
-        if (process.env.HUBSPOT_MCP_STANDALONE === 'true') {
-            try {
-                // const { stdout } = await execAsync('npm view @hubspot/cli version');
-                // // Extract version number from output (e.g., "8.0.0")
-                // cliVersion = stdout.trim();
-                cliVersion = '8.0.1-experimental.0';
-                uiLogger.debug(`Using @hubspot/cli version: ${cliVersion}`);
-            }
-            catch (error) {
-                uiLogger.warn('Failed to get CLI version, will use latest');
-                logError(error);
-            }
-        }
         // Start the server using ts-node
         const child = spawn(`node`, args, {
             stdio: 'inherit',
             env: {
                 ...process.env,
                 HUBSPOT_MCP_AI_AGENT: aiAgent || 'unknown',
-                ...(cliVersion && { HUBSPOT_CLI_VERSION: cliVersion }),
             },
         });
         // Handle server process events