@hubspot/cli 7.7.17-experimental.0 → 7.7.18-experimental.0

package/commands/mcp/setup.js

@@ -37,6 +37,7 @@ function setupBuilder(yargs) {
     })
         .option('add-docs-search', {
         type: 'boolean',
+        hidden: true,
     });
     return yargs;
 }

package/commands/mcp/start.d.ts

@@ -1,3 +1,6 @@
 import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
-declare const mcpStartCommand: YargsCommandModule<unknown, CommonArgs>;
+interface McpStartArgs extends CommonArgs {
+    aiAgent: string;
+}
+declare const mcpStartCommand: YargsCommandModule<unknown, McpStartArgs>;
 export default mcpStartCommand;

package/commands/mcp/start.js

@@ -24,9 +24,9 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, usageTracking_1.trackCommandUsage)('mcp-start', {}, args.derivedAccountId);
-    await startMcpServer();
+    await startMcpServer(args.aiAgent);
 }
-async function startMcpServer() {
+async function startMcpServer(aiAgent) {
     try {
         const serverPath = path_1.default.join(__dirname, '..', '..', 'mcp-server', 'server.js');
         // Check if server file exists
@@ -36,11 +36,13 @@ async function startMcpServer() {
         }
         logger_1.uiLogger.info(en_1.commands.mcp.start.startingServer);
         logger_1.uiLogger.info(en_1.commands.mcp.start.stopInstructions);
+        const args = [serverPath];
         // Start the server using ts-node
-        const child = (0, child_process_1.spawn)('node', [serverPath], {
+        const child = (0, child_process_1.spawn)(`node`, args, {
             stdio: 'inherit',
             env: {
                 ...process.env,
+                HUBSPOT_MCP_AI_AGENT: aiAgent || 'unknown',
             },
         });
         // Handle server process events
@@ -63,6 +65,11 @@ async function startMcpServer() {
     }
 }
 function startBuilder(yargs) {
+    yargs
+        .option('ai-agent', {
+        type: 'string',
+    })
+        .demandOption('ai-agent');
     return yargs;
 }
 const builder = (0, yargsUtils_1.makeYargsBuilder)(startBuilder, command, describe, {

package/lib/mcp/setup.js

@@ -157,7 +157,7 @@ async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
             // Run claude mcp add command
             const mcpConfig = JSON.stringify({
                 type: 'stdio',
-                ...mcpCommand,
+                ...buildCommandWithAgentString(mcpCommand, claudeCode),
             });
             const { stdout } = await (0, command_1.execAsync)('claude mcp list');
             if (stdout.includes(mcpServerName)) {
@@ -203,7 +203,7 @@ function setupCursor(mcpCommand = defaultMcpCommand) {
         configuringMessage: en_1.commands.mcp.setup.spinners.configuringCursor,
         configuredMessage: en_1.commands.mcp.setup.spinners.configuredCursor,
         failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureCursor,
-        mcpCommand,
+        mcpCommand: buildCommandWithAgentString(mcpCommand, cursor),
     });
 }
 function setupWindsurf(mcpCommand = defaultMcpCommand) {
@@ -213,6 +213,11 @@ function setupWindsurf(mcpCommand = defaultMcpCommand) {
         configuringMessage: en_1.commands.mcp.setup.spinners.configuringWindsurf,
         configuredMessage: en_1.commands.mcp.setup.spinners.configuredWindsurf,
         failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureWindsurf,
-        mcpCommand,
+        mcpCommand: buildCommandWithAgentString(mcpCommand, windsurf),
     });
 }
+function buildCommandWithAgentString(mcpCommand, agent) {
+    const mcpCommandCopy = structuredClone(mcpCommand);
+    mcpCommandCopy.args.push('--ai-agent', agent);
+    return mcpCommandCopy;
+}

package/lib/usageTracking.d.ts

@@ -13,9 +13,9 @@ type Meta = {
     file?: boolean;
     successful?: boolean;
 };
-export declare function trackCommandUsage(command: string, meta?: Meta, accountId?: number): Promise<void>;
-export declare function trackHelpUsage(command: string): Promise<void>;
-export declare function trackConvertFieldsUsage(command: string): Promise<void>;
-export declare function trackAuthAction(command: string, authType: string, step: string, accountId?: number): Promise<void>;
-export declare function trackCommandMetadataUsage(command: string, meta?: Meta, accountId?: number): Promise<void>;
+export declare function trackCommandUsage(command: string, meta?: Meta, accountId?: number): void;
+export declare function trackHelpUsage(command: string): void;
+export declare function trackConvertFieldsUsage(command: string): void;
+export declare function trackAuthAction(command: string, authType: string, step: string, accountId?: number): void;
+export declare function trackCommandMetadataUsage(command: string, meta?: Meta, accountId?: number): void;
 export {};

package/lib/usageTracking.js

@@ -33,7 +33,7 @@ function getPlatform() {
             return process.platform;
     }
 }
-async function trackCommandUsage(command, meta = {}, accountId) {
+function trackCommandUsage(command, meta = {}, accountId) {
     if (!(0, config_1.isTrackingAllowed)()) {
         return;
     }
@@ -46,88 +46,47 @@ async function trackCommandUsage(command, meta = {}, accountId) {
                 ? accountConfig.authType
                 : auth_1.API_KEY_AUTH_METHOD.value;
     }
-    setImmediate(async () => {
-        const usageTrackingEvent = {
-            action: 'cli-command',
-            os: getPlatform(),
-            ...getNodeVersionData(),
-            version: package_json_1.version,
-            command,
-            authType,
-            ...meta,
-        };
-        try {
-            await (0, trackUsage_1.trackUsage)('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
-            logger_1.logger.debug('Sent usage tracking command event: %o', usageTrackingEvent);
-        }
-        catch (e) {
-            (0, errorHandlers_1.debugError)(e);
-        }
+    trackCliInteraction({
+        action: 'cli-command',
+        command,
+        authType,
+        ...meta,
+        accountId,
     });
 }
-async function trackHelpUsage(command) {
+function trackHelpUsage(command) {
     if (!(0, config_1.isTrackingAllowed)()) {
         return;
     }
-    try {
-        if (command) {
-            logger_1.logger.debug('Tracking help usage of "%s" sub-command', command);
-        }
-        else {
-            logger_1.logger.debug('Tracking help usage of main command');
-        }
-        await (0, trackUsage_1.trackUsage)('cli-interaction', EventClass.INTERACTION, {
-            action: 'cli-help',
-            os: getPlatform(),
-            ...getNodeVersionData(),
-            version: package_json_1.version,
-            command,
-        });
+    if (command) {
+        logger_1.logger.debug('Tracking help usage of "%s" sub-command', command);
     }
-    catch (e) {
-        (0, errorHandlers_1.debugError)(e);
+    else {
+        logger_1.logger.debug('Tracking help usage of main command');
     }
+    trackCliInteraction({
+        action: 'cli-help',
+        command,
+    });
 }
-async function trackConvertFieldsUsage(command) {
-    if (!(0, config_1.isTrackingAllowed)()) {
-        return;
-    }
-    try {
-        logger_1.logger.debug('Attempting to track usage of "%s" command', command);
-        await (0, trackUsage_1.trackUsage)('cli-interaction', EventClass.INTERACTION, {
-            action: 'cli-process-fields',
-            os: getPlatform(),
-            ...getNodeVersionData(),
-            version: package_json_1.version,
-            command,
-        });
-    }
-    catch (e) {
-        (0, errorHandlers_1.debugError)(e);
-    }
+function trackConvertFieldsUsage(command) {
+    trackCliInteraction({
+        action: 'cli-process-fields',
+        command,
+    });
 }
-async function trackAuthAction(command, authType, step, accountId) {
-    if (!(0, config_1.isTrackingAllowed)()) {
-        return;
-    }
-    const usageTrackingEvent = {
+function trackAuthAction(command, authType, step, accountId) {
+    trackCliInteraction({
         action: 'cli-auth',
-        os: getPlatform(),
-        ...getNodeVersionData(),
-        version: package_json_1.version,
         command,
         authType,
-        step,
-    };
-    try {
-        await (0, trackUsage_1.trackUsage)('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
-        logger_1.logger.debug('Sent usage tracking command event: %o', usageTrackingEvent);
-    }
-    catch (e) {
-        (0, errorHandlers_1.debugError)(e);
-    }
+        accountId,
+        meta: {
+            step,
+        },
+    });
 }
-async function trackCommandMetadataUsage(command, meta = {}, accountId) {
+function trackCommandMetadataUsage(command, meta = {}, accountId) {
     if (!(0, config_1.isTrackingAllowed)()) {
         return;
     }
@@ -140,9 +99,21 @@ async function trackCommandMetadataUsage(command, meta = {}, accountId) {
                 ? accountConfig.authType
                 : auth_1.API_KEY_AUTH_METHOD.value;
     }
-    setImmediate(async () => {
+    trackCliInteraction({
+        action: 'cli-command-metadata',
+        command,
+        authType,
+        accountId,
+        meta,
+    });
+}
+function trackCliInteraction({ action, accountId, command, authType, meta = {}, }) {
+    try {
+        if (!(0, config_1.isTrackingAllowed)()) {
+            return;
+        }
         const usageTrackingEvent = {
-            action: 'cli-command-metadata',
+            action,
             os: getPlatform(),
             ...getNodeVersionData(),
             version: package_json_1.version,
@@ -150,12 +121,33 @@ async function trackCommandMetadataUsage(command, meta = {}, accountId) {
             authType,
             ...meta,
         };
-        try {
-            await (0, trackUsage_1.trackUsage)('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
-            logger_1.logger.debug('Sent usage tracking command event: %o', usageTrackingEvent);
+        logger_1.logger.debug('LFFFFFGGGGGG');
+        logger_1.logger.debug(process.env);
+        if (process.env.HUBSPOT_MCP_AI_AGENT) {
+            setImmediate(async () => {
+                try {
+                    await (0, trackUsage_1.trackUsage)('cli-interaction', EventClass.INTERACTION, {
+                        ...usageTrackingEvent,
+                        action: 'cli-mcp-server',
+                        type: process.env.HUBSPOT_MCP_AI_AGENT,
+                    }, accountId);
+                }
+                catch (error) {
+                    (0, errorHandlers_1.debugError)(error);
+                }
+            });
         }
-        catch (e) {
-            (0, errorHandlers_1.debugError)(e);
-        }
-    });
+        setImmediate(async () => {
+            try {
+                await (0, trackUsage_1.trackUsage)('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
+            }
+            catch (error) {
+                (0, errorHandlers_1.debugError)(error);
+            }
+        });
+        logger_1.logger.debug('Sent usage tracking command event: %o', usageTrackingEvent);
+    }
+    catch (e) {
+        (0, errorHandlers_1.debugError)(e);
+    }
 }

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

@@ -21,7 +21,7 @@ class UploadProjectTools extends types_1.Tool {
         super(mcpServer);
     }
     async handler({ absoluteProjectPath, }) {
-        const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project upload --force-create`);
+        const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project upload --force-create --debug`);
         return (0, content_1.formatTextContents)(stdout, stderr);
     }
     register() {

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/package.json

@@ -1,12 +1,12 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.17-experimental.0",
+    "version": "7.7.18-experimental.0",
     "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.5.2-beta.0",
+        "@hubspot/project-parsing-lib": "0.5.1",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.9.2",