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

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

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

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

@@ -5,6 +5,7 @@ import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
 const inputSchema = {
     absoluteProjectPath,
     absoluteCurrentWorkingDirectory,
@@ -24,7 +25,7 @@ export class ValidateProjectTool extends Tool {
             return formatTextContents(stdout, stderr);
         }
         catch (error) {
-            return formatTextContents(error instanceof Error ? error.message : `${error}`);
+            return formatTextContents(getErrorMessage(error));
         }
     }
     register() {

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

@@ -3,12 +3,14 @@ import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, } from '../../../../lib/constants.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../../lib/constants');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
@@ -17,7 +19,6 @@ describe('mcp-server/tools/project/AddFeatureToProject', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking the whole server
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -25,6 +26,7 @@ describe('mcp-server/tools/project/AddFeatureToProject', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new AddFeatureToProjectTool(mockMcpServer);
         // Mock addFlag to simulate command building
         mockAddFlag.mockImplementation((command, flag, value) => `${command} --${flag} "${value}"`);
@@ -85,7 +87,7 @@ describe('mcp-server/tools/project/AddFeatureToProject', () => {
             expect(result.content).toEqual([
                 {
                     type: 'text',
-                    text: expect.stringContaining('Ask the user how they would you like to distribute the application'),
+                    text: expect.stringContaining('Ask the user how they would you like to distribute the app'),
                 },
                 {
                     type: 'text',

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

@@ -3,6 +3,7 @@ import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { APP_DISTRIBUTION_TYPES, EMPTY_PROJECT, PROJECT_WITH_APP, } from '../../../../lib/constants.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
@@ -10,6 +11,7 @@ vi.mock('../../../../lib/constants');
 vi.mock('../../../../lib/projects/create/v2');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
@@ -18,7 +20,6 @@ describe('mcp-server/tools/project/CreateProjectTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking the whole thing
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -26,6 +27,7 @@ describe('mcp-server/tools/project/CreateProjectTool', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new CreateProjectTool(mockMcpServer);
         // Mock addFlag to simulate command building
         mockAddFlag.mockImplementation((command, flag, value) => `${command} --${flag} "${value}"`);
@@ -83,7 +85,7 @@ describe('mcp-server/tools/project/CreateProjectTool', () => {
             expect(result.content).toEqual([
                 {
                     type: 'text',
-                    text: expect.stringContaining('Ask the user how they would you like to distribute the application?'),
+                    text: expect.stringContaining('Ask the user how they would you like to distribute the app?'),
                 },
                 {
                     type: 'text',

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

@@ -2,6 +2,7 @@ import { CreateTestAccountTool, } from '../CreateTestAccountTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 import fs from 'fs';
 import * as config from '@hubspot/local-dev-lib/config';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
@@ -11,6 +12,7 @@ vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
 vi.mock('fs');
 vi.mock('@hubspot/local-dev-lib/config');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
@@ -21,7 +23,6 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking the whole server
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -29,6 +30,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new CreateTestAccountTool(mockMcpServer);
         // Mock addFlag to simulate command building
         mockAddFlag.mockImplementation((command, flag, value) => `${command} --${flag} "${value}"`);
@@ -63,6 +65,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                 serviceLevel: 'ENTERPRISE',
                 salesLevel: 'ENTERPRISE',
                 contentLevel: 'ENTERPRISE',
+                commerceLevel: 'ENTERPRISE',
             };
             it('should create test account with config path', async () => {
                 mockRunCommandInDir.mockResolvedValue({
@@ -97,6 +100,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'config-path', '/absolute/path/to/config.json');
@@ -117,6 +121,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'config-path', './test-account.json');
@@ -176,6 +181,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'name', 'MyTestAccount');
@@ -192,7 +198,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'name', 'MyTestAccount');
                 // Implementation uses name as fallback for description, and adds all hub levels with ENTERPRISE defaults
-                expect(mockAddFlag).toHaveBeenCalledTimes(7);
+                expect(mockAddFlag).toHaveBeenCalledTimes(8);
                 expect(mockRunCommandInDir).toHaveBeenCalled();
             });
             it('should create test account with account name and description', async () => {
@@ -209,6 +215,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'name', 'MyTestAccount');
@@ -226,6 +233,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     marketingLevel: 'PROFESSIONAL',
                     salesLevel: 'STARTER',
                     contentLevel: 'FREE',
+                    commerceLevel: 'FREE',
                     serviceLevel: 'ENTERPRISE',
                     opsLevel: 'ENTERPRISE',
                 };
@@ -249,6 +257,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'STARTER',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'PROFESSIONAL',
+                    commerceLevel: 'FREE',
                 };
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'name', 'AllHubsAccount');
@@ -258,6 +267,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                 expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'service-level', 'STARTER');
                 expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'sales-level', 'ENTERPRISE');
                 expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'content-level', 'PROFESSIONAL');
+                expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'commerce-level', 'FREE');
             });
         });
         describe('handler defaults', () => {
@@ -275,6 +285,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'name', 'DefaultLevelsAccount');
@@ -283,6 +294,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                 expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'service-level', 'ENTERPRISE');
                 expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'sales-level', 'ENTERPRISE');
                 expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'content-level', 'ENTERPRISE');
