@hubspot/cli 7.7.29-experimental.0 → 7.7.30-experimental.0

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

@@ -1,7 +1,22 @@
 import yargs from 'yargs';
 import projectAddCommand from '../add.js';
 import { marketplaceDistribution, oAuth, privateDistribution, staticAuth, } from '../../../lib/constants.js';
+import { v3AddComponent } from '../../../lib/projects/add/v3AddComponent.js';
+import { legacyAddComponent } from '../../../lib/projects/add/legacyAddComponent.js';
+import { getProjectConfig } from '../../../lib/projects/config.js';
+import { useV3Api } from '../../../lib/projects/buildAndDeploy.js';
+import { trackCommandUsage } from '../../../lib/usageTracking.js';
 vi.mock('../../../lib/commonOpts');
+vi.mock('../../../lib/projects/add/v3AddComponent');
+vi.mock('../../../lib/projects/add/legacyAddComponent');
+vi.mock('../../../lib/projects/config');
+vi.mock('../../../lib/projects/buildAndDeploy');
+vi.mock('../../../lib/usageTracking');
+const mockedV3AddComponent = vi.mocked(v3AddComponent);
+const mockedLegacyAddComponent = vi.mocked(legacyAddComponent);
+const mockedGetProjectConfig = vi.mocked(getProjectConfig);
+const mockedUseV3Api = vi.mocked(useV3Api);
+const mockedTrackCommandUsage = vi.mocked(trackCommandUsage);
 describe('commands/project/add', () => {
     const yargsMock = yargs;
     describe('command', () => {
@@ -40,4 +55,55 @@ describe('commands/project/add', () => {
             });
         });
     });
+    describe('handler', () => {
+        const mockProjectConfig = {
+            name: 'test-project',
+            srcDir: 'src',
+            platformVersion: 'v3',
+        };
+        const mockProjectDir = '/path/to/project';
+        const mockArgs = {
+            derivedAccountId: 123,
+            name: 'test-component',
+            type: 'module',
+        };
+        beforeEach(() => {
+            mockedGetProjectConfig.mockResolvedValue({
+                projectConfig: mockProjectConfig,
+                projectDir: mockProjectDir,
+            });
+            mockedTrackCommandUsage.mockResolvedValue();
+            mockedV3AddComponent.mockResolvedValue();
+            mockedLegacyAddComponent.mockResolvedValue();
+            vi.spyOn(process, 'exit').mockImplementation(() => {
+                throw new Error('process.exit called');
+            });
+        });
+        it('should call v3AddComponent with accountId for v3 projects', async () => {
+            mockedUseV3Api.mockReturnValue(true);
+            await expect(projectAddCommand.handler(mockArgs)).rejects.toThrow('process.exit called');
+            expect(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', undefined, 123);
+            expect(mockedV3AddComponent).toHaveBeenCalledWith(mockArgs, mockProjectDir, mockProjectConfig, 123);
+            expect(mockedLegacyAddComponent).not.toHaveBeenCalled();
+        });
+        it('should call legacyAddComponent for non-v3 projects', async () => {
+            mockedUseV3Api.mockReturnValue(false);
+            await expect(projectAddCommand.handler(mockArgs)).rejects.toThrow('process.exit called');
+            expect(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', undefined, 123);
+            expect(mockedLegacyAddComponent).toHaveBeenCalledWith(mockArgs, mockProjectDir, mockProjectConfig);
+            expect(mockedV3AddComponent).not.toHaveBeenCalled();
+        });
+        it('should exit with error when project config is not found', async () => {
+            mockedGetProjectConfig.mockResolvedValue({
+                projectConfig: null,
+                projectDir: null,
+            });
+            const mockExit = vi.spyOn(process, 'exit').mockImplementation(() => {
+                throw new Error('process.exit called');
+            });
+            await expect(projectAddCommand.handler(mockArgs)).rejects.toThrow('process.exit called');
+            expect(mockExit).toHaveBeenCalledWith(1);
+            mockExit.mockRestore();
+        });
+    });
 });

package/commands/project/add.d.ts

@@ -1,5 +1,5 @@
 import { YargsCommandModule, CommonArgs } from '../../types/Yargs.js';
