@hubspot/cli 7.7.21-experimental.0 → 7.7.22-experimental.0

package/bin/cli.js

@@ -130,8 +130,12 @@ const argv = yargs(process.argv.slice(2))
     .wrap(getTerminalWidth())
     .strict().argv;
 if ('help' in argv && argv.help !== undefined) {
-    trackHelpUsage(getCommandName(argv));
+    (async () => {
+        await trackHelpUsage(getCommandName(argv));
+    })();
 }
 if ('convertFields' in argv && argv.convertFields !== undefined) {
-    trackConvertFieldsUsage(getCommandName(argv));
+    (async () => {
+        await trackConvertFieldsUsage(getCommandName(argv));
+    })();
 }

package/commands/__tests__/getStarted.test.js

@@ -103,9 +103,6 @@ describe('commands/get-started', () => {
                 promptUser
                     .mockResolvedValueOnce({
                     default: GET_STARTED_OPTIONS.APP,
-                })
-                    .mockResolvedValueOnce({
-                    shouldInstallDependencies: true,
                 })
                     .mockResolvedValueOnce({
                     shouldUpload: true,
@@ -144,13 +141,6 @@ describe('commands/get-started', () => {
                     }),
                 ]);
             });
-            it('should skip upload when user declines', async () => {
-                promptUser
-                    .mockResolvedValueOnce({ shouldInstallDependencies: false })
-                    .mockResolvedValueOnce({ shouldUpload: false });
-                await getStartedCommand.handler(mockArgs);
-                expect(process.exit).toHaveBeenCalledWith(EXIT_CODES.SUCCESS);
-            });
         });
         describe('tracking', () => {
             it('should track command usage', async () => {

package/commands/create/api-sample.d.ts

@@ -1,3 +1,3 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const apiSampleAssetType: CreatableCmsAsset;
 export default apiSampleAssetType;

package/commands/create/app.d.ts

@@ -1,3 +1,3 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const appAssetType: CreatableCmsAsset;
 export default appAssetType;

package/commands/create/function.d.ts

@@ -1,3 +1,3 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const functionAssetType: CreatableCmsAsset;
 export default functionAssetType;

package/commands/create/index.d.ts

@@ -1,4 +1,4 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const assets: {
     [key: string]: CreatableCmsAsset;
 };

package/commands/create/module.d.ts

@@ -1,3 +1,3 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const moduleAssetType: CreatableCmsAsset;
 export default moduleAssetType;

package/commands/create/react-app.d.ts

@@ -1,3 +1,3 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const reactAppAssetType: CreatableCmsAsset;
 export default reactAppAssetType;

package/commands/create/template.d.ts

@@ -1,3 +1,3 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const templateAssetType: CreatableCmsAsset;
 export default templateAssetType;

package/commands/create/vue-app.d.ts

@@ -1,3 +1,3 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const vueAppAssetType: CreatableCmsAsset;
 export default vueAppAssetType;

package/commands/create/webpack-serverless.d.ts

@@ -1,3 +1,3 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const webpackServerlessAssetType: CreatableCmsAsset;
 export default webpackServerlessAssetType;

package/commands/create/website-theme.d.ts

@@ -1,3 +1,3 @@
-import { CreatableCmsAsset } from '../../types/cms.js';
+import { CreatableCmsAsset } from '../../types/Cms.js';
 declare const websiteThemeAssetType: CreatableCmsAsset;
 export default websiteThemeAssetType;

package/commands/create.d.ts

@@ -1,4 +1,4 @@
-import { CreateArgs } from '../types/cms.js';
+import { CreateArgs } from '../types/Cms.js';
 import { YargsCommandModule } from '../types/Yargs.js';
 declare const createCommand: YargsCommandModule<unknown, CreateArgs>;
 export default createCommand;

package/commands/getStarted.js

@@ -121,35 +121,20 @@ async function handler(args) {
         uiLogger.log(' ');
         uiLogger.log(commands.getStarted.prompts.projectCreated.description);
         uiLogger.log(' ');
-        // 5. Install dependencies - Ask user if they want to install dependencies
+        // 5. Install dependencies
         const installLocations = await getProjectPackageJsonLocations(projectDest);
-        const { shouldInstallDependencies } = await promptUser([
-            {
-                type: 'confirm',
-                name: 'shouldInstallDependencies',
-                message: commands.getStarted.prompts.installDependencies,
-                default: true,
-            },
-        ]);
-        if (shouldInstallDependencies) {
-            try {
-                await installPackages({
-                    installLocations: installLocations,
-                });
-                uiLogger.log(' ');
-                uiLogger.success(commands.getStarted.logs.dependenciesInstalled);
-                uiLogger.log(' ');
-            }
-            catch (err) {
-                uiLogger.log(' ');
-                uiLogger.error(commands.getStarted.errors.installDepsFailed);
-                logError(err);
-                uiLogger.log(' ');
-            }
+        try {
+            await installPackages({
+                installLocations: installLocations,
+            });
+            uiLogger.log(' ');
+            uiLogger.success(commands.getStarted.logs.dependenciesInstalled);
+            uiLogger.log(' ');
         }
-        else {
+        catch (err) {
             uiLogger.log(' ');
-            uiLogger.log(commands.getStarted.logs.dependenciesNotInstalled);
+            uiLogger.error(commands.getStarted.errors.installDepsFailed);
+            logError(err);
             uiLogger.log(' ');
         }
         // 6. Ask user if they want to upload the project
@@ -211,7 +196,7 @@ async function handler(args) {
                                 targetAccountId: derivedAccountId,
                                 env: env,
                                 appId: lastCreatedApp.id,
-                            }), { url: true });
+                            }) + '&tourId=get-started', { url: true });
                             uiLogger.log(' ');
                             uiLogger.success(commands.getStarted.openedDeveloperOverview);
                         }

package/commands/mcp/setup.js

@@ -35,6 +35,7 @@ function setupBuilder(yargs) {
     })
         .option('add-docs-search', {
         type: 'boolean',
+        hidden: true,
     });
     return yargs;
 }