+                expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'commerce-level', 'ENTERPRISE');
             });
             it('should use name as fallback for description when description is empty', async () => {
                 mockRunCommandInDir.mockResolvedValue({
@@ -298,6 +310,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'name', 'NoDescriptionAccount');
@@ -318,6 +331,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     opsLevel: 'ENTERPRISE',
                     serviceLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'name', 'PartialLevelsAccount');
@@ -326,6 +340,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                 expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'ops-level', 'ENTERPRISE');
                 expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'service-level', 'ENTERPRISE');
                 expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'content-level', 'ENTERPRISE');
+                expect(mockAddFlag).toHaveBeenCalledWith(expect.any(String), 'commerce-level', 'ENTERPRISE');
             });
             it('should add all hub level flags when defaults are applied', async () => {
                 mockRunCommandInDir.mockResolvedValue({
@@ -341,10 +356,11 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 const result = await tool.handler(input);
                 expect(mockRunCommandInDir).toHaveBeenCalled();
-                expect(mockAddFlag).toHaveBeenCalledTimes(7);
+                expect(mockAddFlag).toHaveBeenCalledTimes(8);
                 expect(result.content[1]).toEqual({
                     type: 'text',
                     text: 'Test account created with defaults',
@@ -361,7 +377,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                 };
                 await tool.handler(input);
                 expect(mockAddFlag).toHaveBeenCalledWith('hs test-account create', 'name', 'BypassedDefaultsAccount');
-                expect(mockAddFlag).toHaveBeenCalledTimes(7);
+                expect(mockAddFlag).toHaveBeenCalledTimes(8);
             });
         });
         describe('interactive mode', () => {
@@ -374,6 +390,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 const result = await tool.handler(input);
                 // Should NOT run the command
@@ -404,6 +421,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 const result = await tool.handler(input);
                 expect(result).toEqual({
@@ -429,6 +447,7 @@ describe('mcp-server/tools/project/CreateTestAccountTool', () => {
                     serviceLevel: 'ENTERPRISE',
                     salesLevel: 'ENTERPRISE',
                     contentLevel: 'ENTERPRISE',
+                    commerceLevel: 'ENTERPRISE',
                 };
                 const result = await tool.handler(input);
                 expect(result).toEqual({

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

@@ -2,11 +2,13 @@ import { DeployProjectTool } from '../DeployProjectTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
@@ -15,7 +17,6 @@ describe('mcp-server/tools/project/DeployProject', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking the whole server
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -23,6 +24,7 @@ describe('mcp-server/tools/project/DeployProject', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new DeployProjectTool(mockMcpServer);
         // Mock addFlag to simulate command building
         mockAddFlag.mockImplementation((command, flag, value) => `${command} --${flag} "${value}"`);

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

@@ -18,7 +18,6 @@ describe('mcp-server/tools/project/DocFetchTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking whole server
         mockMcpServer = {
             registerTool: vi.fn(),

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

@@ -3,12 +3,14 @@ import { http } from '@hubspot/local-dev-lib/http';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('@hubspot/local-dev-lib/http');
 vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockHttp = http;
 const mockIsHubSpotHttpError = vi.mocked(isHubSpotHttpError);
@@ -18,7 +20,6 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking whole server
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -26,6 +27,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new DocsSearchTool(mockMcpServer);
     });
     describe('register', () => {

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

@@ -4,12 +4,14 @@ import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { http } from '@hubspot/local-dev-lib/http';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('@hubspot/local-dev-lib/http');
 vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../utils/feedbackTracking');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockGetConfigDefaultAccountIfExists = getConfigDefaultAccountIfExists;
 const mockHttp = http;
@@ -19,7 +21,6 @@ describe('mcp-server/tools/project/GetApiUsagePatternsByAppIdTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking the whole thing
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -27,6 +28,7 @@ describe('mcp-server/tools/project/GetApiUsagePatternsByAppIdTool', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new GetApiUsagePatternsByAppIdTool(mockMcpServer);
     });
     describe('register', () => {
@@ -34,7 +36,7 @@ describe('mcp-server/tools/project/GetApiUsagePatternsByAppIdTool', () => {
             const result = tool.register();
             expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-api-usage-patterns-by-app-id', expect.objectContaining({
                 title: 'Get API Usage Patterns by App ID',
-                description: expect.stringContaining('Retrieves detailed API usage pattern analytics for a specific HubSpot application'),
+                description: expect.stringContaining('Retrieves detailed API usage pattern analytics for a specific HubSpot app'),
                 inputSchema: expect.objectContaining({
                     appId: expect.objectContaining({
                         describe: expect.any(Function),

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

@@ -3,12 +3,15 @@ import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { http } from '@hubspot/local-dev-lib/http';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../utils/toolUsageTracking');
+vi.mock('../../../utils/toolUsageTracking');
 vi.mock('@hubspot/local-dev-lib/http');
 vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../utils/feedbackTracking');
+vi.mock('../../../utils/config');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockGetConfigDefaultAccountIfExists = getConfigDefaultAccountIfExists;
 const mockHttp = http;
@@ -18,7 +21,6 @@ describe('mcp-server/tools/project/GetApplicationInfoTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking the whole thing
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -26,14 +28,15 @@ describe('mcp-server/tools/project/GetApplicationInfoTool', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new GetApplicationInfoTool(mockMcpServer);
     });
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-applications-info', expect.objectContaining({
-                title: 'Get Applications Information',
-                description: expect.stringContaining('Retrieves a list of all HubSpot applications available in the current account'),
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-apps-info', expect.objectContaining({
+                title: 'Get Apps Information',
+                description: expect.stringContaining('Retrieves a list of all HubSpot apps available in the current account'),
                 inputSchema: expect.any(Object),
             }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);

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

@@ -4,6 +4,7 @@ import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { getProjectConfig, validateProjectConfig, } from '../../../../lib/projects/config.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/cliConfig');
@@ -12,6 +13,7 @@ vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('../../../../lib/projects/config.js');
 vi.mock('../../../utils/feedbackTracking');
 vi.mock('@hubspot/local-dev-lib/config');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockGetConfigDefaultAccountIfExists = getConfigDefaultAccountIfExists;
 const mockHttpGet = http.get;
@@ -134,7 +136,6 @@ describe('mcp-server/tools/project/GetBuildLogsTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking the whole thing
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -142,6 +143,7 @@ describe('mcp-server/tools/project/GetBuildLogsTool', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new GetBuildLogsTool(mockMcpServer);
         // Default mock implementations
         mockGetConfigDefaultAccountIfExists.mockReturnValue({

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

@@ -4,6 +4,7 @@ import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { getProjectConfig, validateProjectConfig, } from '../../../../lib/projects/config.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('@hubspot/local-dev-lib/api/projects');
@@ -11,6 +12,7 @@ vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('../../../../lib/projects/config.js');
 vi.mock('../../../utils/feedbackTracking');
 vi.mock('@hubspot/local-dev-lib/config');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockFetchProjectBuilds = fetchProjectBuilds;
 const mockGetBuildStatus = getBuildStatus;
@@ -83,7 +85,6 @@ describe('mcp-server/tools/project/GetBuildStatusTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking the whole thing
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -91,6 +92,7 @@ describe('mcp-server/tools/project/GetBuildStatusTool', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new GetBuildStatusTool(mockMcpServer);
         // Default mock implementations
         mockIsHubSpotHttpError.mockReturnValue(false);

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

@@ -1,12 +1,16 @@
 import { GetConfigValuesTool } from '../GetConfigValuesTool.js';
-import { getIntermediateRepresentationSchema, mapToInternalType, } from '@hubspot/project-parsing-lib';
+import { getIntermediateRepresentationSchema } from '@hubspot/project-parsing-lib/schema';
+import { mapToInternalType } from '@hubspot/project-parsing-lib/transform';
 import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('@hubspot/project-parsing-lib');
+vi.mock('@hubspot/project-parsing-lib/schema');
+vi.mock('@hubspot/project-parsing-lib/transform');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
+const mockTrackToolUsage = trackToolUsage;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockGetIntermediateRepresentationSchema = getIntermediateRepresentationSchema;
 const mockMapToInternalType = mapToInternalType;
@@ -16,7 +20,6 @@ describe('mcp-server/tools/project/GetConfigValuesTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking the whole thing
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -24,6 +27,7 @@ describe('mcp-server/tools/project/GetConfigValuesTool', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new GetConfigValuesTool(mockMcpServer);
     });
     describe('register', () => {

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

@@ -1,10 +1,12 @@
 import { GuidedWalkthroughTool } from '../GuidedWalkthroughTool.js';
 import { execAsync } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
+import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
+const mockTrackToolUsage = trackToolUsage;
 const mockExecAsync = execAsync;
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 describe('mcp-server/tools/project/GuidedWalkthroughTool', () => {
@@ -12,7 +14,6 @@ describe('mcp-server/tools/project/GuidedWalkthroughTool', () => {
     let tool;
     let mockRegisteredTool;
     beforeEach(() => {
-        vi.clearAllMocks();
         // @ts-expect-error Not mocking whole server
         mockMcpServer = {
             registerTool: vi.fn(),
@@ -20,6 +21,7 @@ describe('mcp-server/tools/project/GuidedWalkthroughTool', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockTrackToolUsage.mockResolvedValue(undefined);
         tool = new GuidedWalkthroughTool(mockMcpServer);
     });
     describe('register', () => {