@hubspot/cli 8.6.0 → 8.7.0-beta.0

package/lib/usageTracking.js

@@ -1,10 +1,10 @@
-import { trackUsage } from '@hubspot/local-dev-lib/trackUsage';
-import { getConfigAccountById, getConfig } from '@hubspot/local-dev-lib/config';
+import { getConfig, getConfigAccountById, getConfigFilePath, getGlobalConfigFilePath, } from '@hubspot/local-dev-lib/config';
 import { API_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
 import { uiLogger } from './ui/logger.js';
 import { pkg } from './jsonLoader.js';
 import { debugError } from './errorHandlers/index.js';
 import { isUsageTrackingDisableFlagSet } from './middleware/usageTrackingMiddleware.js';
+import { sendUsageEvent, } from './api/usageTracking.js';
 const version = pkg.version;
 const usageTrackingDiabled = 'Usage tracking is disabled via the --disable-usage-tracking flag, not sending usage events';
 export const EventClass = {
@@ -13,13 +13,13 @@ export const EventClass = {
     VIEW: 'VIEW',
     ACTIVATION: 'ACTIVATION',
 };
-export function getNodeVersionData() {
+function getNodeVersionData() {
     return {
         nodeVersion: process.version,
         nodeMajorVersion: (process.version || '').split('.')[0],
     };
 }
-export function getPlatform() {
+function getPlatform() {
     switch (process.platform) {
         case 'darwin':
             return 'macos';
@@ -29,6 +29,34 @@ export function getPlatform() {
             return process.platform;
     }
 }
+function getConfigType() {
+    try {
+        return getConfigFilePath() === getGlobalConfigFilePath()
+            ? 'global'
+            : 'local';
+    }
+    catch (_e) {
+        return undefined;
+    }
+}
+function getExecutionSource() {
+    if (process.env.HUBSPOT_MCP_AI_AGENT) {
+        return 'mcp';
+    }
+    if (process.env.CI) {
+        return 'ci';
+    }
+    return 'user';
+}
+export function getExecutionEnvironmentMeta() {
+    return {
+        os: getPlatform(),
+        ...getNodeVersionData(),
+        version,
+        configType: getConfigType(),
+        executionSource: getExecutionSource(),
+    };
+}
 export async function trackCommandUsage(command, meta = {}, accountId) {
     if (isUsageTrackingDisableFlagSet()) {
         uiLogger.debug(usageTrackingDiabled);
@@ -130,39 +158,25 @@ async function trackCliInteraction({ action, accountId, command, authType, meta
         if (config?.allowUsageTracking === false) {
             return;
         }
+        if (isUsageTrackingDisableFlagSet()) {
+            uiLogger.debug(usageTrackingDiabled);
+            return;
+        }
         const usageTrackingEvent = {
             action,
-            os: getPlatform(),
-            ...getNodeVersionData(),
-            version,
             command,
             authType,
+            ...getExecutionEnvironmentMeta(),
             ...meta,
         };
-        if (process.env.HUBSPOT_MCP_AI_AGENT) {
-            try {
-                await trackUsage('cli-interaction', EventClass.INTERACTION, {
-                    ...usageTrackingEvent,
-                    action: 'cli-mcp-server',
-                    type: process.env.HUBSPOT_MCP_AI_AGENT,
-                }, accountId);
-                uiLogger.debug('Sent AI usage tracking command event:', {
-                    ...usageTrackingEvent,
-                    action: 'cli-mcp-server',
-                    type: process.env.HUBSPOT_MCP_AI_AGENT,
-                });
-            }
-            catch (error) {
-                debugError(error);
-            }
-        }
-        if (isUsageTrackingDisableFlagSet()) {
-            uiLogger.debug(usageTrackingDiabled);
-            return;
-        }
         try {
             uiLogger.debug('Sent usage tracking command event:', usageTrackingEvent);
-            return trackUsage('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
+            await sendUsageEvent({
+                eventName: 'cli-interaction',
+                eventClass: EventClass.INTERACTION,
+                meta: usageTrackingEvent,
+                accountId,
+            });
         }
         catch (error) {
             debugError(error);

package/lib/yargs/makeWrappedYargsHandler.d.ts

@@ -0,0 +1,3 @@
+import { ArgumentsCamelCase } from 'yargs';
+import { CommonArgs } from '../../types/Yargs.js';
+export declare function makeWrappedYargsHandler<T extends CommonArgs>(trackingName: string, handler: (args: ArgumentsCamelCase<T>) => Promise<void>): (args: ArgumentsCamelCase<T>) => Promise<void>;

package/lib/yargs/{makeYargsHandlerWithUsageTracking.js → makeWrappedYargsHandler.js}

@@ -1,6 +1,9 @@
+import os from 'os';
+import path from 'path';
 import { getConfig } from '@hubspot/local-dev-lib/config';
 import { getStateValue, setStateValue, } from '@hubspot/local-dev-lib/config/state';
 import { STATE_FLAGS } from '@hubspot/local-dev-lib/constants/config';
+import { logger as ldlLogger } from '@hubspot/local-dev-lib/logger';
 import { trackCommandUsage as _trackCommandUsage } from '../usageTracking.js';
 import { pkg } from '../jsonLoader.js';
 import { uiLogger } from '../ui/logger.js';
@@ -8,6 +11,7 @@ import { lib } from '../../lang/en.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import { isPromptExitError } from '../errors/PromptExitError.js';
 import { debugError } from '../errorHandlers/index.js';
+const HANDLER_LOG_DIR = path.join(os.homedir(), '.hscli', 'logs');
 function logUsageTrackingMessage(isJsonOutput) {
     if (isJsonOutput) {
         return;
@@ -28,8 +32,9 @@ function logUsageTrackingMessage(isJsonOutput) {
         return;
     }
 }
-export function makeYargsHandlerWithUsageTracking(trackingName, handler) {
+export function makeWrappedYargsHandler(trackingName, handler) {
     return async (args) => {
+        const startTime = Date.now();
         const meta = {};
         let trackingFired = false;
         const trackingArgs = args;
@@ -45,6 +50,7 @@ export function makeYargsHandlerWithUsageTracking(trackingName, handler) {
             try {
                 const { accountId: overrideAccountId, ...trackingMeta } = meta;
                 trackingMeta.successful = successful;
+                trackingMeta.executionTime = Date.now() - startTime;
                 await _trackCommandUsage(trackingName, trackingMeta, overrideAccountId ?? args.derivedAccountId);
             }
             catch (_e) { }
@@ -68,12 +74,31 @@ export function makeYargsHandlerWithUsageTracking(trackingName, handler) {
             process.removeListener('SIGINT', onSigint);
             process.removeListener('SIGINT', onForcedExit);
         };
+        const jsonArgs = args;
+        const isJsonOutput = Boolean(jsonArgs.json || jsonArgs.formatOutputAsJson);
+        const writeFailureLogFile = () => {
+            // Skip in JSON output modes so the side effect + stderr message don't
+            // interfere with structured output consumers.
+            if (isJsonOutput) {
+                return;
+            }
+            const savedPath = ldlLogger.writeBufferedLogsToFile({
+                dir: HANDLER_LOG_DIR,
+                filenamePrefix: trackingName,
+            });
+            if (savedPath) {
+                uiLogger.log('');
+                uiLogger.error(lib.handlerLogFile.saved(savedPath));
+            }
+        };
         trackingArgs.exit = async (code) => {
             await trackCommandUsageAndRemoveListeners(code !== EXIT_CODES.ERROR);
+            if (code === EXIT_CODES.ERROR) {
+                writeFailureLogFile();
+            }
             return process.exit(code);
         };
-        const jsonArgs = args;
-        logUsageTrackingMessage(Boolean(jsonArgs.json || jsonArgs.formatOutputAsJson));
+        logUsageTrackingMessage(isJsonOutput);
         try {
             await handler(trackingArgs);
         }
@@ -87,6 +112,7 @@ export function makeYargsHandlerWithUsageTracking(trackingName, handler) {
             }
             else {
                 debugError(e);
+                writeFailureLogFile();
                 return process.exit(EXIT_CODES.ERROR);
             }
         }

package/mcp-server/tools/cms/HsCreateFunctionTool.js

@@ -59,7 +59,7 @@ export class HsCreateFunctionTool extends Tool {
             };
         }
         // Build the command
-        let command = 'hs create function';
+        let command = 'hs cms function create';
         if (dest) {
             command += ` "${dest}"`;
         }
@@ -94,7 +94,7 @@ export class HsCreateFunctionTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Create HubSpot CMS Serverless Function',
-            description: `Creates a new HubSpot CMS serverless function using the hs create function command. Functions can be created non-interactively by specifying functionsFolder, filename, and endpointPath. Supports all HTTP methods (${HTTP_METHODS.join(', ')}).`,
+            description: `Creates a new HubSpot CMS serverless function using the hs cms function create command. Functions can be created non-interactively by specifying functionsFolder, filename, and endpointPath. Supports all HTTP methods (${HTTP_METHODS.join(', ')}).`,
             inputSchema,
             annotations: {
                 readOnlyHint: false,

package/mcp-server/tools/cms/HsCreateModuleTool.js

@@ -1,9 +1,8 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
-import { formatTextContents, formatTextContent } from '../../utils/content.js';
-import { addFlag } from '../../utils/command.js';
+import { addFlag, runCommandInDir } from '../../utils/command.js';
+import { formatTextContent, formatTextContents } from '../../utils/content.js';
 import { CONTENT_TYPES } from '../../../types/Cms.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
@@ -75,7 +74,7 @@ export class HsCreateModuleTool extends Tool {
             };
         }
         // Build the command
-        let command = 'hs create module';
+        let command = 'hs cms module create';
         if (userSuppliedName) {
             command += ` "${userSuppliedName}"`;
         }
@@ -116,7 +115,7 @@ export class HsCreateModuleTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Create HubSpot CMS Module',
-            description: 'Creates a new HubSpot CMS module using the hs create module command. Modules can be created non-interactively by specifying moduleLabel and other module options. You can create either HubL or React modules by setting the reactType parameter.',
+            description: 'Creates a new HubSpot CMS module using the hs cms module create command. Modules can be created non-interactively by specifying moduleLabel and other module options. You can create either HubL or React modules by setting the reactType parameter.',
             inputSchema,
             annotations: {
                 readOnlyHint: false,

package/mcp-server/tools/cms/HsCreateTemplateTool.js

@@ -47,7 +47,7 @@ export class HsCreateTemplateTool extends Tool {
             };
         }
         // Build the command
-        let command = 'hs create template';
+        let command = 'hs cms template create';
         if (userSuppliedName) {
             command += ` "${userSuppliedName}"`;
         }
@@ -73,7 +73,7 @@ export class HsCreateTemplateTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Create HubSpot CMS Template',
-            description: `Creates a new HubSpot CMS template using the hs create template command. Templates can be created non-interactively by specifying templateType. Supports all template types including: ${TEMPLATE_TYPES.join(', ')}.`,
+            description: `Creates a new HubSpot CMS template using the hs cms template create command. Templates can be created non-interactively by specifying templateType. Supports all template types including: ${TEMPLATE_TYPES.join(', ')}.`,
             inputSchema,
             annotations: {
                 readOnlyHint: false,

package/mcp-server/tools/cms/HsFunctionLogsTool.js

@@ -1,8 +1,7 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { addFlag } from '../../utils/command.js';
+import { addFlag, runCommandInDir } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
@@ -38,7 +37,7 @@ export class HsFunctionLogsTool extends Tool {
         const normalizedEndpoint = endpoint.startsWith('/')
             ? endpoint.slice(1)
             : endpoint;
-        let command = `hs logs ${normalizedEndpoint}`;
+        let command = `hs cms function logs ${normalizedEndpoint}`;
         if (latest) {
             command = addFlag(command, 'latest', latest);
         }

package/mcp-server/tools/cms/HsListFunctionsTool.js

@@ -1,8 +1,7 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { addFlag } from '../../utils/command.js';
+import { addFlag, runCommandInDir } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
@@ -26,7 +25,7 @@ export class HsListFunctionsTool extends Tool {
     }
     async handler({ account, json, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = 'hs function list';
+        let command = 'hs cms function list';
         if (json) {
             command += ' --json';
         }

package/mcp-server/tools/cms/HsListTool.js

@@ -26,7 +26,7 @@ export class HsListTool extends Tool {
     }
     async handler({ path, account, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = 'hs list';
+        let command = 'hs cms list';
         if (path) {
             command += ` ${path}`;
         }
@@ -46,7 +46,7 @@ export class HsListTool extends Tool {
                 content: [
                     {
                         type: 'text',
-                        text: `Error executing hs list command: ${getErrorMessage(error)}`,
+                        text: `Error executing hs cms list command: ${getErrorMessage(error)}`,
                     },
                 ],
             };

package/mcp-server/utils/toolUsageTracking.js

@@ -1,6 +1,6 @@
-import { trackUsage } from '@hubspot/local-dev-lib/trackUsage';
-import { EventClass, getNodeVersionData, getPlatform, } from '../../lib/usageTracking.js';
+import { EventClass, getExecutionEnvironmentMeta, } from '../../lib/usageTracking.js';
 import { getConfig, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
+import { sendUsageEvent } from '../../lib/api/usageTracking.js';
 export async function trackToolUsage(toolName, meta) {
     const config = getConfig();
     if (config?.allowUsageTracking === false) {
@@ -8,15 +8,19 @@ export async function trackToolUsage(toolName, meta) {
     }
     const usageTrackingEvent = {
         action: 'cli-mcp-tool-invocation',
-        os: getPlatform(),
-        ...getNodeVersionData(),
         command: toolName,
         type: process.env.HUBSPOT_MCP_AI_AGENT,
+        ...getExecutionEnvironmentMeta(),
         ...meta,
     };
     const accountId = getConfigDefaultAccountIfExists()?.accountId || undefined;
     try {
-        await trackUsage('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
+        await sendUsageEvent({
+            eventName: 'cli-interaction',
+            eventClass: EventClass.INTERACTION,
+            meta: usageTrackingEvent,
+            accountId,
+        });
     }
-    catch (error) { }
+    catch (_error) { }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.6.0",
+    "version": "8.7.0-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -10,10 +10,10 @@
         "!**/__tests__/**"
     ],
     "dependencies": {
-        "@hubspot/local-dev-lib": "5.6.0",
+        "@hubspot/local-dev-lib": "5.7.1",
         "@hubspot/project-parsing-lib": "0.16.0",
         "@hubspot/serverless-dev-runtime": "7.0.7",
-        "@hubspot/ui-extensions-dev-server": "2.0.5",
+        "@hubspot/ui-extensions-dev-server": "2.0.7",
         "@inquirer/prompts": "7.1.0",
         "@modelcontextprotocol/sdk": "1.29.0",
         "archiver": "7.0.1",
@@ -37,7 +37,7 @@
         "table": "6.9.0",
         "tmp": "0.2.4",
         "update-notifier": "7.3.1",
-        "ws": "^8.18.2",
+        "ws": "8.20.0",
         "yargs": "17.7.2",
         "yargs-parser": "21.1.1"
     },

package/lib/yargs/makeYargsHandlerWithUsageTracking.d.ts

@@ -1,3 +0,0 @@
-import { ArgumentsCamelCase } from 'yargs';
-import { CommonArgs } from '../../types/Yargs.js';
-export declare function makeYargsHandlerWithUsageTracking<T extends CommonArgs>(trackingName: string, handler: (args: ArgumentsCamelCase<T>) => Promise<void>): (args: ArgumentsCamelCase<T>) => Promise<void>;