@hubspot/cli 8.0.0-beta.0 → 8.0.0-beta.1

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

@@ -101,12 +101,13 @@ describe('commands/cms/fetch', () => {
                 await fetchCommand.handler(args);
                 expect(trackCommandUsageSpy).toHaveBeenCalledWith('fetch', { mode: 'publish' }, 123456);
             });
-            it('should fetch file successfully', async () => {
+            it('should fetch file successfully with increased timeout', async () => {
                 await fetchCommand.handler(args);
                 expect(downloadFileOrFolderSpy).toHaveBeenCalledWith(123456, '/remote/path/file.js', './local/path', 'publish', expect.objectContaining({
                     assetVersion: undefined,
                     staging: undefined,
                     overwrite: undefined,
+                    timeout: 60000,
                 }));
             });
             it('should use default dest if not provided', async () => {

package/commands/cms/fetch.js

@@ -24,11 +24,12 @@ async function handler(options) {
     trackCommandUsage('fetch', { mode: cmsPublishMode }, derivedAccountId);
     const { assetVersion, staging, overwrite } = options;
     try {
-        // Fetch and write file/folder.
+        // Fetch and write file/folder with increased timeout for large themes.
         await downloadFileOrFolder(derivedAccountId, src, resolveLocalPath(dest), cmsPublishMode, {
             assetVersion: assetVersion !== undefined ? `${assetVersion}` : assetVersion,
             staging,
             overwrite,
+            timeout: 60_000,
         });
     }
     catch (err) {

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

@@ -79,7 +79,7 @@ describe('commands/project/create', () => {
             projectCreateCommand.builder(yargsMock);
             const optionsCall = optionsSpy.mock.calls[0][0];
             expect(optionsCall.auth).toEqual(expect.objectContaining({
-                describe: 'Authentication model for the application.',
+                describe: 'Authentication model for the app.',
                 type: 'string',
                 choices: ['oauth', 'static'],
             }));

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

@@ -2,6 +2,8 @@ import * as configLib from '@hubspot/local-dev-lib/config';
 import * as projectConfigLib from '../../../lib/projects/config.js';
 import * as platformVersionLib from '../../../lib/projects/platformVersion.js';
 import * as projectProfilesLib from '../../../lib/projects/projectProfiles.js';
+import * as projectParsingProfiles from '@hubspot/project-parsing-lib/profiles';
+import * as promptUtilsLib from '../../../lib/prompts/promptUtils.js';
 import * as usageTrackingLib from '../../../lib/usageTracking.js';
 import * as errorHandlers from '../../../lib/errorHandlers/index.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
@@ -10,9 +12,11 @@ import * as deprecatedFlowLib from '../dev/deprecatedFlow.js';
 import * as unifiedFlowLib from '../dev/unifiedFlow.js';
 import projectDevCommand from '../dev/index.js';
 vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('@hubspot/project-parsing-lib/profiles');
 vi.mock('../../../lib/projects/config.js');
 vi.mock('../../../lib/projects/platformVersion.js');
 vi.mock('../../../lib/projects/projectProfiles.js');
+vi.mock('../../../lib/prompts/promptUtils.js');
 vi.mock('../../../lib/errorHandlers/index.js');
 vi.mock('../../../lib/ui/index.js');
 vi.mock('../dev/deprecatedFlow.js');
@@ -23,6 +27,8 @@ const validateProjectConfigSpy = vi.spyOn(projectConfigLib, 'validateProjectConf
 const isV2ProjectSpy = vi.spyOn(platformVersionLib, 'isV2Project');
 const loadProfileSpy = vi.spyOn(projectProfilesLib, 'loadProfile');
 const enforceProfileUsageSpy = vi.spyOn(projectProfilesLib, 'enforceProfileUsage');
+const getAllHsProfilesSpy = vi.spyOn(projectParsingProfiles, 'getAllHsProfiles');
+const listPromptSpy = vi.spyOn(promptUtilsLib, 'listPrompt');
 const trackCommandUsageSpy = vi.spyOn(usageTrackingLib, 'trackCommandUsage');
 const logErrorSpy = vi.spyOn(errorHandlers, 'logError');
 const deprecatedProjectDevFlowSpy = vi.spyOn(deprecatedFlowLib, 'deprecatedProjectDevFlow');
@@ -46,6 +52,8 @@ describe('commands/project/dev', () => {
         deprecatedProjectDevFlowSpy.mockResolvedValue(undefined);
         unifiedProjectDevFlowSpy.mockResolvedValue(undefined);
         enforceProfileUsageSpy.mockResolvedValue(undefined);
+        getAllHsProfilesSpy.mockResolvedValue([]);
+        listPromptSpy.mockResolvedValue('dev');
     });
     describe('command', () => {
         it('should have the correct command structure', () => {
@@ -96,7 +104,11 @@ describe('commands/project/dev', () => {
                     },
                     projectDir: null,
                 });
-                await projectDevCommand.handler(args);
+                // Make process.exit actually throw to stop execution
+                processExitSpy.mockImplementation((code) => {
+                    throw new Error(`process.exit called with ${code}`);
+                });
+                await expect(projectDevCommand.handler(args)).rejects.toThrow('process.exit called');
                 expect(uiLogger.error).toHaveBeenCalledWith(expect.stringContaining('project'));
                 expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
             });
@@ -160,18 +172,37 @@ describe('commands/project/dev', () => {
                 expect(logErrorSpy).toHaveBeenCalledWith(error);
                 expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
             });
-            it('should enforce profile usage for V2 projects without profile', async () => {
+            it('should prompt for profile selection when profiles exist and no profile is specified', async () => {
+                getAllHsProfilesSpy.mockResolvedValue(['dev', 'prod']);
+                listPromptSpy.mockResolvedValue('dev');
+                loadProfileSpy.mockReturnValue({
+                    accountId: 789012,
+                    variables: {},
+                });
                 await projectDevCommand.handler(args);
-                expect(enforceProfileUsageSpy).toHaveBeenCalledWith({
+                expect(getAllHsProfilesSpy).toHaveBeenCalledWith('/test/project/src');
+                expect(listPromptSpy).toHaveBeenCalledWith(expect.any(String), {
+                    choices: ['dev', 'prod'],
+                });
+                expect(loadProfileSpy).toHaveBeenCalledWith({
                     name: 'test-project',
                     srcDir: 'src',
                     platformVersion: 'v2',
-                }, '/test/project');
+                }, '/test/project', 'dev');
+                expect(trackCommandUsageSpy).toHaveBeenCalledWith('project-dev', {}, 789012);
             });
-            it('should exit if profile enforcement fails', async () => {
-                const error = new Error('Profile required');
-                enforceProfileUsageSpy.mockRejectedValue(error);
-                await projectDevCommand.handler(args);
+            it('should exit if profile loading fails after selection', async () => {
+                getAllHsProfilesSpy.mockResolvedValue(['dev', 'prod']);
+                listPromptSpy.mockResolvedValue('dev');
+                const error = new Error('Failed to load profile');
+                loadProfileSpy.mockImplementation(() => {
+                    throw error;
+                });
+                // Make process.exit actually throw to stop execution
+                processExitSpy.mockImplementation((code) => {
+                    throw new Error(`process.exit called with ${code}`);
+                });
+                await expect(projectDevCommand.handler(args)).rejects.toThrow('process.exit called');
                 expect(logErrorSpy).toHaveBeenCalledWith(error);
                 expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
             });

package/commands/project/dev/index.js

@@ -1,5 +1,6 @@
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
+import { getAllHsProfiles, } from '@hubspot/project-parsing-lib/profiles';
 import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { uiLine } from '../../../lib/ui/index.js';
@@ -7,10 +8,12 @@ import { deprecatedProjectDevFlow } from './deprecatedFlow.js';
 import { unifiedProjectDevFlow } from './unifiedFlow.js';
 import { isV2Project } from '../../../lib/projects/platformVersion.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
-import { loadProfile, enforceProfileUsage, } from '../../../lib/projects/projectProfiles.js';
+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 path from 'path';
+import { listPrompt } from '../../../lib/prompts/promptUtils.js';
 const command = 'dev';
 const describe = commands.project.dev.describe;
 function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2) {
@@ -62,27 +65,27 @@ async function handler(args) {
     else if (userProvidedAccount && derivedAccountId) {
         targetProjectAccountId = derivedAccountId;
     }
+    // Determine profile name: from flag or prompt
     if (!targetProjectAccountId && isV2Project(projectConfig.platformVersion)) {
-        if (args.profile) {
-            try {
-                profile = loadProfile(projectConfig, projectDir, args.profile);
-            }
-            catch (error) {
-                logError(error);
-                uiLine();
-                process.exit(EXIT_CODES.ERROR);
+        let profileName = args.profile;
+        if (!profileName) {
+            const existingProfiles = await getAllHsProfiles(path.join(projectDir, projectConfig.srcDir));
+            if (existingProfiles.length !== 0) {
+                profileName = await listPrompt(commands.project.dev.prompts.selectProfile, {
+                    choices: existingProfiles,
+                });
             }
-            targetProjectAccountId = profile.accountId;
-            uiLogger.log('');
-            uiLogger.log(commands.project.dev.logs.profileProjectAccountExplanation(targetProjectAccountId, args.profile));
         }
-        else {
-            // A profile must be specified if this project has profiles configured
+        if (profileName) {
             try {
-                await enforceProfileUsage(projectConfig, projectDir);
+                profile = loadProfile(projectConfig, projectDir, profileName);
+                targetProjectAccountId = profile.accountId;
+                uiLogger.log('');
+                uiLogger.log(commands.project.dev.logs.profileProjectAccountExplanation(targetProjectAccountId, profileName));
             }
             catch (error) {
                 logError(error);
+                uiLine();
                 process.exit(EXIT_CODES.ERROR);
             }
         }

package/commands/testAccount/create.js

@@ -114,7 +114,7 @@ async function handler(args) {
         process.exit(EXIT_CODES.ERROR);
     }
     SpinniesManager.succeed('createTestAccount', {
-        text: commands.testAccount.create.polling.success(testAccountConfig.accountName, resultJson.accountId),
+        text: commands.testAccount.create.polling.success(testAccountConfig.accountName, resultJson.accountId, derivedAccountId),
     });
     if (formatOutputAsJson) {
         uiLogger.json(resultJson);

package/lang/en.d.ts

@@ -1369,6 +1369,9 @@ export declare const commands: {
             examples: {
                 default: string;
             };
+            prompts: {
+                selectProfile: string;
+            };
             options: {
                 profile: string;
                 projectAccount: string;
@@ -2160,7 +2163,7 @@ export declare const commands: {
             polling: {
                 start: (testAccountName: string) => string;
                 syncing: string;
-                success: (testAccountName: string, testAccountId: number) => string;
+                success: (testAccountName: string, testAccountId: number, parentAccountId: number) => string;
                 createFailure: string;
             };
             options: {

package/lang/en.js

@@ -1219,7 +1219,7 @@ export const commands = {
             windsurf: 'Windsurf',
             vsCode: 'VSCode',
             args: {
-                client: 'Target applications to configure',
+                client: 'Target apps to configure',
                 docsSearch: 'Should the docs search mcp server be installed',
             },
             success: (derivedTargets) => `You can now use the HubSpot CLI MCP Server in ${derivedTargets.join(', ')}.  ${chalk.bold('You may need to restart these tools to apply the changes')}.`,
@@ -1261,7 +1261,7 @@ export const commands = {
             },
             prompts: {
                 targets: '[--client] Which tools would you like to add the HubSpot CLI MCP server to?',
-                targetsRequired: 'Must choose at least one application to configure.',
+                targetsRequired: 'Must choose at least one app to configure.',
             },
         },
         start: {
@@ -1385,6 +1385,9 @@ export const commands = {
             examples: {
                 default: 'Start local dev for the current project',
             },
+            prompts: {
+                selectProfile: '[--profile] Select a profile to use for local development',
+            },
             options: {
                 profile: 'The profile to target during local dev',
                 projectAccount: 'The id of the account to upload your project to. Must be used with --testing-account. Supported on platform versions 2025.2 and newer.',
@@ -1438,7 +1441,7 @@ export const commands = {
                     describe: 'How the app will be distributed.',
                 },
                 auth: {
-                    describe: 'Authentication model for the application.',
+                    describe: 'Authentication model for the app.',
                 },
                 features: {
                     describe: `Features to include in the project. Only valid if project-base is ${PROJECT_WITH_APP}`,
@@ -1536,13 +1539,13 @@ export const commands = {
                     describe: "The path to the component type's location within the hubspot-project-components Github repo: https://github.com/HubSpot/hubspot-project-components",
                 },
                 distribution: {
-                    describe: 'The distribution method for the application.',
+                    describe: 'The distribution method for the app.',
                 },
                 auth: {
-                    describe: 'The authentication type for the application.',
+                    describe: 'The authentication type for the app.',
                 },
                 features: {
-                    describe: 'Which features to include with the application.',
+                    describe: 'Which features to include with the app.',
                 },
             },
             creatingComponent: (projectName) => `Adding feature(s) to app [${chalk.bold(projectName)}]\n`,
@@ -2183,7 +2186,7 @@ export const commands = {
             polling: {
                 start: (testAccountName) => `Creating test account "${chalk.bold(testAccountName)}"...`,
                 syncing: 'Test account created! Syncing account data... (may take a few minutes - you can exit and the sync will continue)',
-                success: (testAccountName, testAccountId) => `Test account "${chalk.bold(testAccountName)}" successfully created with id: ${chalk.bold(testAccountId)}`,
+                success: (testAccountName, testAccountId, parentAccountId) => `Test account "${chalk.bold(testAccountName)}" successfully created with id ${chalk.bold(testAccountId)} under parent account ${uiAccountDescription(parentAccountId)}`,
                 createFailure: 'Failed to create test account.',
             },
             options: {
@@ -2206,7 +2209,7 @@ export const commands = {
         },
         createConfig: {
             describe: 'Create a test account config file.',
-            pathPrompt: '[--path] Enter the name of the Test Account config file: ',
+            pathPrompt: '[--path] Enter the name of the test account config file: ',
             errors: {
                 pathError: 'Path is required',
                 pathFormatError: 'Path must end with .json',
@@ -2997,7 +3000,7 @@ export const lib = {
                 privateApp: `This project contains a private app. Local development of private apps is not supported in developer accounts. Change your default account using ${uiCommandReference('hs account use')}, or link a new account with ${uiAuthCommandReference()}.`,
             },
             validateAccountOption: {
-                invalidPublicAppAccount: `This project contains a public app. The "--account" flag must point to a developer test account to develop this project locally. Alternatively, change your default account to an App Developer Account using ${uiCommandReference('hs account use')} and run ${uiCommandReference('hs project dev')} to set up a new Developer Test Account.`,
+                invalidPublicAppAccount: `This project contains a public app. The "--account" flag must point to a developer test account to develop this project locally. Alternatively, change your default account to an app developer account using ${uiCommandReference('hs account use')} and run ${uiCommandReference('hs project dev')} to set up a new developer test account.`,
                 invalidPrivateAppAccount: `This project contains a private app. The account specified with the "--account" flag points to a developer account, which do not support the local development of private apps. Update the "--account" flag to point to a standard, sandbox, or developer test account, or change your default account by running ${uiCommandReference('hs account use')}.`,
                 nonSandboxWarning: `Testing in a sandbox is strongly recommended. To switch the target account, select an option below or run ${uiCommandReference('hs account use')} before running the command again.`,
                 publicAppNonDeveloperTestAccountWarning: `Local development of public apps is only supported in ${chalk.bold('developer test accounts')}.`,
@@ -3059,7 +3062,7 @@ export const lib = {
             prompt: {
                 marketPlaceDistribution: 'On the HubSpot marketplace',
                 privateDistribution: 'Privately',
-                distribution: '[--distribution] Choose how to distribute your application:',
+                distribution: '[--distribution] Choose how to distribute your app:',
                 auth: '[--auth] Choose your authentication type:',
                 staticAuth: 'Static Auth',
                 oauth: 'OAuth',
@@ -3386,10 +3389,10 @@ export const lib = {
             keepingCurrentDefault: (accountName) => `Account "${accountName}" will continue to be the default account`,
         },
         createDeveloperTestAccountConfigPrompt: {
-            namePrompt: (withFlag = true) => `${withFlag ? '[--name] ' : ''}Enter the name of the Test Account:`,
-            descriptionPrompt: (withFlag = true) => `${withFlag ? '[--description] ' : ''}Enter the description of the Test Account:`,
+            namePrompt: (withFlag = true) => `${withFlag ? '[--name] ' : ''}Enter the name of the test account:`,
+            descriptionPrompt: (withFlag = true) => `${withFlag ? '[--description] ' : ''}Enter the description of the test account:`,
             useDefaultAccountLevelsPrompt: {
-                message: 'Would you like to create a default Test Account, or customize your own?',
+                message: 'Would you like to create a default test account, or customize your own?',
                 default: 'Default (All Hubs, ENTERPRISE)',
                 manual: 'Customize my own',
             },
@@ -3405,7 +3408,7 @@ export const lib = {
             errors: {
                 allHubsRequired: 'Select a tier for each hub',
                 tiersError: 'Cannot have more than one tier per hub',
-                nameRequired: 'The name may not be blank. Please add a name for the Test Account.',
+                nameRequired: 'The name may not be blank. Please add a name for the test account.',
             },
         },
         accountNamePrompt: {

package/lib/errorHandlers/__tests__/index.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/errorHandlers/__tests__/index.test.js

@@ -0,0 +1,278 @@
+import { logError, debugError, ApiErrorContext, isErrorWithMessageOrReason, getErrorMessage, } from '../index.js';
+import { uiLogger } from '../../ui/logger.js';
+import { isHubSpotHttpError, isValidationError, } from '@hubspot/local-dev-lib/errors/index';
+import { getConfig } from '@hubspot/local-dev-lib/config';
+import { shouldSuppressError } from '../suppressError.js';
+import { isProjectValidationError } from '../../errors/ProjectValidationError.js';
+import { lib } from '../../../lang/en.js';
+vi.mock('../../ui/logger.js');
+vi.mock('@hubspot/local-dev-lib/errors/index');
+vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../suppressError.js');
+vi.mock('../../errors/ProjectValidationError.js');
+describe('lib/errorHandlers/index', () => {
+    const uiLoggerErrorMock = uiLogger.error;
+    const uiLoggerDebugMock = uiLogger.debug;
+    const isHubSpotHttpErrorMock = isHubSpotHttpError;
+    const isValidationErrorMock = isValidationError;
+    const getConfigMock = getConfig;
+    const shouldSuppressErrorMock = shouldSuppressError;
+    const isProjectValidationErrorMock = isProjectValidationError;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        isHubSpotHttpErrorMock.mockReturnValue(false);
+        isValidationErrorMock.mockReturnValue(false);
+        shouldSuppressErrorMock.mockReturnValue(false);
+        isProjectValidationErrorMock.mockReturnValue(false);
+        getConfigMock.mockReturnValue({});
+    });
+    describe('logError', () => {
+        it('logs ProjectValidationError message and returns early', () => {
+            const error = {
+                message: 'Project validation failed',
+                name: 'ProjectValidationError',
+            };
+            isProjectValidationErrorMock.mockReturnValue(true);
+            logError(error);
+            expect(uiLoggerErrorMock).toHaveBeenCalledWith('Project validation failed');
+            expect(uiLoggerErrorMock).toHaveBeenCalledTimes(1);
+        });
+        it('returns early when error should be suppressed', () => {
+            const error = new Error('Suppressed error');
+            shouldSuppressErrorMock.mockReturnValue(true);
+            logError(error);
+            expect(shouldSuppressErrorMock).toHaveBeenCalled();
+            expect(uiLoggerErrorMock).not.toHaveBeenCalled();
+        });
+        it('logs validation errors for HubSpotHttpError with validation errors', () => {
+            const mockError = {
+                formattedValidationErrors: vi
+                    .fn()
+                    .mockReturnValue('Formatted validation errors'),
+                updateContext: vi.fn(),
+                context: {},
+            };
+            isHubSpotHttpErrorMock.mockReturnValue(true);
+            isValidationErrorMock.mockReturnValue(true);
+            logError(mockError);
+            expect(mockError.formattedValidationErrors).toHaveBeenCalled();
+            expect(uiLoggerErrorMock).toHaveBeenCalledWith('Formatted validation errors');
+        });
+        it('logs error message for errors with message property', () => {
+            const error = new Error('Something went wrong');
+            logError(error);
+            expect(uiLoggerErrorMock).toHaveBeenCalledWith('Something went wrong');
+        });
+        it('logs error with both message and reason', () => {
+            const error = { message: 'Error message', reason: 'Error reason' };
+            logError(error);
+            expect(uiLoggerErrorMock).toHaveBeenCalledWith('Error message Error reason');
+        });
+        it('logs unknown error message for errors without message or reason', () => {
+            const error = { foo: 'bar' };
+            logError(error);
+            expect(uiLoggerErrorMock).toHaveBeenCalledWith(lib.errorHandlers.index.unknownErrorOccurred);
+        });
+        it('calls updateContext on HubSpotHttpError', () => {
+            const mockError = {
+                updateContext: vi.fn(),
+                context: {},
+                message: 'test',
+            };
+            isHubSpotHttpErrorMock.mockReturnValue(true);
+            logError(mockError);
+            expect(mockError.updateContext).toHaveBeenCalled();
+        });
+        describe('timeout error handling', () => {
+            it('shows config timeout message for direct ETIMEDOUT error matching default timeout', () => {
+                const mockError = {
+                    code: 'ETIMEDOUT',
+                    timeout: 15000,
+                    updateContext: vi.fn(),
+                    context: {},
+                    message: 'Timeout',
+                };
+                isHubSpotHttpErrorMock.mockReturnValue(true);
+                getConfigMock.mockReturnValue({ httpTimeout: 15000 });
+                logError(mockError);
+                expect(uiLoggerErrorMock).toHaveBeenCalledTimes(2);
+                expect(uiLoggerErrorMock).toHaveBeenNthCalledWith(1, 'Timeout');
+                expect(uiLoggerErrorMock).toHaveBeenNthCalledWith(2, lib.errorHandlers.index.configTimeoutErrorOccurred(15000, 'hs config set'));
+            });
+            it('shows generic timeout message for direct ETIMEDOUT error with custom timeout', () => {
+                const mockError = {
+                    code: 'ETIMEDOUT',
+                    timeout: 30000,
+                    updateContext: vi.fn(),
+                    context: {},
+                    message: 'Timeout',
+                };
+                isHubSpotHttpErrorMock.mockReturnValue(true);
+                getConfigMock.mockReturnValue({ httpTimeout: 15000 });
+                logError(mockError);
+                expect(uiLoggerErrorMock).toHaveBeenCalledTimes(2);
+                expect(uiLoggerErrorMock).toHaveBeenNthCalledWith(2, lib.errorHandlers.index.genericTimeoutErrorOccurred);
+            });
+            it('detects timeout error wrapped in error.cause', () => {
+                const causeError = {
+                    code: 'ETIMEDOUT',
+                    timeout: 15000,
+                    name: 'HubSpotHttpError',
+                };
+                const wrapperError = new Error('Assets unavailable');
+                Object.defineProperty(wrapperError, 'cause', {
+                    value: causeError,
+                    writable: true,
+                });
+                isHubSpotHttpErrorMock.mockImplementation(err => {
+                    return err === causeError;
+                });
+                getConfigMock.mockReturnValue({ httpTimeout: 15000 });
+                logError(wrapperError);
+                expect(uiLoggerErrorMock).toHaveBeenCalledWith('Assets unavailable');
+                expect(uiLoggerErrorMock).toHaveBeenCalledWith(lib.errorHandlers.index.configTimeoutErrorOccurred(15000, 'hs config set'));
+            });
+            it('shows generic timeout message for wrapped timeout with different timeout value', () => {
+                const causeError = {
+                    code: 'ETIMEDOUT',
+                    timeout: 60000,
+                    name: 'HubSpotHttpError',
+                };
+                const wrapperError = new Error('Assets unavailable');
+                Object.defineProperty(wrapperError, 'cause', {
+                    value: causeError,
+                    writable: true,
+                });
+                isHubSpotHttpErrorMock.mockImplementation(err => {
+                    return err === causeError;
+                });
+                getConfigMock.mockReturnValue({ httpTimeout: 15000 });
+                logError(wrapperError);
+                expect(uiLoggerErrorMock).toHaveBeenCalledTimes(2);
+                expect(uiLoggerErrorMock).toHaveBeenNthCalledWith(2, lib.errorHandlers.index.genericTimeoutErrorOccurred);
+            });
+            it('does not show timeout message for non-timeout errors', () => {
+                const error = new Error('Regular error');
+                logError(error);
+                expect(uiLoggerErrorMock).toHaveBeenCalledTimes(1);
+                expect(uiLoggerErrorMock).toHaveBeenCalledWith('Regular error');
+            });
+        });
+    });
+    describe('debugError', () => {
+        it('logs HubSpotHttpError using toString', () => {
+            const mockError = {
+                toString: vi.fn().mockReturnValue('HubSpotHttpError details'),
+            };
+            isHubSpotHttpErrorMock.mockReturnValue(true);
+            debugError(mockError);
+            expect(uiLoggerDebugMock).toHaveBeenCalledWith('HubSpotHttpError details');
+        });
+        it('logs regular error using lib.errorHandlers.index.errorOccurred', () => {
+            const error = new Error('Regular error');
+            debugError(error);
+            expect(uiLoggerDebugMock).toHaveBeenCalledWith(lib.errorHandlers.index.errorOccurred('Error: Regular error'));
+        });
+        it('logs error.cause when it is a HubSpotHttpError', () => {
+            const causeError = {
+                toString: vi.fn().mockReturnValue('Cause error details'),
+            };
+            const error = new Error('Wrapper error');
+            Object.defineProperty(error, 'cause', {
+                value: causeError,
+                writable: true,
+            });
+            isHubSpotHttpErrorMock.mockImplementation(err => {
+                return err === causeError;
+            });
+            debugError(error);
+            expect(causeError.toString).toHaveBeenCalled();
+            expect(uiLoggerDebugMock).toHaveBeenCalledWith('Cause error details');
+        });
+        it('logs error.cause using lib.errorHandlers.index.errorCause when not a HubSpotHttpError', () => {
+            const causeError = { customField: 'value' };
+            const error = new Error('Wrapper error');
+            Object.defineProperty(error, 'cause', {
+                value: causeError,
+                writable: true,
+            });
+            debugError(error);
+            expect(uiLoggerDebugMock).toHaveBeenCalledWith(expect.stringMatching(/^Cause:/));
+        });
+        it('logs context using lib.errorHandlers.index.errorContext when provided', () => {
+            const error = new Error('Error');
+            const context = new ApiErrorContext({
+                accountId: 123,
+                request: '/api/test',
+            });
+            debugError(error, context);
+            expect(uiLoggerDebugMock).toHaveBeenCalledWith(expect.stringMatching(/^Context:/));
+        });
+    });
+    describe('ApiErrorContext', () => {
+        it('creates context with all properties', () => {
+            const context = new ApiErrorContext({
+                accountId: 123,
+                request: '/api/test',
+                payload: '{"data": "value"}',
+                projectName: 'my-project',
+            });
+            expect(context.accountId).toBe(123);
+            expect(context.request).toBe('/api/test');
+            expect(context.payload).toBe('{"data": "value"}');
+            expect(context.projectName).toBe('my-project');
+        });
+        it('creates context with default values', () => {
+            const context = new ApiErrorContext();
+            expect(context.accountId).toBeUndefined();
+            expect(context.request).toBe('');
+            expect(context.payload).toBe('');
+            expect(context.projectName).toBe('');
+        });
+        it('creates context with partial properties', () => {
+            const context = new ApiErrorContext({
+                accountId: 456,
+            });
+            expect(context.accountId).toBe(456);
+            expect(context.request).toBe('');
+            expect(context.payload).toBe('');
+            expect(context.projectName).toBe('');
+        });
+    });
+    describe('isErrorWithMessageOrReason', () => {
+        it('returns true for object with message property', () => {
+            expect(isErrorWithMessageOrReason({ message: 'test' })).toBe(true);
+        });
+        it('returns true for object with reason property', () => {
+            expect(isErrorWithMessageOrReason({ reason: 'test' })).toBe(true);
+        });
+        it('returns true for object with both message and reason', () => {
+            expect(isErrorWithMessageOrReason({ message: 'msg', reason: 'rsn' })).toBe(true);
+        });
+        it('returns true for Error instances', () => {
+            expect(isErrorWithMessageOrReason(new Error('test'))).toBe(true);
+        });
+        it('returns false for null', () => {
+            expect(isErrorWithMessageOrReason(null)).toBe(false);
+        });
+        it('returns false for undefined', () => {
+            expect(isErrorWithMessageOrReason(undefined)).toBe(false);
+        });
+        it('returns false for primitive values', () => {
+            expect(isErrorWithMessageOrReason('string')).toBe(false);
+            expect(isErrorWithMessageOrReason(123)).toBe(false);
+            expect(isErrorWithMessageOrReason(true)).toBe(false);
+        });
+        it('returns false for object without message or reason', () => {
+            expect(isErrorWithMessageOrReason({ foo: 'bar' })).toBe(false);
+        });
+        it('returns false for empty object', () => {
+            expect(isErrorWithMessageOrReason({})).toBe(false);
+        });
+    });
+    describe('getErrorMessage', () => {
+        it('returns message from Error instance', () => {
+            expect(getErrorMessage(new Error('Error message'))).toBe('Error message');
+        });
+    });
+});

package/lib/errorHandlers/index.js

@@ -36,12 +36,21 @@ export function logError(error, context) {
         // Unknown errors
         uiLogger.error(lib.errorHandlers.index.unknownErrorOccurred);
     }
+    let timeoutError = null;
     if (isHubSpotHttpError(error) && error.code === 'ETIMEDOUT') {
+        timeoutError = error;
+    }
+    else if (error instanceof Error &&
+        isHubSpotHttpError(error.cause) &&
+        error.cause.code === 'ETIMEDOUT') {
+        timeoutError = error.cause;
+    }
+    if (timeoutError) {
         const config = getConfig();
         const defaultTimeout = config?.httpTimeout;
         // Timeout was caused by the default timeout
-        if (error.timeout && defaultTimeout === error.timeout) {
-            uiLogger.error(lib.errorHandlers.index.configTimeoutErrorOccurred(error.timeout, 'hs config set'));
+        if (timeoutError.timeout && defaultTimeout === timeoutError.timeout) {
+            uiLogger.error(lib.errorHandlers.index.configTimeoutErrorOccurred(timeoutError.timeout, 'hs config set'));
         }
         // Timeout was caused by a custom timeout set by the CLI or LDL
         else {

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

@@ -285,7 +285,7 @@ describe('lib/projects/components', () => {
                 type: 'app',
                 uid: 'app_test_app',
                 config: {
-                    name: 'test-app-Application',
+                    name: 'test-app-App',
                     other: 'property',
                 },
             }, null, 2));

package/lib/projects/components.js

@@ -190,7 +190,7 @@ export async function updateHsMetaFilesWithAutoGeneratedFields(projectName, hsMe
             }
             component.uid = uid;
             if (component.type === AppKey && component.config) {
-                component.config.name = `${projectName}-Application`;
+                component.config.name = `${projectName}-App`;
             }
             fs.writeFileSync(hsMetaFile, JSON.stringify(component, null, 2));
         }

package/mcp-server/tools/project/AddFeatureToProjectTool.js

@@ -19,7 +19,7 @@ const inputSchema = {
         z.literal(APP_DISTRIBUTION_TYPES.MARKETPLACE),
         z.literal(APP_DISTRIBUTION_TYPES.PRIVATE),
     ]))
-        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your application on the HubSpot marketplace. '),
+        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your app on the HubSpot marketplace. '),
     auth: z
         .optional(z.union([
         z.literal(APP_AUTH_TYPES.STATIC),
@@ -47,7 +47,7 @@ export class AddFeatureToProjectTool extends Tool {
                 command = addFlag(command, 'distribution', distribution);
             }
             else if (addApp) {
-                content.push(formatTextContent(`Ask the user how they would you like to distribute the application. Options are ${APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${APP_DISTRIBUTION_TYPES.PRIVATE}`));
+                content.push(formatTextContent(`Ask the user how they would you like to distribute the app. Options are ${APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${APP_DISTRIBUTION_TYPES.PRIVATE}`));
             }
             if (auth) {
                 command = addFlag(command, 'auth', auth);

package/mcp-server/tools/project/CreateProjectTool.js

@@ -25,7 +25,7 @@ const inputSchema = {
         z.literal(APP_DISTRIBUTION_TYPES.MARKETPLACE),
         z.literal(APP_DISTRIBUTION_TYPES.PRIVATE),
     ]))
-        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your application on the HubSpot marketplace. '),
+        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your app on the HubSpot marketplace. '),
     auth: z
         .optional(z.union([
         z.literal(APP_AUTH_TYPES.STATIC),
@@ -63,7 +63,7 @@ export class CreateProjectTool extends Tool {
             command = addFlag(command, 'distribution', distribution);
         }
         else if (projectBase === PROJECT_WITH_APP) {
-            content.push(formatTextContent(`Ask the user how they would you like to distribute the application? Options are ${APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${APP_DISTRIBUTION_TYPES.PRIVATE}`));
+            content.push(formatTextContent(`Ask the user how they would you like to distribute the app? Options are ${APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${APP_DISTRIBUTION_TYPES.PRIVATE}`));
         }
         if (auth) {
             command = addFlag(command, 'auth', auth);

package/mcp-server/tools/project/GetApiUsagePatternsByAppIdTool.js

@@ -13,7 +13,7 @@ const inputSchema = {
     appId: z
         .string()
         .regex(/^\d+$/, 'App ID must be a numeric string')
-        .describe('The numeric app ID as a string (e.g., "3003909"). Use get-applications-info to find available app IDs.'),
+        .describe('The numeric app ID as a string (e.g., "3003909"). Use get-apps-info to find available app IDs.'),
     startDate: z
         .string()
         .regex(/^\d{4}-\d{2}-\d{2}$/, 'Start date must be in YYYY-MM-DD format')
@@ -65,7 +65,7 @@ export class GetApiUsagePatternsByAppIdTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Get API Usage Patterns by App ID',
-            description: 'Retrieves detailed API usage pattern analytics for a specific HubSpot application. Requires an appId (string) to identify the target application. Optionally accepts startDate and endDate parameters in YYYY-MM-DD format to filter results within a specific time range. Returns patternSummaries object containing usage statistics including portalPercentage (percentage of portals using this pattern) and numOfPortals (total count of portals) for different usage patterns. This data helps analyze how the application is being used across different HubSpot portals and can inform optimization decisions.',
+            description: 'Retrieves detailed API usage pattern analytics for a specific HubSpot app. Requires an appId (string) to identify the target app. Optionally accepts startDate and endDate parameters in YYYY-MM-DD format to filter results within a specific time range. Returns patternSummaries object containing usage statistics including portalPercentage (percentage of portals using this pattern) and numOfPortals (total count of portals) for different usage patterns. This data helps analyze how the app is being used across different HubSpot portals and can inform optimization decisions.',
             inputSchema,
             annotations: {
                 readOnlyHint: true,

package/mcp-server/tools/project/GetApplicationInfoTool.js

@@ -11,7 +11,7 @@ import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
 const inputSchema = { absoluteCurrentWorkingDirectory };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'get-applications-info';
+const toolName = 'get-apps-info';
 export class GetApplicationInfoTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
@@ -44,8 +44,8 @@ export class GetApplicationInfoTool extends Tool {
     }
     register() {
         return this.mcpServer.registerTool(toolName, {
-            title: 'Get Applications Information',
-            description: 'Retrieves a list of all HubSpot applications available in the current account. Returns an array of applications, where each application contains an appId (numeric identifier) and appName (string). This information is useful for identifying available applications before using other tools that require specific application IDs, such as getting API usage patterns. No input parameters are required - this tool fetches all applications from the HubSpot Insights API.',
+            title: 'Get Apps Information',
+            description: 'Retrieves a list of all HubSpot apps available in the current account. Returns an array of apps, where each app contains an appId (numeric identifier) and appName (string). This information is useful for identifying available apps before using other tools that require specific app IDs, such as getting API usage patterns. No input parameters are required - this tool fetches all apps from the HubSpot Insights API.',
             inputSchema,
             annotations: {
                 readOnlyHint: true,

package/mcp-server/tools/project/UploadProjectTools.js

@@ -62,12 +62,15 @@ export class UploadProjectTools extends Tool {
             };
         }
         const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, command);
-        return formatTextContents(stdout, stderr);
+        const response = await formatTextContents(stdout, stderr);
+        // Add reminder about cards needing to be added to views
+        response.content.push(formatTextContent('\nIMPORTANT: If this project contains cards, remember that uploading does NOT make them live automatically. Cards must be manually added to a view in HubSpot to become visible to users.'));
+        return response;
     }
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Upload HubSpot Project',
-            description: 'DO NOT run this tool unless the user specifies they would like to upload the project, it is potentially destructive. Uploads the HubSpot project in current working directory.  If the project does not exist, it will be created. MUST be ran from within the project directory.',
+            description: 'DO NOT run this tool unless the user specifies they would like to upload the project, it is potentially destructive. Uploads the HubSpot project in current working directory.  If the project does not exist, it will be created. MUST be ran from within the project directory. IMPORTANT: Uploading a project does NOT automatically make cards live or visible to users. Cards must be manually added to a view in HubSpot after upload to become visible.',
             inputSchema,
             annotations: {
                 readOnlyHint: false,

package/mcp-server/tools/project/__tests__/AddFeatureToProjectTool.test.js

@@ -87,7 +87,7 @@ describe('mcp-server/tools/project/AddFeatureToProject', () => {
             expect(result.content).toEqual([
                 {
                     type: 'text',
-                    text: expect.stringContaining('Ask the user how they would you like to distribute the application'),
+                    text: expect.stringContaining('Ask the user how they would you like to distribute the app'),
                 },
                 {
                     type: 'text',

package/mcp-server/tools/project/__tests__/CreateProjectTool.test.js

@@ -85,7 +85,7 @@ describe('mcp-server/tools/project/CreateProjectTool', () => {
             expect(result.content).toEqual([
                 {
                     type: 'text',
-                    text: expect.stringContaining('Ask the user how they would you like to distribute the application?'),
+                    text: expect.stringContaining('Ask the user how they would you like to distribute the app?'),
                 },
                 {
                     type: 'text',

package/mcp-server/tools/project/__tests__/GetApiUsagePatternsByAppIdTool.test.js

@@ -36,7 +36,7 @@ describe('mcp-server/tools/project/GetApiUsagePatternsByAppIdTool', () => {
             const result = tool.register();
             expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-api-usage-patterns-by-app-id', expect.objectContaining({
                 title: 'Get API Usage Patterns by App ID',
-                description: expect.stringContaining('Retrieves detailed API usage pattern analytics for a specific HubSpot application'),
+                description: expect.stringContaining('Retrieves detailed API usage pattern analytics for a specific HubSpot app'),
                 inputSchema: expect.objectContaining({
                     appId: expect.objectContaining({
                         describe: expect.any(Function),

package/mcp-server/tools/project/__tests__/GetApplicationInfoTool.test.js

@@ -34,9 +34,9 @@ describe('mcp-server/tools/project/GetApplicationInfoTool', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-applications-info', expect.objectContaining({
-                title: 'Get Applications Information',
-                description: expect.stringContaining('Retrieves a list of all HubSpot applications available in the current account'),
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-apps-info', expect.objectContaining({
+                title: 'Get Apps Information',
+                description: expect.stringContaining('Retrieves a list of all HubSpot apps available in the current account'),
                 inputSchema: expect.any(Object),
             }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);

package/mcp-server/tools/project/__tests__/UploadProjectTools.test.js

@@ -69,6 +69,10 @@ describe('mcp-server/tools/project/UploadProjectTools', () => {
                 content: [
                     { type: 'text', text: 'Project uploaded successfully' },
                     { type: 'text', text: '' },
+                    {
+                        type: 'text',
+                        text: '\nIMPORTANT: If this project contains cards, remember that uploading does NOT make them live automatically. Cards must be manually added to a view in HubSpot to become visible to users.',
+                    },
                 ],
             });
         });
@@ -81,6 +85,10 @@ describe('mcp-server/tools/project/UploadProjectTools', () => {
             expect(result.content).toEqual([
                 { type: 'text', text: 'Project uploaded with warnings' },
                 { type: 'text', text: 'Warning: some files were ignored' },
+                {
+                    type: 'text',
+                    text: '\nIMPORTANT: If this project contains cards, remember that uploading does NOT make them live automatically. Cards must be manually added to a view in HubSpot to become visible to users.',
+                },
             ]);
         });
         it('should handle upload errors', async () => {
@@ -136,6 +144,10 @@ describe('mcp-server/tools/project/UploadProjectTools', () => {
             expect(result.content).toEqual([
                 { type: 'text', text: '' },
                 { type: 'text', text: '' },
+                {
+                    type: 'text',
+                    text: '\nIMPORTANT: If this project contains cards, remember that uploading does NOT make them live automatically. Cards must be manually added to a view in HubSpot to become visible to users.',
+                },
             ]);
         });
         it('should work with different project paths', async () => {

package/package.json

@@ -1,14 +1,14 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.0.0-beta.0",
+    "version": "8.0.0-beta.1",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "type": "module",
     "dependencies": {
         "@hubspot/cms-dev-server": "1.2.1",
-        "@hubspot/local-dev-lib": "5.1.0",
-        "@hubspot/project-parsing-lib": "0.11.1",
+        "@hubspot/local-dev-lib": "5.1.1",
+        "@hubspot/project-parsing-lib": "0.11.2",
         "@hubspot/serverless-dev-runtime": "7.0.7",
         "@hubspot/ui-extensions-dev-server": "1.1.3",
         "@inquirer/prompts": "7.1.0",

package/types/Cms.d.ts

@@ -3,7 +3,7 @@ export declare const TEMPLATE_TYPES: readonly ["page-template", "email-template"
 export type TemplateType = (typeof TEMPLATE_TYPES)[number];
 export declare const HTTP_METHODS: readonly ["DELETE", "GET", "PATCH", "POST", "PUT"];
 export type HttpMethod = (typeof HTTP_METHODS)[number];
-export declare const CONTENT_TYPES: readonly ["ANY", "LANDING_PAGE", "SITE_PAGE", "BLOG_POST", "BLOG_LISTING", "EMAIL", "KNOWLEDGE_BASE", "QUOTE_TEMPLATE", "CUSTOMER_PORTAL", "WEB_INTERACTIVE", "SUBSCRIPTION", "MEMBERSHIP"];
+export declare const CONTENT_TYPES: readonly ["ANY", "LANDING_PAGE", "SITE_PAGE", "BLOG_POST", "BLOG_LISTING", "EMAIL", "KNOWLEDGE_BASE", "QUOTE_TEMPLATE", "QUOTE", "QUOTE_BLUEPRINT", "CUSTOMER_PORTAL", "WEB_INTERACTIVE", "SUBSCRIPTION", "MEMBERSHIP"];
 export type ContentType = (typeof CONTENT_TYPES)[number];
 export type CreateArgs = CommonArgs & ConfigArgs & {
     branch?: string;

package/types/Cms.js

@@ -18,6 +18,8 @@ export const CONTENT_TYPES = [
     'EMAIL',
     'KNOWLEDGE_BASE',
     'QUOTE_TEMPLATE',
+    'QUOTE',
+    'QUOTE_BLUEPRINT',
     'CUSTOMER_PORTAL',
     'WEB_INTERACTIVE',
     'SUBSCRIPTION',