@hubspot/cli 7.9.0-beta.1 → 7.9.0

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

@@ -12,8 +12,9 @@ import * as projectNamePrompt from '../../../lib/prompts/projectNamePrompt.js';
 import * as promptUtils from '../../../lib/prompts/promptUtils.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import exampleProject from './fixtures/exampleProject.json' with { type: 'json' };
+import { loadJson } from '../../../lib/jsonLoader.js';
 import { mockHubSpotHttpResponse, mockHubSpotHttpError, } from '../../../lib/testUtils.js';
+const exampleProject = loadJson(import.meta.url, './fixtures/exampleProject.json');
 import projectDeployCommand from '../deploy.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 vi.mock('@hubspot/local-dev-lib/api/projects');
@@ -204,7 +205,7 @@ describe('commands/project/deploy', () => {
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
         it('should log an error and exit when buildId option is not a valid build', async () => {
-            args.buildId = exampleProject.latestBuild.buildId + 1;
+            args.buildId = (exampleProject.latestBuild?.buildId ?? 0) + 1;
             await projectDeployCommand.handler(args);
             expect(uiLogger.error).toHaveBeenCalledTimes(1);
             expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(`Build ${args.buildId} does not exist for project`));
@@ -222,7 +223,7 @@ describe('commands/project/deploy', () => {
         it('should prompt for build id if no option is provided', async () => {
             delete args.buildId;
             promptUserSpy.mockResolvedValue({
-                buildId: exampleProject.latestBuild.buildId,
+                buildId: exampleProject.latestBuild?.buildId ?? 0,
             });
             await projectDeployCommand.handler(args);
             expect(promptUserSpy).toHaveBeenCalledTimes(1);

package/lang/en.d.ts

@@ -1382,7 +1382,7 @@ Local development of unified apps is currently only compatible with accounts tha
 ${string}`;
             };
             readonly prompts: {
-                readonly parentComponents: "[--project-base] What would you like in your project?";
+                readonly parentComponents: "[--project-base] Choose what to include in your project:";
                 readonly emptyProject: "Empty Project";
                 readonly app: "App";
             };
@@ -1532,7 +1532,7 @@ ${string}`;
                 readonly maxExceeded: (maxCount: number) => string;
                 readonly authTypeNotAllowed: (authType: string) => string;
                 readonly distributionNotAllowed: (dist: string) => string;
-                readonly portalDoesNotHaveAccessToThisFeature: (accountId: number) => string;
+                readonly portalDoesNotHaveAccessToThisFeature: () => string;
                 readonly locationInProject: "This command must be run from within a project directory.";
                 readonly failedToFetchComponentList: "Failed to fetch the list of available features. Please try again later.";
                 readonly projectContainsPublicApp: "This project contains a public app. This command is currently only compatible with projects that contain private apps.";
@@ -2771,7 +2771,7 @@ export declare const lib: {
         readonly failedToInitialize: "Missing required arguments to initialize Local Dev";
         readonly noDeployedBuild: (projectName: string, accountIdentifier: string, uploadCommand: string) => string;
         readonly noComponents: "There are no components in this project.";
-        readonly betaMessage: "HubSpot projects local development";
+        readonly headerMessage: "HubSpot projects local development";
         readonly learnMoreLocalDevServer: string;
         readonly running: (projectName: string, accountIdentifier: string) => string;
         readonly quitHelper: `Press ${string} to stop the local dev server`;
@@ -2956,8 +2956,8 @@ Run ${string} to upgrade to version ${string}`;
             readonly prompt: {
                 readonly marketPlaceDistribution: "On the HubSpot marketplace";
                 readonly privateDistribution: "Privately";
-                readonly distribution: "[--distribution] How would you like to distribute your application?";
-                readonly auth: "[--auth] What type of authentication would you like your application to use";
+                readonly distribution: "[--distribution] Choose how to distribute your application:";
+                readonly auth: "[--auth] Choose your authentication type:";
                 readonly staticAuth: "Static Auth";
                 readonly oauth: "OAuth";
             };
@@ -3364,8 +3364,8 @@ Run ${string} to upgrade to version ${string}`;
             };
         };
         readonly projectNameAndDestPrompt: {
-            readonly enterName: "[--name] Give your project a name: ";
-            readonly enterDest: "[--dest] Enter the folder to create the project in:";
+            readonly enterName: "[--name] Enter your project name:";
+            readonly enterDest: "[--dest] Choose where to create the project:";
             readonly errors: {
                 readonly nameRequired: "A project name is required";
                 readonly destRequired: "A project dest is required";
@@ -3375,7 +3375,7 @@ Run ${string} to upgrade to version ${string}`;
         };
         readonly selectProjectTemplatePrompt: {
             readonly selectTemplate: "[--template] Choose a project template: ";
-            readonly features: "[--features] Which features would you like your app to include?";
+            readonly features: "[--features] Choose which features to add:";
             readonly errors: {
                 readonly invalidTemplate: (template: string) => string;
                 readonly projectTemplateRequired: "Project template is required when projectTemplates is provided";
@@ -3409,8 +3409,8 @@ Run ${string} to upgrade to version ${string}`;
             };
         };
         readonly projectAddPrompt: {
-            readonly selectType: "[--type] Select an app feature to add: ";
-            readonly selectFeatures: "[--features] Select an app feature to add: ";
+            readonly selectType: "[--type] Choose which features to add: ";
+            readonly selectFeatures: "[--features] Choose which features to add: ";
             readonly enterName: "[--name] Give your component a name: ";
             readonly errors: {
                 readonly nameRequired: "A component name is required";

package/lang/en.js

@@ -1382,7 +1382,7 @@ export const commands = {
                 welcomeMessage: `\n${chalk.bold('Welcome to HubSpot Developer Projects!')}`,
             },
             prompts: {
-                parentComponents: '[--project-base] What would you like in your project?',
+                parentComponents: '[--project-base] Choose what to include in your project:',
                 emptyProject: 'Empty Project',
                 app: 'App',
             },
@@ -1526,9 +1526,9 @@ export const commands = {
                 failedToDownloadComponent: 'Failed to download project. Please try again later.',
                 invalidComponentType: (componentType) => `'${componentType}' is not a valid project component type.`,
                 maxExceeded: (maxCount) => `This project has the maximum allowed(${maxCount})`,
-                authTypeNotAllowed: (authType) => `Auth type '${authType}' not allowed.`,
-                distributionNotAllowed: (dist) => `Distribution '${dist}' not allowed.`,
-                portalDoesNotHaveAccessToThisFeature: (accountId) => `The account ${uiAccountDescription(accountId)} does not have access to this feature.`,
+                authTypeNotAllowed: (authType) => `Requires auth type '${authType}'.`,
+                distributionNotAllowed: (dist) => `Requires distribution '${dist}'.`,
+                portalDoesNotHaveAccessToThisFeature: () => "This account doesn't have access to this feature.",
                 locationInProject: 'This command must be run from within a project directory.',
                 failedToFetchComponentList: 'Failed to fetch the list of available features. Please try again later.',
                 projectContainsPublicApp: 'This project contains a public app. This command is currently only compatible with projects that contain private apps.',
@@ -2765,8 +2765,8 @@ export const lib = {
         failedToInitialize: 'Missing required arguments to initialize Local Dev',
         noDeployedBuild: (projectName, accountIdentifier, uploadCommand) => `Your project ${chalk.bold(projectName)} exists in ${accountIdentifier}, but has no deployed build. Projects must be successfully deployed to be developed locally. Address any build and deploy errors your project may have, then run ${uploadCommand} to upload and deploy your project.`,
         noComponents: 'There are no components in this project.',
-        betaMessage: 'HubSpot projects local development',
-        learnMoreLocalDevServer: uiLink('Learn more about the projects local dev server', 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'),
+        headerMessage: 'HubSpot projects local development',
+        learnMoreLocalDevServer: uiLink('Learn more about the projects local dev server', 'https://developers.hubspot.com/docs/developer-tooling/local-development/hubspot-cli/project-commands'),
         running: (projectName, accountIdentifier) => chalk.hex(UI_COLORS.SORBET)(`Running ${chalk.bold(projectName)} locally on ${accountIdentifier}, waiting for changes ...`),
         quitHelper: `Press ${chalk.bold('q')} to stop the local dev server`,
         viewProjectLink: (name, accountId) => uiLink('View project in HubSpot', getProjectDetailUrl(name, accountId) || ''),
@@ -2949,8 +2949,8 @@ export const lib = {
             prompt: {
                 marketPlaceDistribution: 'On the HubSpot marketplace',
                 privateDistribution: 'Privately',
-                distribution: '[--distribution] How would you like to distribute your application?',
-                auth: '[--auth] What type of authentication would you like your application to use',
+                distribution: '[--distribution] Choose how to distribute your application:',
+                auth: '[--auth] Choose your authentication type:',
                 staticAuth: 'Static Auth',
                 oauth: 'OAuth',
             },
@@ -3355,8 +3355,8 @@ export const lib = {
             },
         },
         projectNameAndDestPrompt: {
-            enterName: '[--name] Give your project a name: ',
-            enterDest: '[--dest] Enter the folder to create the project in:',
+            enterName: '[--name] Enter your project name:',
+            enterDest: '[--dest] Choose where to create the project:',
             errors: {
                 nameRequired: 'A project name is required',
                 destRequired: 'A project dest is required',
@@ -3366,7 +3366,7 @@ export const lib = {
         },
         selectProjectTemplatePrompt: {
             selectTemplate: '[--template] Choose a project template: ',
-            features: '[--features] Which features would you like your app to include?',
+            features: '[--features] Choose which features to add:',
             errors: {
                 invalidTemplate: (template) => `[--template] Could not find template "${template}". Please choose an available template:`,
                 projectTemplateRequired: 'Project template is required when projectTemplates is provided',
@@ -3400,8 +3400,8 @@ export const lib = {
             },
         },
         projectAddPrompt: {
-            selectType: '[--type] Select an app feature to add: ',
-            selectFeatures: '[--features] Select an app feature to add: ',
+            selectType: '[--type] Choose which features to add: ',
+            selectFeatures: '[--features] Choose which features to add: ',
             enterName: '[--name] Give your component a name: ',
             errors: {
                 nameRequired: 'A component name is required',

package/lib/__tests__/npm.test.js

@@ -1,6 +1,6 @@
 import util from 'util';
 import { isGloballyInstalled, getLatestCliVersion, DEFAULT_PACKAGE_MANAGER, } from '../npm.js';
-import pkg from '../../package.json' with { type: 'json' };
+import { pkg } from '../jsonLoader.js';
 vi.mock('../../ui/logger.js');
 vi.mock('../ui/SpinniesManager');
 describe('lib/npm', () => {

package/lib/__tests__/sandboxSync.test.js

@@ -59,7 +59,7 @@ describe('lib/sandboxSync', () => {
         it('throws error when account IDs are missing', async () => {
             mockedGetAccountId.mockReset();
             mockedGetAccountId.mockReturnValue(null);
-            const errorRegex = new RegExp(`Couldn't sync ${mockChildAccount.portalId} because your account has been removed from`);
+            const errorRegex = new RegExp(`because your account has been removed from`);
             await expect(syncSandbox(mockChildAccount, mockParentAccount, mockEnv, mockSyncTasks)).rejects.toThrow(errorRegex);
         });
         it('handles sync in progress error', async () => {

package/lib/__tests__/usageTracking.test.js

@@ -3,8 +3,8 @@ import { isTrackingAllowed, getAccountConfig, } from '@hubspot/local-dev-lib/con
 import { API_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
 import { uiLogger } from '../ui/logger.js';
 import { trackCommandUsage, trackHelpUsage, trackConvertFieldsUsage, trackAuthAction, trackCommandMetadataUsage, } from '../usageTracking.js';
-import packageJson from '../../package.json' with { type: 'json' };
-const version = packageJson.version;
+import { pkg } from '../jsonLoader.js';
+const version = pkg.version;
 vi.mock('@hubspot/local-dev-lib/trackUsage');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../ui/logger.js');

package/lib/configMigrate.js

@@ -24,7 +24,7 @@ async function promptNewAccountName(account, globalConfig, renamedAccounts) {
             if (value === account.name) {
                 return lib.configMigrate.handleAccountNameConflicts.errors.sameName;
             }
-            const existingAccount = globalConfig.accounts.some(acc => acc.name === value);
+            const existingAccount = globalConfig.accounts?.some(acc => acc.name === value);
             const renamedAccount = renamedAccounts.some(acc => acc.name === value);
             if (existingAccount || renamedAccount) {
                 return lib.configMigrate.handleAccountNameConflicts.errors.nameAlreadyInConfig(value);
@@ -85,8 +85,8 @@ async function handleAccountNameConflicts(globalConfig, deprecatedConfig, force)
     const accountsWithConflictsToRemove = new Set();
     const renamedAccounts = [];
     const accountsNotYetInGlobal = deprecatedConfig.portals.filter(portal => portal.portalId &&
-        !globalConfig.accounts.some(acc => acc.accountId === portal.portalId));
-    const accountsWithConflicts = accountsNotYetInGlobal.filter(localAccount => globalConfig.accounts.some(globalAccount => globalAccount.name === localAccount.name));
+        !globalConfig.accounts?.some(acc => acc.accountId === portal.portalId));
+    const accountsWithConflicts = accountsNotYetInGlobal.filter(localAccount => globalConfig.accounts?.some(globalAccount => globalAccount.name === localAccount.name));
     if (accountsWithConflicts.length > 0) {
         uiLogger.log('');
         uiLogger.warn(lib.configMigrate.handleAccountNameConflicts.warnings.accountNameConflictMessage(accountsWithConflicts.length));

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -1,7 +1,7 @@
 import { getProjectConfig } from '../projects/config.js';
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import path from 'path';
-import pkg from '../../package.json' with { type: 'json' };
+import { pkg } from '../jsonLoader.js';
 import { uiLogger } from '../ui/logger.js';
 import { getAccountId, getDefaultAccountOverrideFilePath, isConfigFlagEnabled, } from '@hubspot/local-dev-lib/config';
 import { getAccountConfig, getConfigPath } from '@hubspot/local-dev-lib/config';

package/lib/doctor/Doctor.js

@@ -13,7 +13,7 @@ import { PORT_MANAGER_SERVER_PORT } from '@hubspot/local-dev-lib/constants/ports
 import { accessTokenForPersonalAccessKey, authorizedScopesForPortalAndUser, scopesOnAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
-import pkg from '../../package.json' with { type: 'json' };
+import { pkg } from '../jsonLoader.js';
 import { lib } from '../../lang/en.js';
 import { uiLink } from '../ui/index.js';
 const minMajorNodeVersion = 18;

package/lib/doctor/__tests__/DiagnosticInfoBuilder.test.js

@@ -6,11 +6,13 @@ vi.mock('@hubspot/local-dev-lib/personalAccessKey');
 vi.mock('../../projects/config');
 vi.mock('@hubspot/local-dev-lib/api/projects');
 vi.mock('util');
-vi.mock('../../../package.json', () => {
+vi.mock('../../jsonLoader.js', () => {
     return {
-        default: {
+        pkg: {
+            name: '@hubspot/cli',
             version: '1.0.0',
         },
+        loadJson: vi.fn(),
     };
 });
 import { DiagnosticInfoBuilder, } from '../DiagnosticInfoBuilder.js';

package/lib/doctor/__tests__/Doctor.test.js

@@ -359,7 +359,7 @@ describe('lib/doctor/Doctor', () => {
                 expect(doctor.diagnosis?.addProjectSection).toHaveBeenCalledWith({
                     type: 'warning',
                     message: 'Port 8080 is in use',
-                    secondaryMessaging: expect.stringMatching(/Make sure it is available before running `hs project dev`/),
+                    secondaryMessaging: expect.stringMatching(/Make sure it is available before running/),
                 });
             });
             it('should add success section if port is available', async () => {

package/lib/jsonLoader.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Generic JSON loader that works in both test (lib/) and production (dist/lib/) environments.
+ * Automatically resolves paths relative to the caller's location.
+ *
+ * @param importMetaUrl - Pass import.meta.url from the calling file
+ * @param relativePath - Path to JSON file relative to the caller (e.g., '../package.json', './fixtures/data.json')
+ * @returns The loaded JSON object
+ */
+export declare function loadJson<T = unknown>(importMetaUrl: string, relativePath: string): T;
+export declare const pkg: {
+    [key: string]: unknown;
+    name: string;
+    version: string;
+};

package/lib/jsonLoader.js

@@ -0,0 +1,60 @@
+// NOTE: Can be switched back to standard import with min node version 23
+import { createRequire } from 'module';
+import { fileURLToPath } from 'url';
+import { existsSync } from 'fs';
+import path from 'path';
+/**
+ * Generic JSON loader that works in both test (lib/) and production (dist/lib/) environments.
+ * Automatically resolves paths relative to the caller's location.
+ *
+ * @param importMetaUrl - Pass import.meta.url from the calling file
+ * @param relativePath - Path to JSON file relative to the caller (e.g., '../package.json', './fixtures/data.json')
+ * @returns The loaded JSON object
+ */
+export function loadJson(importMetaUrl, relativePath) {
+    const callerDir = path.dirname(fileURLToPath(importMetaUrl));
+    const resolvedPath = path.resolve(callerDir, relativePath);
+    // If the resolved path exists, use it directly
+    if (existsSync(resolvedPath)) {
+        return createRequire(importMetaUrl)(resolvedPath);
+    }
+    // If not found, try adjusting for dist/ directory
+    // This handles the case where we're in dist/lib/ but the JSON is at project root
+    const pathParts = resolvedPath.split(path.sep);
+    const distIndex = pathParts.indexOf('dist');
+    if (distIndex !== -1) {
+        // Remove 'dist' from the path and try again
+        pathParts.splice(distIndex, 1);
+        const adjustedPath = pathParts.join(path.sep);
+        if (existsSync(adjustedPath)) {
+            return createRequire(importMetaUrl)(adjustedPath);
+        }
+    }
+    throw new Error(`JSON file not found: ${relativePath} (resolved to ${resolvedPath})`);
+}
+/**
+ * Helper to find package.json by walking up the directory tree.
+ * Works regardless of whether we're in lib/ or dist/lib/.
+ */
+function findPackageJsonPath(startDir) {
+    let currentDir = startDir;
+    while (true) {
+        const pkgPath = path.join(currentDir, 'package.json');
+        if (existsSync(pkgPath)) {
+            return pkgPath;
+        }
+        const parentDir = path.dirname(currentDir);
+        if (parentDir === currentDir) {
+            // Reached root without finding package.json (e.g., in test environments)
+            return null;
+        }
+        currentDir = parentDir;
+    }
+}
+// Load package.json once when this module is imported for convenience
+// In test environments where this can't be found, tests should mock this module
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const pkgPath = findPackageJsonPath(__dirname);
+export const pkg = pkgPath
+    ? createRequire(import.meta.url)(pkgPath)
+    : { name: 'unknown', version: 'unknown' };

package/lib/middleware/__test__/requestMiddleware.test.js

@@ -1,6 +1,6 @@
 import { addUserAgentHeader } from '@hubspot/local-dev-lib/http';
 import { setRequestHeaders } from '../requestMiddleware.js';
-import pkg from '../../../package.json' with { type: 'json' };
+import { pkg } from '../../jsonLoader.js';
 vi.mock('@hubspot/local-dev-lib/http', () => ({
     addUserAgentHeader: vi.fn(),
 }));

package/lib/middleware/autoUpdateMiddleware.js

@@ -1,6 +1,6 @@
 import updateNotifier from 'update-notifier';
 import { isConfigFlagEnabled } from '@hubspot/local-dev-lib/config';
-import pkg from '../../package.json' with { type: 'json' };
+import { pkg } from '../jsonLoader.js';
 import { UI_COLORS } from '../ui/index.js';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { lib } from '../../lang/en.js';

package/lib/middleware/commandTargetingUtils.js

@@ -35,6 +35,7 @@ export function shouldLoadConfigForCommand(commandParts) {
 }
 const SKIP_CONFIG_VALIDATION_COMMANDS = {
     auth: true,
+    account: { auth: true },
     mcp: {
         setup: true,
         start: true,

package/lib/middleware/fireAlarmMiddleware.js

@@ -1,7 +1,7 @@
 import chalk from 'chalk';
 import { fetchFireAlarms } from '@hubspot/local-dev-lib/api/fireAlarm';
 import { debugError } from '../errorHandlers/index.js';
-import pkg from '../../package.json' with { type: 'json' };
+import { pkg } from '../jsonLoader.js';
 import { logInBox } from '../ui/boxen.js';
 import { renderInline } from '../../ui/index.js';
 import { getWarningBox } from '../../ui/components/StatusMessageBoxes.js';

package/lib/middleware/notificationsMiddleware.js

@@ -1,5 +1,5 @@
 import updateNotifier from 'update-notifier';
-import pkg from '../../package.json' with { type: 'json' };
+import { pkg } from '../jsonLoader.js';
 import { UI_COLORS } from '../ui/index.js';
 import { lib } from '../../lang/en.js';
 const notifier = updateNotifier({

package/lib/middleware/requestMiddleware.js

@@ -1,5 +1,5 @@
 import { addUserAgentHeader } from '@hubspot/local-dev-lib/http';
-import pkg from '../../package.json' with { type: 'json' };
+import { pkg } from '../jsonLoader.js';
 export function setRequestHeaders() {
     addUserAgentHeader('HubSpot CLI', pkg.version);
 }

package/lib/npm.js

@@ -1,7 +1,7 @@
 import { exec as execAsync } from 'node:child_process';
 import util from 'util';
 import { uiLogger } from './ui/logger.js';
-import pkg from '../package.json' with { type: 'json' };
+import { pkg } from './jsonLoader.js';
 export const DEFAULT_PACKAGE_MANAGER = 'npm';
 export async function isGloballyInstalled(packageName) {
     const exec = util.promisify(execAsync);

package/lib/projects/__tests__/AppDevModeInterface.test.js

@@ -21,6 +21,7 @@ import { confirmPrompt } from '../../prompts/promptUtils.js';
 import { getOauthAppInstallUrl, getStaticAuthAppInstallUrl, } from '../../app/urls.js';
 import { isDeveloperTestAccount, isSandbox } from '../../accountTypes.js';
 import { logError } from '../../errorHandlers/index.js';
+import { isServerRunningAtUrl } from '../../http.js';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, APP_INSTALLATION_STATES, LOCAL_DEV_SERVER_MESSAGE_TYPES, } from '../../constants.js';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 vi.mock('@hubspot/local-dev-lib/api/localDevAuth');
@@ -36,6 +37,7 @@ vi.mock('../../errorHandlers/index');
 vi.mock('../localDev/LocalDevState');
 vi.mock('../localDev/LocalDevLogger');
 vi.mock('../../ui/SpinniesManager');
+vi.mock('../../http');
 describe('AppDevModeInterface', () => {
     let appDevModeInterface;
     let mockLocalDevState;
@@ -139,6 +141,7 @@ describe('AppDevModeInterface', () => {
         });
         confirmPrompt.mockResolvedValue(true);
         installStaticAuthAppOnTestAccount.mockResolvedValue(undefined);
+        isServerRunningAtUrl.mockResolvedValue(true);
         // Mock process.exit
         vi.spyOn(global.process, 'exit').mockImplementation((code) => {
             throw new Error(`Process.exit called with code ${code}`);

package/lib/projects/create/__tests__/v2.test.js

@@ -37,12 +37,12 @@ describe('lib/projects/create/v2', () => {
         };
         it('returns enabled components when they meet all requirements', async () => {
             const choices = await calculateComponentTemplateChoices(mockComponents, 'oauth', 'private', 123, mockProjectMetadataForChoices);
-            expect(choices).toHaveLength(4); // includes separator
+            expect(choices).toHaveLength(2);
             expect(choices[0]).toEqual({
                 name: 'Module Component [module]',
                 value: mockComponents[0],
             });
-            expect(choices[2]).toEqual({
+            expect(choices[1]).toEqual({
                 name: expect.stringContaining('Card Component'),
                 value: mockComponents[1],
                 disabled: expect.stringContaining('maximum'),
@@ -50,20 +50,20 @@ describe('lib/projects/create/v2', () => {
         });
         it('disables components when auth type is not supported', async () => {
             const choices = await calculateComponentTemplateChoices(mockComponents, 'privatekey', 'private', 123, mockProjectMetadataForChoices);
-            // All components should be disabled, so they come after the separator
-            expect(choices[1]).toEqual({
+            // All components should be disabled
+            expect(choices[0]).toEqual({
                 name: expect.stringContaining('Module Component'),
                 value: mockComponents[0],
-                disabled: expect.stringContaining('privatekey'),
+                disabled: expect.stringContaining('oauth'),
             });
         });
         it('disables components when distribution is not supported', async () => {
             const choices = await calculateComponentTemplateChoices(mockComponents, 'oauth', 'enterprise', 123, mockProjectMetadataForChoices);
-            // All components should be disabled, so they come after the separator
-            expect(choices[1]).toEqual({
+            // All components should be disabled
+            expect(choices[0]).toEqual({
                 name: expect.stringContaining('Module Component'),
                 value: mockComponents[0],
-                disabled: expect.stringContaining('enterprise'),
+                disabled: expect.stringContaining('private'),
             });
         });
         it('handles components without auth type or distribution restrictions', async () => {
@@ -125,8 +125,8 @@ describe('lib/projects/create/v2', () => {
                 },
             };
             const choices = await calculateComponentTemplateChoices(componentWithCliSelector, 'oauth', 'private', 123, projectMetadataAtMaxWorkflowAction);
-            expect(choices).toHaveLength(3); // includes separators
-            expect(choices[1]).toEqual({
+            expect(choices).toHaveLength(1);
+            expect(choices[0]).toEqual({
                 name: expect.stringContaining('Workflow Action Tool'),
                 value: componentWithCliSelector[0],
                 disabled: expect.stringContaining('maximum'),
@@ -183,12 +183,18 @@ describe('lib/projects/create/v2', () => {
                     supportedDistributions: ['private'],
                 },
             ];
-            const choices = await calculateComponentTemplateChoices(gatedComponent, 'oauth', 'private', 123, mockProjectMetadataForChoices);
-            expect(choices).toHaveLength(3); // includes separators
-            expect(choices[1]).toEqual({
+            const projectMetadataWithWorkflowAction = {
+                hsMetaFiles: [],
+                components: {
+                    'workflow-action': { count: 0, maxCount: 3, hsMetaFiles: [] },
+                },
+            };
+            const choices = await calculateComponentTemplateChoices(gatedComponent, 'oauth', 'private', 123, projectMetadataWithWorkflowAction);
+            expect(choices).toHaveLength(1);
+            expect(choices[0]).toEqual({
                 name: expect.stringContaining('Workflow Action Tool'),
                 value: gatedComponent[0],
-                disabled: expect.stringContaining('does not have access to this feature'),
+                disabled: expect.stringContaining("doesn't have access to this feature"),
             });
             expect(mockHasFeature).toHaveBeenCalledWith(123, expect.any(String));
         });

package/lib/projects/create/v2.js

@@ -1,8 +1,6 @@
-import { Separator } from '@inquirer/prompts';
 import { marketplaceDistribution, oAuth, privateDistribution, staticAuth, EMPTY_PROJECT, PROJECT_WITH_APP, FEATURES, } from '../../constants.js';
 import { commands, lib } from '../../../lang/en.js';
 import { listPrompt } from '../../prompts/promptUtils.js';
-import chalk from 'chalk';
 import { isV2Project } from '../platformVersion.js';
 import path from 'path';
 import { getConfigForPlatformVersion } from './legacy.js';
@@ -75,25 +73,27 @@ export async function calculateComponentTemplateChoices(components, authType, di
         if (Array.isArray(supportedAuthTypes) &&
             authType &&
             !supportedAuthTypes.includes(authType.toLowerCase())) {
-            disabledReasons.push(commands.project.add.error.authTypeNotAllowed(authType));
+            const supportedAuthTypesString = supportedAuthTypes.join(', ');
+            disabledReasons.push(commands.project.add.error.authTypeNotAllowed(supportedAuthTypesString));
         }
         if (Array.isArray(supportedDistributions) &&
             distribution &&
             !supportedDistributions.includes(distribution.toLowerCase())) {
-            disabledReasons.push(commands.project.add.error.distributionNotAllowed(distribution));
+            const supportedDistributionsString = supportedDistributions.join(', ');
+            disabledReasons.push(commands.project.add.error.distributionNotAllowed(supportedDistributionsString));
         }
         const templateGate = componentTypeToGateMap[template.cliSelector || template.type];
         if (templateGate) {
             const isUngated = await hasFeature(accountId, templateGate);
             if (!isUngated) {
-                disabledReasons.unshift(commands.project.add.error.portalDoesNotHaveAccessToThisFeature(accountId));
+                disabledReasons.unshift(commands.project.add.error.portalDoesNotHaveAccessToThisFeature());
             }
         }
         if (disabledReasons.length > 0) {
             disabledComponents.push({
-                name: `[${chalk.yellow('DISABLED')}] ${template.label} -`,
+                name: `${template.label} [${template.cliSelector || template.type}]`,
                 value: template,
-                disabled: disabledReasons.join(' '),
+                disabled: `– ${disabledReasons.join(' ')}`,
             });
         }
         else {
@@ -104,12 +104,7 @@ export async function calculateComponentTemplateChoices(components, authType, di
         }
     }
     return disabledComponents.length
-        ? [
-            ...enabledComponents,
-            new Separator(),
-            ...disabledComponents,
-            new Separator(),
-        ]
+        ? [...enabledComponents, ...disabledComponents]
         : [...enabledComponents];
 }
 export async function v2ComponentFlow(platformVersion, projectBase, providedAuth, providedDistribution, accountId) {

package/lib/projects/localDev/LocalDevLogger.js

@@ -1,7 +1,7 @@
 import { getAccountId, hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
 import { getConfigDefaultAccount } from '@hubspot/local-dev-lib/config';
 import { uiLogger } from '../../ui/logger.js';
-import { uiBetaTag, uiLine, uiAccountDescription, uiCommandReference, } from '../../ui/index.js';
+import { uiLine, uiAccountDescription, uiCommandReference, } from '../../ui/index.js';
 import { lib } from '../../../lang/en.js';
 import SpinniesManager from '../../ui/SpinniesManager.js';
 import { logError } from '../../errorHandlers/index.js';
@@ -75,7 +75,7 @@ class LocalDevLogger {
         if (!this.state.debug) {
             console.clear();
         }
-        uiBetaTag(lib.LocalDevManager.betaMessage);
+        uiLogger.log(lib.LocalDevManager.headerMessage);
         uiLogger.log(lib.LocalDevManager.learnMoreLocalDevServer);
         uiLogger.log('');
         uiLogger.log(lib.LocalDevManager.running(this.state.projectConfig.name, uiAccountDescription(this.state.targetProjectAccountId)));

package/lib/projects/localDev/LocalDevManager_DEPRECATED.js

@@ -11,7 +11,7 @@ import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { getAccountHomeUrl } from '../urls.js';
 import { componentIsApp, componentIsPublicApp, CONFIG_FILES, getAppCardConfigs, getComponentUid, } from '../structure.js';
 import { ComponentTypes, } from '../../../types/Projects.js';
-import { UI_COLORS, uiCommandReference, uiAccountDescription, uiBetaTag, uiLink, uiLine, } from '../../ui/index.js';
+import { UI_COLORS, uiCommandReference, uiAccountDescription, uiLink, uiLine, } from '../../ui/index.js';
 import { logError } from '../../errorHandlers/index.js';
 import { installAppBrowserPrompt } from '../../prompts/installAppPrompt.js';
 import { confirmPrompt } from '../../prompts/promptUtils.js';
@@ -131,8 +131,8 @@ class LocalDevManager {
         else if (!this.debug) {
             console.clear();
         }
-        uiBetaTag(lib.LocalDevManager.betaMessage);
-        uiLogger.log(uiLink(lib.LocalDevManager.learnMoreLocalDevServer, 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'));
+        uiLogger.log(lib.LocalDevManager.headerMessage);
+        uiLogger.log(uiLink(lib.LocalDevManager.learnMoreLocalDevServer, 'https://developers.hubspot.com/docs/developer-tooling/local-development/hubspot-cli/project-commands'));
         uiLogger.log('');
         uiLogger.log(chalk.hex(UI_COLORS.SORBET)(lib.LocalDevManager.running(this.projectConfig.name, uiAccountDescription(this.targetAccountId))));
         uiLogger.log(lib.LocalDevManager.viewProjectLink(this.projectConfig.name, this.targetProjectAccountId));

package/lib/projects/localDev/LocalDevWebsocketServer.js

@@ -6,7 +6,7 @@ import { LOCAL_DEV_UI_MESSAGE_SEND_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES, CONFIG
 import { lib } from '../../../lang/en.js';
 import { removeAnsiCodes } from '../../ui/removeAnsiCodes.js';
 import { isDeployWebsocketMessage, isViewedWelcomeScreenWebsocketMessage, isUploadWebsocketMessage, isAppInstallFailureWebsocketMessage, isAppInstallSuccessWebsocketMessage, isAppInstallInitiatedWebsocketMessage, } from './localDevWebsocketServerUtils.js';
-import pkg from '../../../package.json' with { type: 'json' };
+import { pkg } from '../../jsonLoader.js';
 const LOCAL_DEV_WEBSOCKET_SERVER_VERSION = 2;
 const LOG_PREFIX = '[LocalDevWebsocketServer]';
 const DOMAINS = ['hubspot.com', 'hubspotqa.com'];