package/commands/mcp/start.d.ts

@@ -1,3 +1,6 @@
 import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
-declare const mcpStartCommand: YargsCommandModule<unknown, CommonArgs>;
+interface McpStartArgs extends CommonArgs {
+    aiAgent: string;
+}
+declare const mcpStartCommand: YargsCommandModule<unknown, McpStartArgs>;
 export default mcpStartCommand;

package/commands/mcp/start.js

@@ -19,9 +19,9 @@ async function handler(args) {
         process.exit(EXIT_CODES.ERROR);
     }
     trackCommandUsage('mcp-start', {}, args.derivedAccountId);
-    await startMcpServer();
+    await startMcpServer(args.aiAgent);
 }
-async function startMcpServer() {
+async function startMcpServer(aiAgent) {
     try {
         const serverPath = path.join(__dirname, '..', '..', 'mcp-server', 'server.js');
         // Check if server file exists
@@ -31,11 +31,13 @@ async function startMcpServer() {
         }
         uiLogger.info(commands.mcp.start.startingServer);
         uiLogger.info(commands.mcp.start.stopInstructions);
+        const args = [serverPath];
         // Start the server using ts-node
-        const child = spawn('node', [serverPath], {
+        const child = spawn(`node`, args, {
             stdio: 'inherit',
             env: {
                 ...process.env,
+                HUBSPOT_MCP_AI_AGENT: aiAgent || 'unknown',
             },
         });
         // Handle server process events
@@ -58,6 +60,9 @@ async function startMcpServer() {
     }
 }
 function startBuilder(yargs) {
+    yargs.option('ai-agent', {
+        type: 'string',
+    });
     return yargs;
 }
 const builder = makeYargsBuilder(startBuilder, command, describe, {

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

@@ -1,11 +1,11 @@
 import { HttpStatusCode } from 'axios';
 import yargs from 'yargs';
 import chalk from 'chalk';
-import * as configUtils from '@hubspot/local-dev-lib/config';
 import { logger } from '@hubspot/local-dev-lib/logger';
+import * as configUtils from '@hubspot/local-dev-lib/config';
 import * as projectApiUtils from '@hubspot/local-dev-lib/api/projects';
 import * as ui from '../../../lib/ui/index.js';
-import { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } from '../../../lib/commonOpts.js';
+import { addAccountOptions, addConfigOptions, addJSONOutputOptions, addUseEnvironmentOptions, } from '../../../lib/commonOpts.js';
 import * as projectUtils from '../../../lib/projects/config.js';
 import * as projectUrlUtils from '../../../lib/projects/urls.js';
 import { pollDeployStatus } from '../../../lib/projects/buildAndDeploy.js';
@@ -16,7 +16,7 @@ import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import exampleProject from './fixtures/exampleProject.json' with { type: 'json' };
 import { mockHubSpotHttpResponse, mockHubSpotHttpError, } from '../../../lib/testUtils.js';
 import projectDeployCommand from '../deploy.js';
-vi.mock('@hubspot/local-dev-lib/logger');
+import { uiLogger } from '../../../lib/ui/logger.js';
 vi.mock('@hubspot/local-dev-lib/api/projects');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/commonOpts');
@@ -27,8 +27,9 @@ vi.mock('../../../lib/projects/buildAndDeploy');
 vi.mock('../../../lib/prompts/projectNamePrompt');
 vi.mock('../../../lib/prompts/promptUtils');
 vi.mock('../../../lib/usageTracking');
+vi.mock('../../../lib/ui/logger');
+vi.mock('@hubspot/local-dev-lib/logger');
 vi.spyOn(ui, 'uiLine');
-const uiLinkSpy = vi.spyOn(ui, 'uiLink').mockImplementation(text => text);
 const uiCommandReferenceSpy = vi.spyOn(ui, 'uiCommandReference');
 const uiAccountDescriptionSpy = vi.spyOn(ui, 'uiAccountDescription');
 const getProjectConfigSpy = vi.spyOn(projectUtils, 'getProjectConfig');
@@ -51,6 +52,7 @@ const conflictsSpy = vi
 describe('commands/project/deploy', () => {
     const projectFlag = 'project';
     const buildFlag = 'build';
+    const deployLatestBuildFlag = 'deployLatestBuild';
     const profileFlag = 'profile';
     const forceFlag = 'force';
     describe('command', () => {
@@ -79,6 +81,11 @@ describe('commands/project/deploy', () => {
                     alias: ['build-id'],
                     type: 'number',
                 }),
+                [deployLatestBuildFlag]: expect.objectContaining({
+                    type: 'boolean',
+                    alias: ['deploy-latest-build'],
+                    default: false,
+                }),
                 [profileFlag]: expect.objectContaining({
                     type: 'string',
                     alias: ['p'],
@@ -95,6 +102,8 @@ describe('commands/project/deploy', () => {
             expect(addAccountOptions).toHaveBeenCalledWith(yargs);
             expect(addUseEnvironmentOptions).toHaveBeenCalledTimes(1);
             expect(addUseEnvironmentOptions).toHaveBeenCalledWith(yargs);
+            expect(addJSONOutputOptions).toHaveBeenCalledTimes(1);
+            expect(addJSONOutputOptions).toHaveBeenCalledWith(yargs);
         });
         it('should provide examples', () => {
             projectDeployCommand.builder(yargs);
@@ -108,9 +117,9 @@ describe('commands/project/deploy', () => {
         const projectNameFromPrompt = 'project name from prompt';
         const deployDetails = {
             id: 123,
+            buildResultType: 'DEPLOY_QUEUED',
         };
         const projectDetailUrl = 'http://project-details-page-url.com';
-        const viewProjectsInHubSpot = 'View project builds in HubSpot';
         beforeEach(() => {
             args = {
                 project: 'project name from options',
@@ -130,9 +139,6 @@ describe('commands/project/deploy', () => {
                 projectName: projectNameFromPrompt,
             });
             getProjectDetailUrlSpy.mockReturnValue(projectDetailUrl);
-            uiLinkSpy.mockImplementation(text => {
-                return text;
-            });
             getAccountConfigSpy.mockReturnValue({ accountType, env: 'qa' });
             fetchProjectSpy.mockReturnValue(mockHubSpotHttpResponse(exampleProject));
             deployProjectSpy.mockReturnValue(mockHubSpotHttpResponse(deployDetails));
@@ -195,28 +201,24 @@ describe('commands/project/deploy', () => {
         it('should log an error and exit when latest build is not defined', async () => {
             fetchProjectSpy.mockReturnValue(mockHubSpotHttpResponse({}));
             await projectDeployCommand.handler(args);
-            expect(logger.error).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledWith('Deploy error: no builds for this project were found.');
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledWith('Deploy error: no builds for this project were found.');
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
         it('should log an error and exit when buildId option is not a valid build', async () => {
             args.buildId = exampleProject.latestBuild.buildId + 1;
             await projectDeployCommand.handler(args);
-            expect(uiLinkSpy).toHaveBeenCalledTimes(1);
-            expect(uiLinkSpy).toHaveBeenCalledWith(viewProjectsInHubSpot, projectDetailUrl);
-            expect(logger.error).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledWith(`Build ${args.buildId} does not exist for project ${projectNameFromPrompt}. ${viewProjectsInHubSpot}`);
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(`Build ${args.buildId} does not exist for project`));
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
         it('should log an error and exit when buildId option is already deployed', async () => {
             args.buildId = exampleProject.deployedBuildId;
             await projectDeployCommand.handler(args);
-            expect(uiLinkSpy).toHaveBeenCalledTimes(1);
-            expect(uiLinkSpy).toHaveBeenCalledWith(viewProjectsInHubSpot, projectDetailUrl);
-            expect(logger.error).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledWith(`Build ${args.buildId} is already deployed. ${viewProjectsInHubSpot}`);
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(`Build ${args.buildId} is already deployed. View project builds in HubSpot.`));
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
@@ -233,8 +235,8 @@ describe('commands/project/deploy', () => {
             promptUserSpy.mockResolvedValue({});
             await projectDeployCommand.handler(args);
             expect(promptUserSpy).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledWith('You must specify a build to deploy');
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledWith('You must specify a build to deploy');
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
@@ -247,8 +249,8 @@ describe('commands/project/deploy', () => {
             // @ts-expect-error Testing an edge case where the response is empty
             deployProjectSpy.mockResolvedValue({});
             await projectDeployCommand.handler(args);
-            expect(logger.error).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledWith(`Deploy error: an unknown error occurred.`);
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledWith(`Deploy error: an unknown error occurred.`);
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
@@ -269,8 +271,8 @@ describe('commands/project/deploy', () => {
                 });
             });
             await projectDeployCommand.handler(args);
-            expect(logger.error).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledWith(`The project ${chalk.bold(projectNameFromPrompt)} does not exist in account ${accountDescription}. Run ${commandReference} to upload your project files to HubSpot.`);
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledWith(`The project ${chalk.bold(projectNameFromPrompt)} does not exist in account ${accountDescription}. Run ${commandReference} to upload your project files to HubSpot.`);
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });
@@ -283,8 +285,8 @@ describe('commands/project/deploy', () => {
                 });
             });
             await projectDeployCommand.handler(args);
-            expect(logger.error).toHaveBeenCalledTimes(1);
-            expect(logger.error).toHaveBeenCalledWith('The request was bad.');
+            expect(uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(uiLogger.error).toHaveBeenCalledWith('The request was bad.');
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
         });

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

@@ -64,9 +64,9 @@ describe('unifiedProjectDevFlow', () => {
     const mockProjectDir = '/test/project.js';
     const mockTargetProjectAccountId = 123;
     const mockProvidedTargetTestingAccountId = 456;
-    const mockProfileConfig = {
-        accountId: 789,
-    };
+    // const mockProfileConfig: HsProfileFile = {
+    //   accountId: 789,
+    // };
     const mockAccountConfig = {
         accountId: 123,
         name: 'test-account',
@@ -152,18 +152,21 @@ describe('unifiedProjectDevFlow', () => {
             expect(mockLocalDevWatcher.start).toHaveBeenCalled();
             expect(mockWebsocketServer.start).toHaveBeenCalled();
         });
-        it('should complete successfully with profile config', async () => {
-            await unifiedProjectDevFlow({
-                args: mockArgs,
-                targetProjectAccountId: mockTargetProjectAccountId,
-                projectConfig: mockProjectConfig,
-                projectDir: mockProjectDir,
-                profileConfig: mockProfileConfig,
-            });
-            expect(LocalDevProcess).toHaveBeenCalledWith(expect.objectContaining({
-                targetTestingAccountId: mockProfileConfig.accountId,
-            }));
-        });
+        // TODO: Restore test once we've switched back to using profile account for testing
+        // it('should complete successfully with profile config', async () => {
+        //   await unifiedProjectDevFlow({
+        //     args: mockArgs,
+        //     targetProjectAccountId: mockTargetProjectAccountId,
+        //     projectConfig: mockProjectConfig,
+        //     projectDir: mockProjectDir,
+        //     profileConfig: mockProfileConfig,
+        //   });
+        //   expect(LocalDevProcess).toHaveBeenCalledWith(
+        //     expect.objectContaining({
+        //       targetTestingAccountId: mockProfileConfig.accountId,
+        //     })
+        //   );
+        // });
         it('should use target project account as testing account when it is a test account', async () => {
             isTestAccountOrSandbox.mockReturnValue(true);
             await unifiedProjectDevFlow({
@@ -253,7 +256,7 @@ describe('unifiedProjectDevFlow', () => {
                 projectConfig: mockProjectConfig,
                 projectDir: mockProjectDir,
             });
-            expect(createDeveloperTestAccountForLocalDev).toHaveBeenCalledWith(mockTargetProjectAccountId, mockAccountConfig, ENVIRONMENTS.PROD);
+            expect(createDeveloperTestAccountForLocalDev).toHaveBeenCalledWith(mockTargetProjectAccountId, mockAccountConfig, ENVIRONMENTS.PROD, true);
             expect(LocalDevProcess).toHaveBeenCalledWith(expect.objectContaining({
                 targetTestingAccountId: 999,
             }));

package/commands/project/create.js

@@ -9,7 +9,7 @@ import { PROJECT_WITH_APP, EMPTY_PROJECT, } from '../../lib/projects/create/v3.j
 import { uiBetaTag, uiFeatureHighlight } from '../../lib/ui/index.js';
 import { debugError, logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { PROJECT_CONFIG_FILE, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, marketplaceDistribution, privateDistribution, oAuth, staticAuth, } from '../../lib/constants.js';
+import { PROJECT_CONFIG_FILE, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, marketplaceDistribution, privateDistribution, oAuth, staticAuth, DEFAULT_PROJECT_TEMPLATE_BRANCH, } from '../../lib/constants.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { PLATFORM_VERSIONS } from '@hubspot/local-dev-lib/constants/projects';
 import { commands } from '../../lang/en.js';
@@ -63,7 +63,7 @@ async function handler(args) {
         await cloneGithubRepo(repo, projectDest, {
             sourceDir: selectProjectTemplatePromptResponse.projectTemplate?.path || components,
             hideLogs: true,
-            branch: 'main',
+            branch: DEFAULT_PROJECT_TEMPLATE_BRANCH,
         });
     }
     catch (err) {

package/commands/project/deploy.d.ts

@@ -1,9 +1,10 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
-export type ProjectDeployArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
+export type ProjectDeployArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs & {
     project?: string;
     build?: number;
     buildId?: number;
     profile?: string;
+    deployLatestBuild: boolean;
     force: boolean;
 };
 declare const projectDeployCommand: YargsCommandModule<unknown, ProjectDeployArgs>;