@hubspot/cli 7.7.19-experimental.0 → 7.7.19-experimental.1

package/lib/usageTracking.js

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

package/mcp-server/tools/project/CreateProjectTool.d.ts

@@ -14,17 +14,17 @@ declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: string;
     destination: string;
     auth?: "oauth" | "static" | undefined;
+    name?: string | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
-    name?: string | undefined;
 }, {
     projectBase: "app" | "empty";
     absoluteCurrentWorkingDirectory: string;
     destination: string;
     auth?: "oauth" | "static" | undefined;
+    name?: string | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
-    name?: string | undefined;
 }>;
 export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class CreateProjectTool extends Tool<CreateProjectInputSchema> {

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 --debug`);
+        const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project upload --force-create`);
         return (0, content_1.formatTextContents)(stdout, stderr);
     }
     register() {

package/mcp-server/utils/project.js

@@ -13,8 +13,5 @@ async function runCommandInDir(directory, command) {
     }
     return (0, command_1.execAsync)(command, {
         cwd: path_1.default.resolve(directory),
-        env: {
-            ...process.env,
-        },
     });
 }

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.19-experimental.0",
+    "version": "7.7.19-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/local-dev-lib": "3.13.1",
         "@hubspot/project-parsing-lib": "0.5.1",
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
@@ -19,7 +19,7 @@
         "express": "4.21.2",
         "findup-sync": "4.0.0",
         "fs-extra": "8.1.0",
-        "inquirer": "8.2.0",
+        "inquirer": "12.7.0",
         "js-yaml": "4.1.0",
         "moment": "2.30.1",
         "open": "7.4.2",

package/types/Prompts.d.ts

@@ -1,3 +1,4 @@
+import { Separator } from '@inquirer/prompts';
 export type GenericPromptResponse = {
     [key: string]: any;
 };
@@ -6,9 +7,10 @@ export type PromptChoices<T = any> = Array<string | {
     name: string;
     value?: T;
     disabled?: string | boolean;
-}>;
+    checked?: boolean;
+} | Separator>;
 export type PromptWhen = boolean | (() => boolean);
-type PromptOperand = string | number | boolean | string[] | boolean[] | null;
+export type PromptOperand = string | number | boolean | string[] | boolean[] | null;
 export type PromptConfig<T extends GenericPromptResponse> = {
     name: keyof T;
     type?: PromptType;