@hubspot/cli 7.6.0-beta.10 → 7.6.0-beta.11

package/commands/getStarted.js

@@ -4,7 +4,7 @@ import open from 'open';
 import { getCwd } from '@hubspot/local-dev-lib/path';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
 import { commands } from '../lang/en.js';
-import { trackCommandUsage } from '../lib/usageTracking.js';
+import { trackCommandMetadataUsage, trackCommandUsage, } from '../lib/usageTracking.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 import { promptUser } from '../lib/prompts/promptUtils.js';
@@ -27,9 +27,9 @@ export const describe = undefined;
 async function handler(args) {
     const { derivedAccountId } = args;
     const env = getEnv(derivedAccountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
+    await trackCommandUsage('get-started', {}, derivedAccountId);
     // TODO: Put this in constants.ts once we have a defined place for the template before INBOUND
     const templateSource = 'robrown-hubspot/hubspot-project-components-ua-app-objects-beta';
-    trackCommandUsage('get-started', {}, derivedAccountId);
     uiInfoSection(commands.getStarted.startTitle, () => {
         uiLogger.log(commands.getStarted.startDescription);
     });
@@ -51,6 +51,8 @@ async function handler(args) {
             default: GET_STARTED_OPTIONS.APP,
         },
     ]);
+    // Track user's initial choice
+    await trackCommandMetadataUsage('get-started', { step: 'select-option', type: selectedOption }, derivedAccountId);
     if (selectedOption === GET_STARTED_OPTIONS.CMS) {
         uiLogger.log(' ');
         uiLogger.log(commands.getStarted.designManager);
@@ -63,6 +65,11 @@ async function handler(args) {
                     message: commands.getStarted.openDesignManagerPrompt,
                 },
             ]);