-type ProjectAddArgs = CommonArgs & {
+export type ProjectAddArgs = CommonArgs & {
     type?: string;
     name?: string;
     features?: string[];

package/commands/project/add.js

@@ -23,7 +23,7 @@ async function handler(args) {
         }
         const isV3ProjectCreate = useV3Api(projectConfig.platformVersion);
         if (isV3ProjectCreate) {
-            await v3AddComponent(args, projectDir, projectConfig);
+            await v3AddComponent(args, projectDir, projectConfig, derivedAccountId);
         }
         else {
             await legacyAddComponent(args, projectDir, projectConfig);

package/commands/project/create.js

@@ -41,7 +41,7 @@ async function handler(args) {
         type: selectProjectTemplatePromptResponse.projectTemplate?.name ||
             (selectProjectTemplatePromptResponse.componentTemplates || [])
                 // @ts-expect-error
-                .map((item) => item.label)
+                .map((item) => item.type)
                 .join(','),
     }, derivedAccountId);
     const projectDest = path.resolve(getCwd(), projectNameAndDestPromptResponse.dest);

package/lang/en.d.ts

@@ -884,12 +884,10 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
                 readonly configuringCursor: "Configuring Cursor...";
                 readonly failedToConfigureCursor: "Failed to configure Cursor";
                 readonly configuredCursor: "Configured Cursor";
-                readonly cursorNotFound: "Cursor not found - skipping configuration";
                 readonly alreadyInstalled: "HubSpot CLI mcp server already installed, reinstalling";
                 readonly configuringWindsurf: "Configuring Windsurf...";
                 readonly failedToConfigureWindsurf: "Failed to configure Windsurf";
                 readonly configuredWindsurf: "Configured Windsurf";
-                readonly windsurfNotFound: "Windsurf not found - skipping configuration";
                 readonly configuringVsCode: "Configuring VSCode...";
                 readonly failedToConfigureVsCode: "Failed to configure VSCode";
                 readonly configuredVsCode: "Configured VSCode";

package/lang/en.js

@@ -889,13 +889,11 @@ export const commands = {
                 configuringCursor: 'Configuring Cursor...',
                 failedToConfigureCursor: 'Failed to configure Cursor',
                 configuredCursor: 'Configured Cursor',
-                cursorNotFound: 'Cursor not found - skipping configuration',
                 alreadyInstalled: 'HubSpot CLI mcp server already installed, reinstalling',
                 // Windsurf
                 configuringWindsurf: 'Configuring Windsurf...',
                 failedToConfigureWindsurf: 'Failed to configure Windsurf',
                 configuredWindsurf: 'Configured Windsurf',
-                windsurfNotFound: 'Windsurf not found - skipping configuration',
                 // VS Code
                 configuringVsCode: 'Configuring VSCode...',
                 failedToConfigureVsCode: 'Failed to configure VSCode',

package/lib/mcp/setup.d.ts

@@ -16,8 +16,8 @@ interface McpCommand {
     args: string[];
 }
 export declare function addMcpServerToConfig(targets: string[] | undefined): Promise<string[]>;
-export declare function setupClaudeCode(mcpCommand?: McpCommand): Promise<boolean>;
 export declare function setupVsCode(mcpCommand?: McpCommand): Promise<boolean>;
-export declare function setupCursor(mcpCommand?: McpCommand): Promise<boolean>;
-export declare function setupWindsurf(mcpCommand?: McpCommand): Promise<boolean>;
+export declare function setupClaudeCode(mcpCommand?: McpCommand): Promise<boolean>;
+export declare function setupCursor(mcpCommand?: McpCommand): boolean;
+export declare function setupWindsurf(mcpCommand?: McpCommand): boolean;
 export {};

package/lib/mcp/setup.js

@@ -4,6 +4,10 @@ import { promptUser } from '../prompts/promptUtils.js';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { logError } from '../errorHandlers/index.js';
 import { execAsync } from '../../mcp-server/utils/command.js';
+import path from 'path';
+import os from 'os';
+import fs from 'fs-extra';
+import { existsSync } from 'fs';
 const mcpServerName = 'hubspot-cli-mcp';
 const claudeCode = 'claude';
 const windsurf = 'windsurf';
@@ -68,6 +72,96 @@ async function runSetupFunction(func) {
         throw new Error();
     }
 }
+function setupMcpConfigFile(config) {
+    try {
+        SpinniesManager.add('spinner', {
+            text: config.configuringMessage,
+        });
+        if (!existsSync(config.configPath)) {
+            fs.writeFileSync(config.configPath, JSON.stringify({}, null, 2));
+        }
+        let mcpConfig = {};
+        let configContent;
+        try {
+            configContent = fs.readFileSync(config.configPath, 'utf8');
+        }
+        catch (error) {
+            SpinniesManager.fail('spinner', {
+                text: config.failedMessage,
+            });
+            logError(error);
+            return false;
+        }
+        try {
+            // In the event the file exists, but is empty, initialize it to and empty object
+            if (configContent.trim() === '') {
+                mcpConfig = {};
+            }
+            else {
+                mcpConfig = JSON.parse(configContent);
+            }
+        }
+        catch (error) {
+            SpinniesManager.fail('spinner', {
+                text: config.failedMessage,
+            });
+            uiLogger.error(commands.mcp.setup.errors.errorParsingJsonFIle(config.configPath, error instanceof Error ? error.message : `${error}`));
+            return false;
+        }
+        // Initialize mcpServers if it doesn't exist
+        if (!mcpConfig.mcpServers) {
+            mcpConfig.mcpServers = {};
+        }
+        // Add or update HubSpot CLI MCP server
+        mcpConfig.mcpServers[mcpServerName] = {
+            ...config.mcpCommand,
+        };
+        // Write the updated config
+        fs.writeFileSync(config.configPath, JSON.stringify(mcpConfig, null, 2));
+        SpinniesManager.succeed('spinner', {
+            text: config.configuredMessage,
+        });
+        return true;
+    }
+    catch (error) {
+        SpinniesManager.fail('spinner', {
+            text: config.failedMessage,
+        });
+        logError(error);
+        return false;
+    }
+}
+export async function setupVsCode(mcpCommand = defaultMcpCommand) {
+    try {
+        SpinniesManager.add('vsCode', {
+            text: commands.mcp.setup.spinners.configuringVsCode,
+        });
+        const mcpConfig = JSON.stringify({
+            name: mcpServerName,
+            ...buildCommandWithAgentString(mcpCommand, vscode),
+        });
+        await execAsync(`code --add-mcp ${JSON.stringify(mcpConfig)}`);
+        SpinniesManager.succeed('vsCode', {
+            text: commands.mcp.setup.spinners.configuredVsCode,
+        });
+        return true;
+    }
+    catch (error) {
+        if (error instanceof Error &&
+            error.message.includes('code: command not found')) {
+            SpinniesManager.fail('vsCode', {
+                text: commands.mcp.setup.spinners.vsCodeNotFound,
+            });
+        }
+        else {
+            SpinniesManager.fail('vsCode', {
+                text: commands.mcp.setup.spinners.failedToConfigureVsCode,
+            });
+            logError(error);
+        }
+        return false;
+    }
+}
 export async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
     try {
         SpinniesManager.add('claudeCode', {
@@ -117,44 +211,25 @@ export async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
         return false;
     }
 }
-async function setupVsCodeBasedIntegration(commandName, configuringText, configuredText, notFoundText, failedText, mcpCommand = defaultMcpCommand) {
-    try {
-        SpinniesManager.add(commandName, {
-            text: configuringText,
-        });
-        const mcpConfig = JSON.stringify({
-            name: mcpServerName,
-            ...buildCommandWithAgentString(mcpCommand, vscode),
-        });
-        await execAsync(`${commandName} --add-mcp ${JSON.stringify(mcpConfig)}`);
-        SpinniesManager.succeed(commandName, {
-            text: configuredText,
-        });
-        return true;
-    }
-    catch (error) {
-        if (error instanceof Error && error.message.includes(commandName)) {
-            SpinniesManager.fail(commandName, {
-                text: notFoundText,
-            });
-        }
-        else {
-            SpinniesManager.fail(commandName, {
-                text: failedText,
-            });
-            logError(error);
-        }
-        return false;
-    }
-}
-export async function setupVsCode(mcpCommand = defaultMcpCommand) {
-    return setupVsCodeBasedIntegration('code', commands.mcp.setup.spinners.configuringVsCode, commands.mcp.setup.spinners.configuredVsCode, commands.mcp.setup.spinners.vsCodeNotFound, commands.mcp.setup.spinners.failedToConfigureVsCode, mcpCommand);
-}
-export async function setupCursor(mcpCommand = defaultMcpCommand) {
-    return setupVsCodeBasedIntegration('cursor', commands.mcp.setup.spinners.configuringCursor, commands.mcp.setup.spinners.configuredCursor, commands.mcp.setup.spinners.cursorNotFound, commands.mcp.setup.spinners.failedToConfigureCursor, mcpCommand);
+export function setupCursor(mcpCommand = defaultMcpCommand) {
+    const cursorConfigPath = path.join(os.homedir(), '.cursor', 'mcp.json');
+    return setupMcpConfigFile({
+        configPath: cursorConfigPath,
+        configuringMessage: commands.mcp.setup.spinners.configuringCursor,
+        configuredMessage: commands.mcp.setup.spinners.configuredCursor,
+        failedMessage: commands.mcp.setup.spinners.failedToConfigureCursor,
+        mcpCommand: buildCommandWithAgentString(mcpCommand, cursor),
+    });
 }
-export async function setupWindsurf(mcpCommand = defaultMcpCommand) {
-    return setupVsCodeBasedIntegration('windsurf', commands.mcp.setup.spinners.configuringWindsurf, commands.mcp.setup.spinners.configuredWindsurf, commands.mcp.setup.spinners.windsurfNotFound, commands.mcp.setup.spinners.failedToConfigureWindsurf, mcpCommand);
+export function setupWindsurf(mcpCommand = defaultMcpCommand) {
+    const windsurfConfigPath = path.join(os.homedir(), '.codeium', 'windsurf', 'mcp_config.json');
+    return setupMcpConfigFile({
+        configPath: windsurfConfigPath,
+        configuringMessage: commands.mcp.setup.spinners.configuringWindsurf,
+        configuredMessage: commands.mcp.setup.spinners.configuredWindsurf,
+        failedMessage: commands.mcp.setup.spinners.failedToConfigureWindsurf,
+        mcpCommand: buildCommandWithAgentString(mcpCommand, windsurf),
+    });
 }
 function buildCommandWithAgentString(mcpCommand, agent) {
     const mcpCommandCopy = structuredClone(mcpCommand);

package/lib/projects/add/__tests__/v3AddComponent.test.js

@@ -7,6 +7,7 @@ import { projectAddPromptV3 } from '../../../prompts/projectAddPrompt.js';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
 import { logger } from '@hubspot/local-dev-lib/logger';
 import { getProjectMetadata } from '@hubspot/project-parsing-lib/src/lib/project.js';
+import { trackCommandUsage } from '../../../usageTracking.js';
 import { commands } from '../../../../lang/en.js';
 vi.mock('fs');
 vi.mock('../../../prompts/promptUtils');
@@ -16,6 +17,7 @@ vi.mock('../../../prompts/projectAddPrompt');
 vi.mock('@hubspot/local-dev-lib/github');
 vi.mock('@hubspot/local-dev-lib/logger');
 vi.mock('@hubspot/project-parsing-lib/src/lib/project');
+vi.mock('../../../usageTracking');
 const mockedFs = vi.mocked(fs);
 const mockedGetConfigForPlatformVersion = vi.mocked(getConfigForPlatformVersion);
 const mockedConfirmPrompt = vi.mocked(confirmPrompt);
@@ -24,6 +26,7 @@ const mockedProjectAddPromptV3 = vi.mocked(projectAddPromptV3);
 const mockedCloneGithubRepo = vi.mocked(cloneGithubRepo);
 const mockedLogger = vi.mocked(logger);
 const mockedGetProjectMetadata = vi.mocked(getProjectMetadata);
+const mockedTrackCommandUsage = vi.mocked(trackCommandUsage);
 describe('lib/projects/add/v3AddComponent', () => {
     const mockProjectConfig = {
         name: 'test-project',
@@ -32,6 +35,7 @@ describe('lib/projects/add/v3AddComponent', () => {
     };
     const mockArgs = { name: 'test-component', type: 'module' };
     const projectDir = '/path/to/project';
+    const mockAccountId = 123;
     const mockComponentTemplate = {
         label: 'Test Component',
         path: 'test-component',
@@ -62,6 +66,7 @@ describe('lib/projects/add/v3AddComponent', () => {
             authType: 'oauth',
             distribution: 'private',
         });
+        mockedTrackCommandUsage.mockResolvedValue();
     });
     describe('v3AddComponent()', () => {
         it('successfully adds a component when app already exists', async () => {
@@ -79,10 +84,13 @@ describe('lib/projects/add/v3AddComponent', () => {
             mockedFs.readFileSync.mockReturnValue(JSON.stringify(mockAppMeta));
             mockedProjectAddPromptV3.mockResolvedValue(mockPromptResponse);
             mockedCloneGithubRepo.mockResolvedValue(true);
-            await v3AddComponent(mockArgs, projectDir, mockProjectConfig);
+            await v3AddComponent(mockArgs, projectDir, mockProjectConfig, mockAccountId);
             expect(mockedGetConfigForPlatformVersion).toHaveBeenCalledWith('v3');
             expect(mockedGetProjectMetadata).toHaveBeenCalledWith('/path/to/project/src');
             expect(mockedProjectAddPromptV3).toHaveBeenCalled();
+            expect(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', {
+                type: 'module',
+            }, mockAccountId);
             expect(mockedCloneGithubRepo).toHaveBeenCalledWith(expect.any(String), projectDir, expect.objectContaining({
                 sourceDir: ['v3/test-component'],
                 hideLogs: true,
@@ -106,8 +114,11 @@ describe('lib/projects/add/v3AddComponent', () => {
             mockedConfirmPrompt.mockResolvedValue(true);
             mockedProjectAddPromptV3.mockResolvedValue(mockPromptResponse);
             mockedCloneGithubRepo.mockResolvedValue(true);
-            await v3AddComponent(mockArgs, projectDir, mockProjectConfig);
+            await v3AddComponent(mockArgs, projectDir, mockProjectConfig, mockAccountId);
             expect(mockedCreateV3App).toHaveBeenCalled();
+            expect(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', {
+                type: 'module',
+            }, mockAccountId);
             expect(mockedCloneGithubRepo).toHaveBeenCalledWith(expect.any(String), projectDir, expect.objectContaining({
                 sourceDir: ['v3/test-component', 'v3/app-template'],
             }));
@@ -132,8 +143,11 @@ describe('lib/projects/add/v3AddComponent', () => {
             mockedConfirmPrompt.mockResolvedValue(true);
             mockedProjectAddPromptV3.mockResolvedValue(mockPromptResponse);
             mockedCloneGithubRepo.mockResolvedValue(true);
-            await v3AddComponent(mockArgs, projectDir, mockProjectConfig);
+            await v3AddComponent(mockArgs, projectDir, mockProjectConfig, mockAccountId);
             expect(mockedCreateV3App).not.toHaveBeenCalled();
+            expect(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', {
+                type: '',
+            }, mockAccountId);
             expect(mockedCloneGithubRepo).not.toHaveBeenCalled();
         });
         it('throws an error when app count exceeds maximum', async () => {
@@ -146,7 +160,7 @@ describe('lib/projects/add/v3AddComponent', () => {
             };
             mockedGetConfigForPlatformVersion.mockResolvedValue(mockConfig);
             mockedGetProjectMetadata.mockResolvedValue(mockProjectMetadataMaxApps);
-            await expect(v3AddComponent(mockArgs, projectDir, mockProjectConfig)).rejects.toThrow('This project currently has the maximum number of apps: 1');
+            await expect(v3AddComponent(mockArgs, projectDir, mockProjectConfig, mockAccountId)).rejects.toThrow('This project currently has the maximum number of apps: 1');
         });
         it('throws an error when components list is empty', async () => {
             const mockEmptyConfig = {
@@ -154,7 +168,7 @@ describe('lib/projects/add/v3AddComponent', () => {
                 parentComponents: [],
             };
             mockedGetConfigForPlatformVersion.mockResolvedValue(mockEmptyConfig);
-            await expect(v3AddComponent(mockArgs, projectDir, mockProjectConfig)).rejects.toThrow(commands.project.add.error.failedToFetchComponentList);
+            await expect(v3AddComponent(mockArgs, projectDir, mockProjectConfig, mockAccountId)).rejects.toThrow(commands.project.add.error.failedToFetchComponentList);
         });
         it('throws an error when app meta file cannot be parsed', async () => {
             mockedGetConfigForPlatformVersion.mockResolvedValue(mockConfig);
@@ -162,7 +176,7 @@ describe('lib/projects/add/v3AddComponent', () => {
             mockedFs.readFileSync.mockImplementation(() => {
                 throw new Error('File read error');
             });
-            await expect(v3AddComponent(mockArgs, projectDir, mockProjectConfig)).rejects.toThrow('Unable to parse app file');
+            await expect(v3AddComponent(mockArgs, projectDir, mockProjectConfig, mockAccountId)).rejects.toThrow('Unable to parse app file');
         });
         it('throws an error when cloning fails', async () => {
             const mockAppMeta = {
@@ -179,7 +193,57 @@ describe('lib/projects/add/v3AddComponent', () => {
             mockedFs.readFileSync.mockReturnValue(JSON.stringify(mockAppMeta));
             mockedProjectAddPromptV3.mockResolvedValue(mockPromptResponse);
             mockedCloneGithubRepo.mockRejectedValue(new Error('Clone failed'));
-            await expect(v3AddComponent(mockArgs, projectDir, mockProjectConfig)).rejects.toThrow(commands.project.add.error.failedToDownloadComponent);
+            await expect(v3AddComponent(mockArgs, projectDir, mockProjectConfig, mockAccountId)).rejects.toThrow(commands.project.add.error.failedToDownloadComponent);
+        });
+        it('should track usage with multiple component types', async () => {
+            const mockAppMeta = {
+                config: {
+                    distribution: 'private',
+                    auth: { type: 'oauth' },
+                },
+            };
+            const mockSecondComponentTemplate = {
+                label: 'Test Card',
+                path: 'test-card',
+                type: 'card',
+                supportedAuthTypes: ['oauth'],
+                supportedDistributions: ['private'],
+            };
+            const mockPromptResponse = {
+                componentTemplate: [mockComponentTemplate, mockSecondComponentTemplate],
+            };
+            mockedGetConfigForPlatformVersion.mockResolvedValue(mockConfig);
+            mockedGetProjectMetadata.mockResolvedValue(mockProjectMetadata);
+            mockedFs.readFileSync.mockReturnValue(JSON.stringify(mockAppMeta));
+            mockedProjectAddPromptV3.mockResolvedValue(mockPromptResponse);
+            mockedCloneGithubRepo.mockResolvedValue(true);
+            await v3AddComponent(mockArgs, projectDir, mockProjectConfig, mockAccountId);
+            expect(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', {
+                type: 'module,card',
+            }, mockAccountId);
+        });
+        it('should track usage with empty type when no components are selected', async () => {
+            const mockProjectMetadataNoApps = {
+                hsMetaFiles: [],
+                components: {
+                    app: {
+                        count: 1,
+                        maxCount: 1,
+                        hsMetaFiles: ['/path/to/app.meta.json'],
+                    },
+                    module: { count: 0, maxCount: 5, hsMetaFiles: [] },
+                },
+            };
+            const mockPromptResponse = {
+                componentTemplate: [],
+            };
+            mockedGetConfigForPlatformVersion.mockResolvedValue(mockConfig);
+            mockedGetProjectMetadata.mockResolvedValue(mockProjectMetadataNoApps);
+            mockedProjectAddPromptV3.mockResolvedValue(mockPromptResponse);
+            await v3AddComponent(mockArgs, projectDir, mockProjectConfig, mockAccountId);
+            expect(mockedTrackCommandUsage).toHaveBeenCalledWith('project-add', {
+                type: '',
+            }, mockAccountId);
         });
     });
 });

package/lib/projects/add/v3AddComponent.d.ts

@@ -5,4 +5,4 @@ export declare function v3AddComponent(args: {
     features?: string[];
     auth?: string;
     distribution?: string;
-}, projectDir: string, projectConfig: ProjectConfig): Promise<void>;
+}, projectDir: string, projectConfig: ProjectConfig, accountId: number): Promise<void>;

package/lib/projects/add/v3AddComponent.js

@@ -12,7 +12,8 @@ import { AppKey } from '@hubspot/project-parsing-lib/src/lib/constants.js';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
 import { debugError } from '../../errorHandlers/index.js';
 import { uiLogger } from '../../ui/logger.js';
-export async function v3AddComponent(args, projectDir, projectConfig) {
+import { trackCommandUsage } from '../../usageTracking.js';
+export async function v3AddComponent(args, projectDir, projectConfig, accountId) {
     uiLogger.log(commands.project.add.creatingComponent(projectConfig.name));
     const config = await getConfigForPlatformVersion(projectConfig.platformVersion);
     const { components, parentComponents } = config;
@@ -47,6 +48,10 @@ export async function v3AddComponent(args, projectDir, projectConfig) {
     }
     const componentTemplateChoices = calculateComponentTemplateChoices(components, derivedAuthType, derivedDistribution, currentProjectMetadata);
     const projectAddPromptResponse = await projectAddPromptV3(componentTemplateChoices, args.features);
+    const componentTypes = projectAddPromptResponse.componentTemplate?.map(componentTemplate => componentTemplate.type);
+    await trackCommandUsage('project-add', {
+        type: componentTypes?.join(','),
+    }, accountId);
     try {
         const components = projectAddPromptResponse.componentTemplate?.map((componentTemplate) => {
             return path.join(projectConfig.platformVersion, componentTemplate.path);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.29-experimental.0",
+    "version": "7.7.30-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",