@hubspot/cli 7.7.20-experimental.0 → 7.7.21-experimental.1

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

@@ -5,6 +5,7 @@ const types_1 = require("../../types");
 const zod_1 = require("zod");
 const command_1 = require("../../utils/command");
 const content_1 = require("../../utils/content");
+const toolUsageTracking_1 = require("../../utils/toolUsageTracking");
 const nextCommands = {
     'hs init': 'hs auth',
     'hs auth': 'hs project create',
@@ -26,11 +27,13 @@ const inputSchema = {
 const inputSchemaZodObject = zod_1.z.object({
     ...inputSchema,
 });
+const toolName = 'guided-walkthrough-hubspot-cli';
 class GuidedWalkthroughTool extends types_1.Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
     async handler({ command }) {
+        await (0, toolUsageTracking_1.trackToolUsage)(toolName);
         if (command) {
             const { stdout } = await (0, command_1.execAsync)(`${command} --help`);
             return (0, content_1.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]}` : ''}`);
@@ -38,7 +41,7 @@ class GuidedWalkthroughTool extends types_1.Tool {
         return (0, content_1.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

@@ -9,6 +9,7 @@ const project_1 = require("../../utils/project");
 const constants_1 = require("./constants");
 const zod_1 = __importDefault(require("zod"));
 const content_1 = require("../../utils/content");
+const toolUsageTracking_1 = require("../../utils/toolUsageTracking");
 const inputSchema = {
     absoluteProjectPath: constants_1.absoluteProjectPath,
 };
@@ -16,16 +17,18 @@ const inputSchema = {
 const inputSchemaZodObject = zod_1.default.object({
     ...inputSchema,
 });
+const toolName = 'upload-hubspot-project';
 class UploadProjectTools extends types_1.Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
     async handler({ absoluteProjectPath, }) {
+        await (0, toolUsageTracking_1.trackToolUsage)(toolName);
         const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project upload --force-create`);
         return (0, content_1.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

@@ -6,16 +6,19 @@ const zod_1 = require("zod");
 const constants_1 = require("./constants");
 const project_1 = require("../../utils/project");
 const content_1 = require("../../utils/content");
+const toolUsageTracking_1 = require("../../utils/toolUsageTracking");
 const inputSchema = {
     absoluteProjectPath: constants_1.absoluteProjectPath,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = zod_1.z.object({ ...inputSchema });
+const toolName = 'validate-hubspot-project';
 class ValidateProjectTool extends types_1.Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
     async handler({ absoluteProjectPath, }) {
+        await (0, toolUsageTracking_1.trackToolUsage)(toolName);
         try {
             const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, 'hs project validate');
             return (0, content_1.formatTextContents)(stdout, stderr);
@@ -25,7 +28,7 @@ class ValidateProjectTool extends types_1.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

@@ -8,6 +8,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 = project_1.runCommandInDir;
 const mockAddFlag = command_1.addFlag;
 describe('mcp-server/tools/project/AddFeatureToProject', () => {

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

@@ -10,6 +10,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 = project_1.runCommandInDir;
 const mockAddFlag = command_1.addFlag;
 describe('mcp-server/tools/project/CreateProjectTool', () => {

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

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

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

@@ -4,6 +4,7 @@ const GuidedWalkthroughTool_1 = require("../GuidedWalkthroughTool");
 const command_1 = require("../../../utils/command");
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/command');
+vi.mock('../../../utils/toolUsageTracking');
 const mockExecAsync = command_1.execAsync;
 describe('mcp-server/tools/project/GuidedWalkthroughTool', () => {
     let mockMcpServer;

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

@@ -4,6 +4,7 @@ const UploadProjectTools_1 = require("../UploadProjectTools");
 const project_1 = require("../../../utils/project");
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
+vi.mock('../../../utils/toolUsageTracking');
 const mockRunCommandInDir = project_1.runCommandInDir;
 describe('mcp-server/tools/project/UploadProjectTools', () => {
     let mockMcpServer;

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

@@ -4,6 +4,7 @@ const ValidateProjectTool_1 = require("../ValidateProjectTool");
 const project_1 = require("../../../utils/project");
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
+vi.mock('../../../utils/toolUsageTracking');
 const mockRunCommandInDir = project_1.runCommandInDir;
 describe('mcp-server/tools/project/ValidateProjectTool', () => {
     let mockMcpServer;

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

@@ -36,9 +36,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 () => {
@@ -52,9 +53,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 () => {
@@ -62,9 +64,10 @@ describe('mcp-server/utils/project', () => {
             mockExistsSync.mockReturnValue(true);
             mockExecAsync.mockRejectedValue(error);
             await expect((0, project_1.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

@@ -13,5 +13,8 @@ async function runCommandInDir(directory, command) {
     }
     return (0, command_1.execAsync)(command, {
         cwd: path_1.default.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,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trackToolUsage = trackToolUsage;
+const trackUsage_1 = require("@hubspot/local-dev-lib/trackUsage");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const usageTracking_1 = require("../../lib/usageTracking");
+const config_1 = require("@hubspot/local-dev-lib/config");
+async function trackToolUsage(toolName) {
+    if (!(0, config_1.isTrackingAllowed)()) {
+        return;
+    }
+    const usageTrackingEvent = {
+        action: 'cli-mcp-tool-invocation',
+        os: (0, usageTracking_1.getPlatform)(),
+        ...(0, usageTracking_1.getNodeVersionData)(),
+        command: toolName,
+        type: process.env.HUBSPOT_MCP_AI_AGENT,
+    };
+    const accountId = (0, config_1.getAccountId)() || undefined;
+    try {
+        logger_1.logger.info('Tracking tool usage');
+        await (0, trackUsage_1.trackUsage)('cli-interaction', usageTracking_1.EventClass.INTERACTION, usageTrackingEvent, accountId);
+    }
+    catch (error) { }
+}

package/package.json

@@ -1,15 +1,15 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.20-experimental.0",
+    "version": "7.7.21-experimental.1",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
-        "@hubspot/local-dev-lib": "3.12.0",
-        "@hubspot/project-parsing-lib": "0.0.21-experimental.0",
+        "@hubspot/local-dev-lib": "3.14.0",
+        "@hubspot/project-parsing-lib": "0.5.3",
         "@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": "4.1.2",