+            // Track Design Manager browser action
+            await trackCommandMetadataUsage('get-started', {
+                step: 'open-design-manager',
+                type: shouldOpen ? 'opened' : 'declined',
+            }, derivedAccountId);
             if (shouldOpen) {
                 uiLogger.log('');
                 openLink(derivedAccountId, 'design-manager');
@@ -88,6 +95,11 @@ async function handler(args) {
         if (existingProjectConfig &&
             existingProjectDir &&
             projectDest.startsWith(existingProjectDir)) {
+            // Track nested project error
+            await trackCommandMetadataUsage('get-started', {
+                successful: false,
+                step: 'project-creation',
+            }, derivedAccountId);
             uiLogger.log(' ');
             uiLogger.error(commands.project.create.errors.cannotNestProjects(existingProjectDir));
             process.exit(EXIT_CODES.ERROR);
@@ -101,8 +113,16 @@ async function handler(args) {
                 tag: latestRepoReleaseTag,
                 hideLogs: true,
             });
+            await trackCommandMetadataUsage('get-started', {
+                successful: true,
+                step: 'github-clone',
+            }, derivedAccountId);
         }
         catch (err) {
+            await trackCommandMetadataUsage('get-started', {
+                successful: false,
+                step: 'github-clone',
+            }, derivedAccountId);
             debugError(err);
             uiLogger.log(' ');
             uiLogger.error(commands.project.create.errors.failedToDownloadProject);
@@ -121,6 +141,11 @@ async function handler(args) {
         uiLogger.log(' ');
         uiLogger.log(commands.getStarted.prompts.projectCreated.description);
         uiLogger.log(' ');
+        // Track successful project creation
+        await trackCommandMetadataUsage('get-started', {
+            successful: true,
+            step: 'project-creation',
+        }, derivedAccountId);
         // 5. Install dependencies
         const installLocations = await getProjectPackageJsonLocations(projectDest);
         try {
@@ -147,11 +172,21 @@ async function handler(args) {
                 default: true,
             },
         ]);
+        // Track upload decision
+        await trackCommandMetadataUsage('get-started', {
+            step: 'upload-decision',
+            type: shouldUpload ? 'upload' : 'skip',
+        }, derivedAccountId);
         if (shouldUpload) {
             try {
                 // Get the project config for the newly created project
                 const { projectConfig: newProjectConfig, projectDir: newProjectDir } = await getProjectConfig(projectDest);
                 if (!newProjectConfig || !newProjectDir) {
+                    // Track config file not found error
+                    await trackCommandMetadataUsage('get-started', {
+                        successful: false,
+                        step: 'config-file-not-found',
+                    }, derivedAccountId);
                     uiLogger.log(' ');
                     uiLogger.error(commands.getStarted.errors.configFileNotFound);
                     process.exit(EXIT_CODES.ERROR);
@@ -173,11 +208,22 @@ async function handler(args) {
                     skipValidation: false,
                 });
                 if (uploadError) {
+                    // Track upload failure
+                    await trackCommandMetadataUsage('get-started', {
+                        successful: false,
+                        step: 'upload',
+                    }, derivedAccountId);
                     uiLogger.log(' ');
                     uiLogger.error(commands.getStarted.errors.uploadFailed);
                     debugError(uploadError);
                 }
                 else if (result) {
+                    // Track successful upload completion
+                    await trackCommandMetadataUsage('get-started', {
+                        successful: true,
+                        step: 'upload',
+                    }, derivedAccountId);
+                    uiLogger.log(' ');
                     uiLogger.success(commands.getStarted.logs.uploadSuccess);
                     const { data: { results }, } = await fetchPublicAppsForPortal(derivedAccountId);
                     const lastCreatedApp = results.sort((a, b) => b.createdAt - a.createdAt)[0];
@@ -192,6 +238,11 @@ async function handler(args) {
                                 message: commands.getStarted.openInstallUrl,
                             },
                         ]);
+                        // Track Developer Overview browser action
+                        await trackCommandMetadataUsage('get-started', {
+                            step: 'open-distribution-page',
+                            type: shouldOpenOverview ? 'opened' : 'declined',
+                        }, derivedAccountId);
                         if (shouldOpenOverview) {
                             open(getStaticAuthAppInstallUrl({
                                 targetAccountId: derivedAccountId,
@@ -207,6 +258,11 @@ async function handler(args) {
                 }
             }
             catch (err) {
+                // Track upload exception
+                await trackCommandMetadataUsage('get-started', {
+                    successful: false,
+                    step: 'upload',
+                }, derivedAccountId);
                 uiLogger.log(' ');
                 uiLogger.error(commands.getStarted.errors.uploadFailed);
                 debugError(err);
@@ -214,6 +270,11 @@ async function handler(args) {
             }
         }
     }
+    // Track successful completion of get-started command
+    await trackCommandMetadataUsage('get-started', {
+        successful: true,
+        step: 'command-completed',
+    }, derivedAccountId);
     process.exit(EXIT_CODES.SUCCESS);
 }
 function getStartedBuilder(yargs) {

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

@@ -380,17 +380,26 @@ describe('unifiedProjectDevFlow', () => {
         beforeEach(() => {
             isTestAccountOrSandbox.mockReturnValue(false);
         });
-        it('should display account type information when prompting', async () => {
-            selectAccountTypePrompt.mockResolvedValue(HUBSPOT_ACCOUNT_TYPES.STANDARD);
+        it('should log info message when default account is a sandbox or test account', async () => {
+            isTestAccountOrSandbox.mockReturnValue(true);
+            await unifiedProjectDevFlow({
+                args: mockArgs,
+                targetProjectAccountId: mockTargetProjectAccountId,
+                projectConfig: mockProjectConfig,
+                projectDir: mockProjectDir,
+            });
+            expect(uiLogger.log).toHaveBeenCalledWith(commands.project.dev.logs.defaultSandboxOrDevTestTestingAccountExplanation(mockTargetProjectAccountId));
+        });
+        it('should log info message when testingAccount flag is provided', async () => {
+            const providedTestingAccountId = 999;
             await unifiedProjectDevFlow({
                 args: mockArgs,
                 targetProjectAccountId: mockTargetProjectAccountId,
+                providedTargetTestingAccountId: providedTestingAccountId,
                 projectConfig: mockProjectConfig,
                 projectDir: mockProjectDir,
             });
-            expect(uiLine).toHaveBeenCalled();
-            expect(uiLogger.log).toHaveBeenCalledWith(commands.project.dev.logs.accountTypeInformation);
-            expect(uiLogger.log).toHaveBeenCalledWith(commands.project.dev.logs.learnMoreMessage);
+            expect(uiLogger.log).toHaveBeenCalledWith(commands.project.dev.logs.testingAccountFlagExplanation(providedTestingAccountId));
         });
     });
 });

package/commands/project/dev/index.js

@@ -7,7 +7,7 @@ import { deprecatedProjectDevFlow } from './deprecatedFlow.js';
 import { unifiedProjectDevFlow } from './unifiedFlow.js';
 import { useV3Api } from '../../../lib/projects/buildAndDeploy.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
-import { loadProfile, logProfileFooter, logProfileHeader, exitIfUsingProfiles, } from '../../../lib/projectProfiles.js';
+import { loadProfile, exitIfUsingProfiles, } from '../../../lib/projectProfiles.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 const command = 'dev';
@@ -33,19 +33,37 @@ async function handler(args) {
         process.exit(EXIT_CODES.ERROR);
     }
     validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV3);
-    let targetProjectAccountId = (projectAccount && getAccountId(projectAccount)) ||
-        (userProvidedAccount && derivedAccountId);
+    uiBetaTag(commands.project.dev.logs.betaMessage);
+    if (useV3) {
+        uiLogger.log(commands.project.dev.logs.learnMoreMessageV3);
+    }
+    else {
+        uiLogger.log(commands.project.dev.logs.learnMoreMessageLegacy);
+    }
+    let targetProjectAccountId;
     let profile;
+    // Using the new --projectAccount flag
+    if (projectAccount) {
+        targetProjectAccountId = getAccountId(projectAccount);
+        if (targetProjectAccountId) {
+            uiLogger.log('');
+            uiLogger.log(commands.project.dev.logs.projectAccountFlagExplanation(targetProjectAccountId));
+        }
+        // Using the legacy --account flag
+    }
+    else if (userProvidedAccount && derivedAccountId) {
+        targetProjectAccountId = derivedAccountId;
+    }
     if (!targetProjectAccountId && useV3Api(projectConfig.platformVersion)) {
         if (args.profile) {
-            logProfileHeader(args.profile);
             profile = loadProfile(projectConfig, projectDir, args.profile);
             if (!profile) {
                 uiLine();
                 process.exit(EXIT_CODES.ERROR);
             }
             targetProjectAccountId = profile.accountId;
-            logProfileFooter(profile);
+            uiLogger.log('');
+            uiLogger.log(commands.project.dev.logs.profileProjectAccountExplanation(targetProjectAccountId, args.profile));
         }
         else {
             // A profile must be specified if this project has profiles configured
@@ -55,10 +73,12 @@ async function handler(args) {
     if (!targetProjectAccountId) {
         // The user is not using profile or account flags, so we can use the derived accountId
         targetProjectAccountId = derivedAccountId;
+        if (useV3) {
+            uiLogger.log('');
+            uiLogger.log(commands.project.dev.logs.defaultProjectAccountExplanation(targetProjectAccountId));
+        }
     }
     trackCommandUsage('project-dev', {}, targetProjectAccountId);
-    uiBetaTag(commands.project.dev.logs.betaMessage);
-    uiLogger.log(commands.project.dev.logs.learnMoreLocalDevServer);
     if (useV3Api(projectConfig.platformVersion)) {
         const targetTestingAccountId = (testingAccount && getAccountId(testingAccount)) || undefined;
         await unifiedProjectDevFlow({
@@ -86,13 +106,13 @@ function projectDevBuilder(yargs) {
         description: commands.project.dev.options.profile,
         hidden: true,
     });
-    yargs.options('testingAccount', {
+    yargs.options('testing-account', {
         type: 'string',
         description: commands.project.dev.options.testingAccount,
         hidden: true,
-        implies: ['projectAccount'],
+        implies: ['project-account'],
     });
-    yargs.options('projectAccount', {
+    yargs.options('project-account', {
         type: 'string',
         description: commands.project.dev.options.projectAccount,
         hidden: true,
@@ -100,8 +120,8 @@ function projectDevBuilder(yargs) {
     });
     yargs.example([['$0 project dev', commands.project.dev.examples.default]]);
     yargs.conflicts('profile', 'account');
-    yargs.conflicts('profile', 'testingAccount');
-    yargs.conflicts('profile', 'projectAccount');
+    yargs.conflicts('profile', 'testing-account');
+    yargs.conflicts('profile', 'project-account');
     return yargs;
 }
 export const builder = makeYargsBuilder(projectDevBuilder, command, describe, {

package/commands/project/dev/unifiedFlow.js

@@ -16,7 +16,6 @@ import LocalDevProcess from '../../../lib/projects/localDev/LocalDevProcess.js';
 import LocalDevWatcher from '../../../lib/projects/localDev/LocalDevWatcher.js';
 import { handleExit, handleKeypress } from '../../../lib/process.js';
 import { isTestAccountOrSandbox, isUnifiedAccount, } from '../../../lib/accountTypes.js';
-import { uiLine } from '../../../lib/ui/index.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import { commands } from '../../../lang/en.js';
 import LocalDevWebsocketServer from '../../../lib/projects/localDev/LocalDevWebsocketServer.js';
@@ -69,13 +68,9 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
     !targetTestingAccountId &&
         targetProjectAccountIsTestAccountOrSandbox) {
         targetTestingAccountId = targetProjectAccountId;
+        uiLogger.log(commands.project.dev.logs.defaultSandboxOrDevTestTestingAccountExplanation(targetProjectAccountId));
     }
     else if (!targetTestingAccountId) {
-        uiLogger.log('');
-        uiLine();
-        uiLogger.log(commands.project.dev.logs.accountTypeInformation);
-        uiLogger.log(commands.project.dev.logs.learnMoreMessage);
-        uiLine();
         uiLogger.log('');
         const accountType = await selectAccountTypePrompt(targetProjectAccountConfig);
         if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST) {
@@ -101,6 +96,9 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
             targetTestingAccountId = targetProjectAccountId;
         }
     }
+    else {
+        uiLogger.log(commands.project.dev.logs.testingAccountFlagExplanation(targetTestingAccountId));
+    }
     // Check if project exists in HubSpot
     const { projectExists, project: uploadedProject } = await ensureProjectExists(targetProjectAccountId, projectConfig.name, {
         allowCreate: false,

package/lang/en.d.ts

@@ -1009,10 +1009,15 @@ Profiles enable you to reference variables in your component configuration files
             readonly logs: {
                 readonly betaMessage: "HubSpot projects local development";
                 readonly placeholderAccountSelection: "Using default account as target account (for now)";
-                readonly learnMoreLocalDevServer: string;
                 readonly accountTypeInformation: "Testing in a developer test account is strongly recommended, but you can use a sandbox account if your plan allows you to create one.";
-                readonly learnMoreMessage: `
-Visit our ${string} to learn more.`;
+                readonly learnMoreMessageV3: `Learn more about ${string} | ${string}`;
+                readonly learnMoreMessageLegacy: string;
+                readonly profileProjectAccountExplanation: (accountId: number, profileName: string) => string;
+                readonly defaultProjectAccountExplanation: (accountId: number) => string;
+                readonly projectAccountFlagExplanation: (accountId: number) => string;
+                readonly accountFlagExplanation: (accountId: number) => string;
+                readonly defaultSandboxOrDevTestTestingAccountExplanation: (accountId: number) => string;
+                readonly testingAccountFlagExplanation: (accountId: number) => string;
             };
             readonly errors: {
                 readonly noProjectConfig: "No project detected. Please run this command again from a project directory.";
@@ -1022,8 +1027,8 @@ Visit our ${string} to learn more.`;
                 readonly noRunnableComponents: `No supported components were found in this project. Run ${string} to see a list of available components and add one to your project.`;
                 readonly accountNotCombined: `
 Local development of unified apps is currently only compatible with accounts that are opted into the unified apps beta. Make sure that this account is opted in or switch accounts using ${string}.`;
-                readonly unsupportedAccountFlagLegacy: "The --projectAccount and --testingAccount flags are not supported for projects with platform versions earlier than 2025.2.";
-                readonly unsupportedAccountFlagV3: "The --account flag is is not supported supported for projects with platform versions 2025.2 and newer. Use --testingAccount and --projectAccount flags to specify accounts to use for local dev";
+                readonly unsupportedAccountFlagLegacy: "The --project-account and --testing-account flags are not supported for projects with platform versions earlier than 2025.2.";
+                readonly unsupportedAccountFlagV3: "The --account flag is is not supported supported for projects with platform versions 2025.2 and newer. Use --testing-account and --project-account flags to specify accounts to use for local dev";
             };
             readonly examples: {
                 readonly default: "Start local dev for the current project";
@@ -2557,6 +2562,12 @@ export declare const lib: {
         readonly autoInstallDeclined: "You must install your app on your target test account to proceed with local development.";
         readonly autoInstallSuccess: (appName: string, targetTestAccountId: number) => string;
         readonly autoInstallError: (appName: string, targetTestAccountId: number) => string;
+        readonly fetchAppData: {
+            readonly checking: (appName: string) => string;
+            readonly success: (appName: string, accountId: number) => string;
+            readonly notInstalled: (appName: string, accountId: number) => string;
+            readonly activeInstallations: (appName: string, installCount: number) => string;
+        };
     };
     readonly LocalDevWebsocketServer: {
         readonly errors: {
@@ -2616,11 +2627,11 @@ export declare const lib: {
                 readonly notAuthedError: (parentAccountId: number | string, accountIdentifier: string) => string;
             };
             readonly selectAccountTypePrompt: {
-                readonly message: "[--account] Choose the type of account to test on";
-                readonly developerTestAccountOption: "Test on a developer test account";
+                readonly message: "[--testing-account] Choose the type of account to test on";
+                readonly developerTestAccountOption: "Test on a developer test account (recommended)";
                 readonly sandboxAccountOption: "Test on a sandbox account";
                 readonly sandboxAccountOptionDisabled: "Disabled - requires access to sandbox accounts";
-                readonly productionAccountOption: `<${string} Test on this account ${string}>`;
+                readonly productionAccountOption: (accountId?: number) => string;
             };
             readonly confirmDefaultAccountIsTarget: {
                 readonly configError: `An error occurred while reading the default account from your config. Run ${string} to re-auth this account`;

package/lang/en.js

@@ -1010,9 +1010,15 @@ export const commands = {
             logs: {
                 betaMessage: 'HubSpot projects local development',
                 placeholderAccountSelection: 'Using default account as target account (for now)',
-                learnMoreLocalDevServer: uiLink('Learn more about the projects local dev server', 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'),
                 accountTypeInformation: 'Testing in a developer test account is strongly recommended, but you can use a sandbox account if your plan allows you to create one.',
-                learnMoreMessage: `\nVisit our ${uiLink('docs on Developer Test and Sandbox accounts', 'https://developers.hubspot.com/docs/getting-started/account-types')} to learn more.`,
+                learnMoreMessageV3: `Learn more about ${uiLink('HubSpot projects local dev', 'https://hubspot.mintlify.io/en-us/developer-tooling/local-development/hubspot-cli/project-commands#start-a-local-development-server')} | ${uiLink('HubSpot account types', 'https://developers.hubspot.com/docs/getting-started/account-types')}`,
+                learnMoreMessageLegacy: uiLink('Learn more about the projects local dev server', 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'),
+                profileProjectAccountExplanation: (accountId, profileName) => `Using account ${uiAccountDescription(accountId)} from profile ${chalk.bold(profileName)} for project upload`,
+                defaultProjectAccountExplanation: (accountId) => `Using default account ${uiAccountDescription(accountId)} for project upload`,
+                projectAccountFlagExplanation: (accountId) => `Using account ${uiAccountDescription(accountId)} provided by the --project-account flag for project upload`,
+                accountFlagExplanation: (accountId) => `Using account ${uiAccountDescription(accountId)} provided by the --account flag for project upload`,
+                defaultSandboxOrDevTestTestingAccountExplanation: (accountId) => `Using default account ${uiAccountDescription(accountId)} for testing`,
+                testingAccountFlagExplanation: (accountId) => `Using account ${uiAccountDescription(accountId)} provided by the --testing-account flag for testing`,
             },
             errors: {
                 noProjectConfig: 'No project detected. Please run this command again from a project directory.',
@@ -1021,8 +1027,8 @@ export const commands = {
                 invalidProjectComponents: 'Projects cannot contain both private and public apps. Move your apps to separate projects before attempting local development.',
                 noRunnableComponents: `No supported components were found in this project. Run ${uiCommandReference('hs project add')} to see a list of available components and add one to your project.`,
                 accountNotCombined: `\nLocal development of unified apps is currently only compatible with accounts that are opted into the unified apps beta. Make sure that this account is opted in or switch accounts using ${uiCommandReference('hs account use')}.`,
-                unsupportedAccountFlagLegacy: 'The --projectAccount and --testingAccount flags are not supported for projects with platform versions earlier than 2025.2.',
-                unsupportedAccountFlagV3: 'The --account flag is is not supported supported for projects with platform versions 2025.2 and newer. Use --testingAccount and --projectAccount flags to specify accounts to use for local dev',
+                unsupportedAccountFlagLegacy: 'The --project-account and --testing-account flags are not supported for projects with platform versions earlier than 2025.2.',
+                unsupportedAccountFlagV3: 'The --account flag is is not supported supported for projects with platform versions 2025.2 and newer. Use --testing-account and --project-account flags to specify accounts to use for local dev',
             },
             examples: {
                 default: 'Start local dev for the current project',
@@ -2553,6 +2559,12 @@ export const lib = {
         autoInstallDeclined: 'You must install your app on your target test account to proceed with local development.',
         autoInstallSuccess: (appName, targetTestAccountId) => `Successfully installed app ${appName} on account ${uiAccountDescription(targetTestAccountId)}\n`,
         autoInstallError: (appName, targetTestAccountId) => `Error installing app ${appName} on account ${uiAccountDescription(targetTestAccountId)}. You may still be able to install your app in your browser.`,
+        fetchAppData: {
+            checking: (appName) => `Checking installations for your app ${appName}...`,
+            success: (appName, accountId) => `Your app ${appName} is installed on account ${uiAccountDescription(accountId, false)}`,
+            notInstalled: (appName, accountId) => `Your app ${appName} is not currently installed on account ${uiAccountDescription(accountId, false)}`,
+            activeInstallations: (appName, installCount) => chalk.bold(`Your app ${appName} is installed in ${chalk.bold(`${installCount} ${installCount === 1 ? 'account' : 'accounts'}`)}`),
+        },
     },
     LocalDevWebsocketServer: {
         errors: {
@@ -2612,11 +2624,11 @@ export const lib = {
                 notAuthedError: (parentAccountId, accountIdentifier) => `To develop this project locally, run ${uiCommandReference(`hs auth --account=${parentAccountId}`)} to authenticate the App Developer Account ${parentAccountId} associated with ${accountIdentifier}.`,
             },
             selectAccountTypePrompt: {
-                message: '[--account] Choose the type of account to test on',
-                developerTestAccountOption: 'Test on a developer test account',
+                message: '[--testing-account] Choose the type of account to test on',
+                developerTestAccountOption: 'Test on a developer test account (recommended)',
                 sandboxAccountOption: 'Test on a sandbox account',
                 sandboxAccountOptionDisabled: 'Disabled - requires access to sandbox accounts',
-                productionAccountOption: `<${chalk.red('!')} Test on this account ${chalk.red('!')}>`,
+                productionAccountOption: (accountId) => `<${chalk.red('!')} Test on your project account: ${uiAccountDescription(accountId, false)} ${chalk.red('!')}>`,
             },
             confirmDefaultAccountIsTarget: {
                 configError: `An error occurred while reading the default account from your config. Run ${uiCommandReference('hs auth')} to re-auth this account`,

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

@@ -37,6 +37,7 @@ vi.mock('../../ui/logger');
 vi.mock('../../errorHandlers/index');
 vi.mock('../localDev/LocalDevState');
 vi.mock('../localDev/LocalDevLogger');
+vi.mock('../../ui/SpinniesManager');
 describe('AppDevModeInterface', () => {
     let appDevModeInterface;
     let mockLocalDevState;

package/lib/projects/localDev/AppDevModeInterface.js

@@ -14,6 +14,7 @@ import { lib } from '../../../lang/en.js';
 import { uiLogger } from '../../ui/logger.js';
 import { getOauthAppInstallUrl, getStaticAuthAppInstallUrl, } from '../../app/urls.js';
 import { isDeveloperTestAccount, isSandbox } from '../../accountTypes.js';
+import SpinniesManager from '../../ui/SpinniesManager.js';
 class AppDevModeInterface {
     localDevState;
     localDevLogger;
@@ -86,6 +87,9 @@ class AppDevModeInterface {
         });
     }
     async fetchAppData() {
+        SpinniesManager.add('fetchAppData', {
+            text: lib.AppDevModeInterface.fetchAppData.checking(this.appNode?.config.name || ''),
+        });
         const { data: { results: portalApps }, } = await fetchPublicAppsForPortal(this.localDevState.targetProjectAccountId);
         const appData = portalApps.find(({ sourceId }) => sourceId === this.appNode?.uid);
         if (!appData) {
@@ -105,8 +109,11 @@ class AppDevModeInterface {
         if (!this.appData || !this.marketplaceAppInstalls) {
             return;
         }
+        SpinniesManager.fail('fetchAppData', {
+            text: lib.AppDevModeInterface.fetchAppData.activeInstallations(this.appNode?.config.name || '', this.marketplaceAppInstalls),
+            failColor: 'yellow',
+        });
         uiLine();
-        uiLogger.warn(lib.LocalDevManager.activeInstallWarning.installCount(this.appData.name, this.marketplaceAppInstalls));
         uiLogger.log(lib.LocalDevManager.activeInstallWarning.explanation);
         uiLine();
         const proceed = await confirmPrompt(lib.LocalDevManager.activeInstallWarning.confirmationPrompt, { defaultAnswer: false });
@@ -177,8 +184,22 @@ class AppDevModeInterface {
             }
             const { needsInstall, isReinstall } = await this.checkTestAccountAppInstallation();
             if (needsInstall) {
+                if (SpinniesManager.pick('fetchAppData')) {
+                    SpinniesManager.fail('fetchAppData', {
+                        text: lib.AppDevModeInterface.fetchAppData.notInstalled(this.appNode.config.name, this.localDevState.targetTestingAccountId),
+                        failColor: 'white',
+                    });
+                }
                 await this.installAppOrOpenInstallUrl(isReinstall || false);
             }
+            else {
+                if (SpinniesManager.pick('fetchAppData')) {
+                    SpinniesManager.succeed('fetchAppData', {
+                        text: lib.AppDevModeInterface.fetchAppData.success(this.appNode.config.name, this.localDevState.targetTestingAccountId),
+                    });
+                }
+                uiLogger.log('');
+            }
         }
         catch (e) {
             logError(e);

package/lib/projects/localDev/helpers/account.js

@@ -206,6 +206,7 @@ export async function hasSandboxes(account) {
 // Top level prompt to choose the type of account to test on
 export async function selectAccountTypePrompt(accountConfig) {
     const hasAccessToSandboxes = await hasSandboxes(accountConfig);
+    const accountId = getAccountIdentifier(accountConfig);
     const result = await listPrompt(lib.localDevHelpers.account.selectAccountTypePrompt.message, {
         choices: [
             {
@@ -223,8 +224,7 @@ export async function selectAccountTypePrompt(accountConfig) {
                     : false,
             },
             {
-                name: lib.localDevHelpers.account.selectAccountTypePrompt
-                    .productionAccountOption,
+                name: lib.localDevHelpers.account.selectAccountTypePrompt.productionAccountOption(accountId),
                 value: null,
             },
         ],

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -151,6 +151,7 @@ async function selectTargetAccountPrompt(defaultAccountId, accountType, choices)
                 accountType,
             }),
             choices,
+            loop: false,
         },
     ]);
     return targetAccountInfo;

package/lib/prompts/promptUtils.d.ts

@@ -5,11 +5,12 @@ export declare function promptUser<T extends GenericPromptResponse>(config: Prom
 export declare function confirmPrompt(message: string, options?: {
     defaultAnswer?: boolean;
 }): Promise<boolean>;
-export declare function listPrompt<T = string>(message: string, { choices, when, defaultAnswer, validate, }: {
+export declare function listPrompt<T = string>(message: string, { choices, when, defaultAnswer, validate, loop, }: {
     choices: PromptChoices<T>;
     when?: PromptWhen;
     defaultAnswer?: string | number | boolean;
     validate?: (input: T[]) => (boolean | string) | Promise<boolean | string>;
+    loop?: boolean;
 }): Promise<T>;
 export declare function inputPrompt(message: string, { when, validate, defaultAnswer, }?: {
     when?: boolean | (() => boolean);

package/lib/prompts/promptUtils.js

@@ -102,6 +102,7 @@ function handleRawListPrompt(config) {
         choices: choices,
         pageSize: config.pageSize,
         default: config.default,
+        loop: config.loop,
     }).then(resp => ({ [config.name]: resp }));
 }
 function handleNumberPrompt(config) {
@@ -125,6 +126,7 @@ function handleCheckboxPrompt(config) {
         choices: choices,
         pageSize: config.pageSize,
         validate: config.validate,
+        loop: config.loop,
     }).then(resp => ({ [config.name]: resp }));
 }
 function handleConfirmPrompt(config) {
@@ -147,6 +149,7 @@ function handleSelectPrompt(config) {
         choices: choices,
         default: config.default,
         pageSize: config.pageSize,
+        loop: config.loop,
     }).then(resp => ({ [config.name]: resp }));
 }
 export async function confirmPrompt(message, options = {}) {
@@ -157,7 +160,7 @@ export async function confirmPrompt(message, options = {}) {
     });
     return choice;
 }
-export async function listPrompt(message, { choices, when, defaultAnswer, validate, }) {
+export async function listPrompt(message, { choices, when, defaultAnswer, validate, loop, }) {
     const { choice } = await promptUser({
         name: 'choice',
         type: 'list',
@@ -166,6 +169,7 @@ export async function listPrompt(message, { choices, when, defaultAnswer, valida
         when,
         default: defaultAnswer,
         validate,
+        loop,
     });
     return choice;
 }

package/mcp-server/server.js

@@ -1,6 +1,6 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { StdioServerTransport } from '@modelcontextprotocol/sdk/server/stdio.js';
-import { registerProjectTools } from './tools/index.js';
+import { registerProjectTools, registerCmsTools } from './tools/index.js';
 const server = new McpServer({
     name: 'HubSpot CLI MCP Server',
     version: '0.0.1',
@@ -11,6 +11,7 @@ const server = new McpServer({
     },
 });
 registerProjectTools(server);
+registerCmsTools(server);
 // Start receiving messages on stdin and sending messages on stdout
 const transport = new StdioServerTransport();
 server.connect(transport);

package/mcp-server/tools/cms/HsListTool.d.ts

@@ -0,0 +1,23 @@
+import { TextContentResponse, Tool } from '../../types.js';
+import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { z } from 'zod';
+declare const inputSchemaZodObject: z.ZodObject<{
+    absoluteCurrentWorkingDirectory: z.ZodString;
+    path: z.ZodOptional<z.ZodString>;
+    account: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    absoluteCurrentWorkingDirectory: string;
+    account?: string | undefined;
+    path?: string | undefined;
+}, {
+    absoluteCurrentWorkingDirectory: string;
+    account?: string | undefined;
+    path?: string | undefined;
+}>;
+export type HsListInputSchema = z.infer<typeof inputSchemaZodObject>;
+export declare class HsListTool extends Tool<HsListInputSchema> {
+    constructor(mcpServer: McpServer);
+    handler({ path, account, absoluteCurrentWorkingDirectory, }: HsListInputSchema): Promise<TextContentResponse>;
+    register(): RegisteredTool;
+}
+export {};

package/mcp-server/tools/cms/HsListTool.js

@@ -0,0 +1,58 @@
+import { Tool } from '../../types.js';
+import { z } from 'zod';
+import { addFlag } from '../../utils/command.js';
+import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
+import { runCommandInDir } from '../../utils/project.js';
+import { formatTextContents } from '../../utils/content.js';
+import { trackToolUsage } from '../../utils/toolUsageTracking.js';
+const inputSchema = {
+    absoluteCurrentWorkingDirectory,
+    path: z
+        .string()
+        .describe('The remote directory path in the HubSpot CMS to list contents. If not specified, lists the root directory.')
+        .optional(),
+    account: z
+        .string()
+        .describe('The HubSpot account id or name from the HubSpot config file to use for the operation.')
+        .optional(),
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const inputSchemaZodObject = z.object({ ...inputSchema });
+const toolName = 'list-hubspot-cms-remote-contents';
+export class HsListTool extends Tool {
+    constructor(mcpServer) {
+        super(mcpServer);
+    }
+    async handler({ path, account, absoluteCurrentWorkingDirectory, }) {
+        await trackToolUsage(toolName);
+        let command = 'hs list';
+        if (path) {
+            command += ` ${path}`;
+        }
+        if (account) {
+            command = addFlag(command, 'account', account);
+        }
+        try {
+            const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
+            return formatTextContents(stdout, stderr);
+        }
+        catch (error) {
+            const errorMessage = error instanceof Error ? error.message : String(error);
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: `Error executing hs list command: ${errorMessage}`,
+                    },
+                ],
+            };
+        }
+    }
+    register() {
+        return this.mcpServer.registerTool(toolName, {
+            title: 'List HubSpot CMS Directory Contents',
+            description: 'List remote contents of a HubSpot CMS directory.',
+            inputSchema,
+        }, this.handler);
+    }
+}

package/mcp-server/tools/cms/__tests__/HsListTool.test.d.ts

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

package/mcp-server/tools/cms/__tests__/HsListTool.test.js

@@ -0,0 +1,120 @@
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import { HsListTool } from '../HsListTool.js';
+import { runCommandInDir } from '../../../utils/project.js';
+import { addFlag } from '../../../utils/command.js';
+vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
+vi.mock('../../../utils/project');
+vi.mock('../../../utils/command');
+vi.mock('../../../utils/toolUsageTracking', () => ({
+    trackToolUsage: vi.fn(),
+}));
+const mockRunCommandInDir = runCommandInDir;
+const mockAddFlag = addFlag;
+describe('HsListTool', () => {
+    let mockMcpServer;
+    let tool;
+    let mockRegisteredTool;
+    beforeEach(() => {
+        vi.clearAllMocks();
+        // @ts-expect-error Not mocking the whole server
+        mockMcpServer = {
+            registerTool: vi.fn(),
+        };
+        mockRegisteredTool = {};
+        mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        tool = new HsListTool(mockMcpServer);
+    });
+    describe('register', () => {
+        it('should register the tool with the MCP server', () => {
+            const result = tool.register();
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-hubspot-cms-remote-contents', {
+                title: 'List HubSpot CMS Directory Contents',
+                description: 'List remote contents of a HubSpot CMS directory.',
+                inputSchema: expect.any(Object),
+            }, expect.any(Function));
+            expect(result).toBe(mockRegisteredTool);
+        });
+    });
+    describe('handler', () => {
+        it('should execute hs list command with no parameters', async () => {
+            mockRunCommandInDir.mockResolvedValue({
+                stdout: 'file1.html\nfile2.js\nfolder/',
+                stderr: '',
+            });
+            const result = await tool.handler({
+                absoluteCurrentWorkingDirectory: '/test/dir',
+            });
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/dir', 'hs list');
+            expect(result.content).toHaveLength(2);
+            expect(result.content[0].text).toContain('file1.html\nfile2.js\nfolder/');
+            expect(result.content[1].text).toBe('');
+        });
+        it('should execute hs list command with path parameter', async () => {
+            mockRunCommandInDir.mockResolvedValue({
+                stdout: 'nested-file.html',
+                stderr: '',
+            });
+            const result = await tool.handler({
+                absoluteCurrentWorkingDirectory: '/test/dir',
+                path: '/my-modules',
+            });
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/dir', 'hs list /my-modules');
+            expect(result.content).toHaveLength(2);
+            expect(result.content[0].text).toContain('nested-file.html');
+            expect(result.content[1].text).toBe('');
+        });
+        it('should execute hs list command with account parameter', async () => {
+            mockAddFlag.mockReturnValue('hs list --account test-account');
+            mockRunCommandInDir.mockResolvedValue({
+                stdout: 'account-specific-files.html',
+                stderr: '',
+            });
+            const result = await tool.handler({
+                absoluteCurrentWorkingDirectory: '/test/dir',
+                account: 'test-account',
+            });
+            expect(mockAddFlag).toHaveBeenCalledWith('hs list', 'account', 'test-account');
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/dir', 'hs list --account test-account');
+            expect(result.content).toHaveLength(2);
+            expect(result.content[0].text).toContain('account-specific-files.html');
+            expect(result.content[1].text).toBe('');
+        });
+        it('should execute hs list command with both path and account parameters', async () => {
+            mockAddFlag.mockReturnValue('hs list /my-path --account test-account');
+            mockRunCommandInDir.mockResolvedValue({
+                stdout: 'path-and-account-files.html',
+                stderr: '',
+            });
+            const result = await tool.handler({
+                absoluteCurrentWorkingDirectory: '/test/dir',
+                path: '/my-path',
+                account: 'test-account',
+            });
+            expect(mockAddFlag).toHaveBeenCalledWith('hs list /my-path', 'account', 'test-account');
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/dir', 'hs list /my-path --account test-account');
+            expect(result.content).toHaveLength(2);
+            expect(result.content[0].text).toContain('path-and-account-files.html');
+            expect(result.content[1].text).toBe('');
+        });
+        it('should handle command execution errors', async () => {
+            mockRunCommandInDir.mockRejectedValue(new Error('Command failed'));
+            const result = await tool.handler({
+                absoluteCurrentWorkingDirectory: '/test/dir',
+            });
+            expect(result.content).toHaveLength(1);
+            expect(result.content[0].text).toContain('Error executing hs list command: Command failed');
+        });
+        it('should handle stderr output', async () => {
+            mockRunCommandInDir.mockResolvedValue({
+                stdout: 'file1.html',
+                stderr: 'Warning: Some warning message',
+            });
+            const result = await tool.handler({
+                absoluteCurrentWorkingDirectory: '/test/dir',
+            });
+            expect(result.content).toHaveLength(2);
+            expect(result.content[0].text).toContain('file1.html');
+            expect(result.content[1].text).toContain('Warning: Some warning message');
+        });
+    });
+});

package/mcp-server/tools/index.d.ts

@@ -1,2 +1,3 @@
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 export declare function registerProjectTools(mcpServer: McpServer): RegisteredTool[];
+export declare function registerCmsTools(mcpServer: McpServer): RegisteredTool[];

package/mcp-server/tools/index.js

@@ -7,6 +7,7 @@ import { ValidateProjectTool } from './project/ValidateProjectTool.js';
 import { GetConfigValuesTool } from './project/GetConfigValuesTool.js';
 import { DocsSearchTool } from './project/DocsSearchTool.js';
 import { DocFetchTool } from './project/DocFetchTool.js';
+import { HsListTool } from './cms/HsListTool.js';
 export function registerProjectTools(mcpServer) {
     return [
         new UploadProjectTools(mcpServer).register(),
@@ -20,3 +21,6 @@ export function registerProjectTools(mcpServer) {
         new DocFetchTool(mcpServer).register(),
     ];
 }
+export function registerCmsTools(mcpServer) {
+    return [new HsListTool(mcpServer).register()];
+}

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

@@ -41,8 +41,8 @@ export class DocFetchTool extends Tool {
     }
     register() {
         return this.mcpServer.registerTool(toolName, {
-            title: 'Fetch a single HubSpot Developer Documentation file',
-            description: 'Fetch a single HubSpot Developer Documentation file by URL. Call after search-hubspot-docs.',
+            title: 'Fetch HubSpot Developer Documentation (single file)',
+            description: 'Always use this immediately after `search-hubspot-docs` and before creating a plan, writing code, or answering technical questions. This tool retrieves the full, authoritative content of a HubSpot Developer Documentation page from its URL, ensuring responses are accurate, up-to-date, and grounded in the official docs.',
             inputSchema,
         }, this.handler);
     }

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

@@ -54,8 +54,8 @@ export class DocsSearchTool extends Tool {
     }
     register() {
         return this.mcpServer.registerTool(toolName, {
-            title: 'Search the HubSpot docs',
-            description: 'Search the HubSpot docs for information. This will return results that include a url to be used in fetch-hubspot-doc.',
+            title: 'Search HubSpot Developer Documentation',
+            description: 'Use this first whenever you need details about HubSpot APIs, SDKs, integrations, or developer platform features. This searches the official HubSpot Developer Documentation and returns the most relevant pages, each with a URL for use in `fetch-hubspot-doc`. Always follow this with a fetch to get the full, authoritative content before making plans or writing answers.',
             inputSchema,
         }, this.handler);
     }

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

@@ -25,8 +25,8 @@ describe('mcp-server/tools/project/DocFetchTool', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
             expect(mockMcpServer.registerTool).toHaveBeenCalledWith('fetch-hubspot-doc', {
-                title: 'Fetch a single HubSpot Developer Documentation file',
-                description: 'Fetch a single HubSpot Developer Documentation file by URL. Call after search-hubspot-docs.',
+                title: 'Fetch HubSpot Developer Documentation (single file)',
+                description: 'Always use this immediately after `search-hubspot-docs` and before creating a plan, writing code, or answering technical questions. This tool retrieves the full, authoritative content of a HubSpot Developer Documentation page from its URL, ensuring responses are accurate, up-to-date, and grounded in the official docs.',
                 inputSchema: expect.any(Object),
             }, tool.handler);
             expect(result).toBe(mockRegisteredTool);

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

@@ -28,8 +28,8 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
             expect(mockMcpServer.registerTool).toHaveBeenCalledWith('search-hubspot-docs', {
-                title: 'Search the HubSpot docs',
-                description: 'Search the HubSpot docs for information. This will return results that include a url to be used in fetch-hubspot-doc.',
+                title: 'Search HubSpot Developer Documentation',
+                description: 'Use this first whenever you need details about HubSpot APIs, SDKs, integrations, or developer platform features. This searches the official HubSpot Developer Documentation and returns the most relevant pages, each with a URL for use in `fetch-hubspot-doc`. Always follow this with a fetch to get the full, authoritative content before making plans or writing answers.',
                 inputSchema: expect.any(Object),
             }, tool.handler);
             expect(result).toBe(mockRegisteredTool);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.6.0-beta.10",
+    "version": "7.6.0-beta.11",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -10,7 +10,7 @@
         "@hubspot/project-parsing-lib": "0.8.0",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
-        "@hubspot/ui-extensions-dev-server": "0.9.4",
+        "@hubspot/ui-extensions-dev-server": "0.9.8",
         "archiver": "7.0.1",
         "boxen": "8.0.1",
         "chalk": "5.4.1",

package/types/Prompts.d.ts

@@ -23,5 +23,6 @@ export type PromptConfig<T extends GenericPromptResponse> = {
     validate?: (answer?: any) => PromptOperand | Promise<PromptOperand>;
     mask?: string;
     filter?: (input: string) => string;
+    loop?: boolean;
 };
 export {};