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

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

@@ -6,6 +6,7 @@ import { EMPTY_PROJECT, PROJECT_WITH_APP, } from '../../../lib/projects/create/v
 import { absoluteCurrentWorkingDirectory } from './constants.js';
 import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
+import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
     name: z
@@ -44,11 +45,13 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
+const toolName = 'create-hubspot-project';
 export class CreateProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
     async handler({ name, destination, projectBase, distribution, auth, features, absoluteCurrentWorkingDirectory, }) {
+        await trackToolUsage(toolName);
         let command = addFlag('hs project create', 'platform-version', '2025.2');
         const content = [];
         if (name) {
@@ -91,7 +94,7 @@ export class CreateProjectTool extends Tool {
         }
     }
     register() {
-        return this.mcpServer.registerTool('create-hubspot-project', {
+        return this.mcpServer.registerTool(toolName, {
             title: 'Create HubSpot Project',
             description: 'Creates a HubSpot project with the provided name and outputs it in the provided destination',
             inputSchema,

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

@@ -4,6 +4,7 @@ import { addFlag } from '../../utils/command.js';
 import { absoluteProjectPath } from './constants.js';
 import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
+import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 const inputSchema = {
     absoluteProjectPath,
     buildNumber: z
@@ -14,11 +15,13 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
+const toolName = 'deploy-hubspot-project';
 export class DeployProject extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
     async handler({ absoluteProjectPath, buildNumber, }) {
+        await trackToolUsage(toolName);
         let command = `hs project deploy`;
         const content = [];
         if (!buildNumber) {
@@ -37,7 +40,7 @@ export class DeployProject extends Tool {
         return formatTextContents(stdout, stderr);
     }
     register() {
-        return this.mcpServer.registerTool('deploy-hubspot-project', {
+        return this.mcpServer.registerTool(toolName, {
             title: 'Deploy a build of HubSpot Project',
             description: 'Takes a build number and a project name and deploys that build of the project. DO NOT run this tool unless the user specifies they would like to deploy the project.',
             inputSchema,

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

@@ -2,6 +2,7 @@ import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { execAsync } from '../../utils/command.js';
 import { formatTextContents } from '../../utils/content.js';
+import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 const nextCommands = {
     'hs init': 'hs auth',
     'hs auth': 'hs project create',
@@ -23,11 +24,13 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
+const toolName = 'guided-walkthrough-hubspot-cli';
 export class GuidedWalkthroughTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
     async handler({ command }) {
+        await trackToolUsage(toolName);
         if (command) {
             const { stdout } = await execAsync(`${command} --help`);
             return formatTextContents(`Display this help output for the user amd wait for them to acknowledge: ${stdout}. ${nextCommands[command] ? `Once they are ready, A good command to look at next is ${nextCommands[command]}` : ''}`);
@@ -35,7 +38,7 @@ export class GuidedWalkthroughTool extends Tool {
         return formatTextContents('Is there another command you would like to learn more about?');
     }
     register() {
-        return this.mcpServer.registerTool('guided-walkthrough-hubspot-cli', {
+        return this.mcpServer.registerTool(toolName, {
             title: 'Guided walkthrough of the CLI',
             description: 'Give the user a guided walkthrough of the HubSpot CLI.',
             inputSchema: {

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

@@ -3,6 +3,7 @@ import { runCommandInDir } from '../../utils/project.js';
 import { absoluteProjectPath } from './constants.js';
 import z from 'zod';
 import { formatTextContents } from '../../utils/content.js';
+import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 const inputSchema = {
     absoluteProjectPath,
 };
@@ -10,16 +11,18 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
+const toolName = 'upload-hubspot-project';
 export class UploadProjectTools extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
     async handler({ absoluteProjectPath, }) {
+        await trackToolUsage(toolName);
         const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, `hs project upload --force-create`);
         return formatTextContents(stdout, stderr);
     }
     register() {
-        return this.mcpServer.registerTool('upload-hubspot-project', {
+        return this.mcpServer.registerTool(toolName, {
             title: 'Upload HubSpot Project',
             description: '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. DO NOT run this tool unless the user specifies they would like to upload the project, it is potentially destructive',
             inputSchema,

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

@@ -3,16 +3,19 @@ import { z } from 'zod';
 import { absoluteProjectPath } from './constants.js';
 import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
+import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 const inputSchema = {
     absoluteProjectPath,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
+const toolName = 'validate-hubspot-project';
 export class ValidateProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
     async handler({ absoluteProjectPath, }) {
+        await trackToolUsage(toolName);
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, 'hs project validate');
             return formatTextContents(stdout, stderr);
@@ -22,7 +25,7 @@ export class ValidateProjectTool extends Tool {
         }
     }
     register() {
-        return this.mcpServer.registerTool('validate-hubspot-project', {
+        return this.mcpServer.registerTool(toolName, {
             title: 'Validate HubSpot Project',
             description: 'Validates the HubSpot project and its configuration files.  This tool does not need to be ran before uploading the project',
             inputSchema,

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

@@ -6,6 +6,7 @@ vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../../lib/constants');
+vi.mock('../../../utils/toolUsageTracking');
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('mcp-server/tools/project/AddFeatureToProject', () => {

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

@@ -8,6 +8,7 @@ vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../../lib/constants');
 vi.mock('../../../../lib/projects/create/v3');
+vi.mock('../../../utils/toolUsageTracking');
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('mcp-server/tools/project/CreateProjectTool', () => {

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

@@ -4,6 +4,7 @@ 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');
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('mcp-server/tools/project/DeployProject', () => {

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

@@ -2,6 +2,7 @@ import { GuidedWalkthroughTool } from '../GuidedWalkthroughTool.js';
 import { execAsync } from '../../../utils/command.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/command');
+vi.mock('../../../utils/toolUsageTracking');
 const mockExecAsync = execAsync;
 describe('mcp-server/tools/project/GuidedWalkthroughTool', () => {
     let mockMcpServer;

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

@@ -2,6 +2,7 @@ import { UploadProjectTools } from '../UploadProjectTools.js';
 import { runCommandInDir } from '../../../utils/project.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
+vi.mock('../../../utils/toolUsageTracking');
 const mockRunCommandInDir = runCommandInDir;
 describe('mcp-server/tools/project/UploadProjectTools', () => {
     let mockMcpServer;

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

@@ -2,6 +2,7 @@ import { ValidateProjectTool, } from '../ValidateProjectTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
+vi.mock('../../../utils/toolUsageTracking');
 const mockRunCommandInDir = runCommandInDir;
 describe('mcp-server/tools/project/ValidateProjectTool', () => {
     let mockMcpServer;

package/mcp-server/utils/__tests__/project.test.js

@@ -31,9 +31,10 @@ describe('mcp-server/utils/project', () => {
             expect(mockExistsSync).toHaveBeenCalledWith(mockDirectory);
             expect(mockMkdirSync).not.toHaveBeenCalled();
             expect(mockResolve).toHaveBeenCalledWith(mockDirectory);
-            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, {
+            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
                 cwd: mockResolvedPath,
-            });
+                env: expect.any(Object),
+            }));
             expect(result).toEqual(expectedResult);
         });
         it('should create directory if it does not exist', async () => {
@@ -47,9 +48,10 @@ describe('mcp-server/utils/project', () => {
             expect(mockExistsSync).toHaveBeenCalledWith(mockDirectory);
             expect(mockMkdirSync).toHaveBeenCalledWith(mockDirectory);
             expect(mockResolve).toHaveBeenCalledWith(mockDirectory);
-            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, {
+            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
                 cwd: mockResolvedPath,
-            });
+                env: expect.any(Object),
+            }));
             expect(result).toEqual(expectedResult);
         });
         it('should propagate execAsync errors', async () => {
@@ -57,9 +59,10 @@ describe('mcp-server/utils/project', () => {
             mockExistsSync.mockReturnValue(true);
             mockExecAsync.mockRejectedValue(error);
             await expect(runCommandInDir(mockDirectory, mockCommand)).rejects.toThrow('Command failed');
-            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, {
+            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
                 cwd: mockResolvedPath,
-            });
+                env: expect.any(Object),
+            }));
         });
         it('should handle stderr in results', async () => {
             const expectedResult = {

package/mcp-server/utils/project.js

@@ -7,5 +7,8 @@ export async function runCommandInDir(directory, command) {
     }
     return execAsync(command, {
         cwd: path.resolve(directory),
+        env: {
+            ...process.env,
+        },
     });
 }

package/mcp-server/utils/toolUsageTracking.d.ts

@@ -0,0 +1 @@
+export declare function trackToolUsage(toolName: string): Promise<void>;

package/mcp-server/utils/toolUsageTracking.js

@@ -0,0 +1,22 @@
+import { trackUsage } from '@hubspot/local-dev-lib/trackUsage';
+import { logger } from '@hubspot/local-dev-lib/logger';
+import { EventClass, getNodeVersionData, getPlatform, } from '../../lib/usageTracking.js';
+import { getAccountId, isTrackingAllowed } from '@hubspot/local-dev-lib/config';
+export async function trackToolUsage(toolName) {
+    if (!isTrackingAllowed()) {
+        return;
+    }
+    const usageTrackingEvent = {
+        action: 'cli-mcp-tool-invocation',
+        os: getPlatform(),
+        ...getNodeVersionData(),
+        command: toolName,
+        type: process.env.HUBSPOT_MCP_AI_AGENT,
+    };
+    const accountId = getAccountId() || undefined;
+    try {
+        logger.info('Tracking tool usage');
+        await trackUsage('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
+    }
+    catch (error) { }
+}

package/package.json

@@ -1,16 +1,16 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.21-experimental.0",
+    "version": "7.7.22-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "type": "module",
     "dependencies": {
-        "@hubspot/local-dev-lib": "3.12.0",
-        "@hubspot/project-parsing-lib": "0.5.1",
+        "@hubspot/local-dev-lib": "3.14.0",
+        "@hubspot/project-parsing-lib": "0.0.21-experimental.1",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
-        "@hubspot/ui-extensions-dev-server": "0.9.2",
+        "@hubspot/ui-extensions-dev-server": "0.9.4",
         "archiver": "7.0.1",
         "boxen": "8.0.1",
         "chalk": "5.4.1",