@hubspot/cli 7.5.3 → 7.5.4-beta.1

package/commands/project/upload.js

@@ -23,11 +23,11 @@ const yargsUtils_1 = require("../../lib/yargsUtils");
 const command = 'upload';
 const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.upload.describe`), false);
 async function handler(args) {
-    const { forceCreate, message, derivedAccountId, providedAccountId, skipValidation, profile, } = args;
+    const { forceCreate, message, derivedAccountId, skipValidation, profile } = args;
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     (0, config_2.validateProjectConfig)(projectConfig, projectDir);
-    let targetAccountId = providedAccountId;
-    if (!targetAccountId && (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
+    let targetAccountId;
+    if ((0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
         targetAccountId = await (0, projectProfiles_1.loadAndValidateProfile)(projectConfig, projectDir, profile);
     }
     targetAccountId = targetAccountId || derivedAccountId;

package/commands/project/validate.js

@@ -18,17 +18,18 @@ const errorHandlers_1 = require("../../lib/errorHandlers");
 const command = 'validate';
 const describe = undefined;
 async function handler(args) {
-    const { derivedAccountId, providedAccountId, profile } = args;
+    const { derivedAccountId, profile } = args;
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
+    if (!projectConfig) {
+        logger_1.uiLogger.error(en_1.commands.project.validate.mustBeRanWithinAProject);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     if (!(0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion)) {
         logger_1.uiLogger.error(en_1.commands.project.validate.badVersion);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, config_2.validateProjectConfig)(projectConfig, projectDir);
-    let targetAccountId = providedAccountId;
-    if (!targetAccountId) {
-        targetAccountId = await (0, projectProfiles_1.loadAndValidateProfile)(projectConfig, projectDir, profile);
-    }
+    let targetAccountId = await (0, projectProfiles_1.loadAndValidateProfile)(projectConfig, projectDir, profile);
     targetAccountId = targetAccountId || derivedAccountId;
     const accountConfig = (0, config_1.getAccountConfig)(targetAccountId);
     const accountType = accountConfig && accountConfig.accountType;

package/lang/en.d.ts

@@ -838,13 +838,11 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
                 readonly claudeCodeInstallFailed: "Claude Code CLI not working - skipping configuration";
                 readonly failedToConfigureClaudeDesktop: "Failed to configure Claude Desktop";
                 readonly configuringCursor: "Configuring Cursor...";
-                readonly noCursorMcpFile: (configFile: string) => string;
                 readonly failedToConfigureCursor: "Failed to configure Cursor";
                 readonly configuredCursor: "Configured Cursor";
                 readonly alreadyInstalled: "HubSpot CLI mcp server already installed, reinstalling";
-                readonly configuringWindsurf: "Configuring Cursor...";
-                readonly noWindsurfFile: (configFile: string) => string;
-                readonly failedToConfigureWindsurf: "Failed to configure Cursor";
+                readonly configuringWindsurf: "Configuring Windsurf...";
+                readonly failedToConfigureWindsurf: "Failed to configure Windsurf";
                 readonly configuredWindsurf: "Configured Windsurf";
             };
             readonly prompts: {
@@ -1371,6 +1369,7 @@ ${string}`;
         };
         readonly validate: {
             readonly describe: "Validate the project before uploading";
+            readonly mustBeRanWithinAProject: "This command must be run from within a project directory.";
             readonly badVersion: "This command is only available for projects 2025.2 and later.";
             readonly examples: {
                 readonly default: "Validate the project before uploading";

package/lang/en.js

@@ -833,7 +833,7 @@ exports.commands = {
                 client: 'Target applications to configure',
                 docsSearch: 'Should the docs search mcp server be installed',
             },
-            success: (derivedTargets) => `You can now use the HubSpot CLI tools in ${derivedTargets.join(', ')}.  ${chalk_1.default.bold('You may need to restart these tools to apply the changes')}.`,
+            success: (derivedTargets) => `You can now use the HubSpot CLI MCP Server in ${derivedTargets.join(', ')}.  ${chalk_1.default.bold('You may need to restart these tools to apply the changes')}.`,
             errors: {
                 needsNode20: `This feature requires node >=20`,
             },
@@ -847,13 +847,11 @@ exports.commands = {
                 claudeCodeInstallFailed: 'Claude Code CLI not working - skipping configuration',
                 failedToConfigureClaudeDesktop: 'Failed to configure Claude Desktop',
                 configuringCursor: 'Configuring Cursor...',
-                noCursorMcpFile: (configFile) => `No ${configFile} file found - skipping Cursor configuration`,
                 failedToConfigureCursor: 'Failed to configure Cursor',
                 configuredCursor: 'Configured Cursor',
                 alreadyInstalled: 'HubSpot CLI mcp server already installed, reinstalling',
-                configuringWindsurf: 'Configuring Cursor...',
-                noWindsurfFile: (configFile) => `No ${configFile} file found - skipping Windsurf configuration`,
-                failedToConfigureWindsurf: 'Failed to configure Cursor',
+                configuringWindsurf: 'Configuring Windsurf...',
+                failedToConfigureWindsurf: 'Failed to configure Windsurf',
                 configuredWindsurf: 'Configured Windsurf',
             },
             prompts: {
@@ -1369,6 +1367,7 @@ exports.commands = {
         },
         validate: {
             describe: 'Validate the project before uploading',
+            mustBeRanWithinAProject: 'This command must be run from within a project directory.',
             badVersion: 'This command is only available for projects 2025.2 and later.',
             examples: {
                 default: 'Validate the project before uploading',

package/lib/mcp/setup.d.ts

@@ -8,5 +8,14 @@ export declare const supportedTools: ({
     name: "Windsurf";
     value: string;
 })[];
+interface McpCommand {
+    command: string;
+    args: string[];
+}
 export declare function addMintlifyMcpServer(installTargets: string[]): Promise<void>;
+export declare function setupMintlify(derivedTargets?: string[]): Promise<boolean>;
 export declare function addMcpServerToConfig(targets: string[] | undefined): Promise<string[]>;
+export declare function setupClaudeCode(mcpCommand?: McpCommand): Promise<boolean>;
+export declare function setupCursor(mcpCommand?: McpCommand): boolean;
+export declare function setupWindsurf(mcpCommand?: McpCommand): boolean;
+export {};

package/lib/mcp/setup.js

@@ -5,17 +5,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.supportedTools = void 0;
 exports.addMintlifyMcpServer = addMintlifyMcpServer;
+exports.setupMintlify = setupMintlify;
 exports.addMcpServerToConfig = addMcpServerToConfig;
+exports.setupClaudeCode = setupClaudeCode;
+exports.setupCursor = setupCursor;
+exports.setupWindsurf = setupWindsurf;
 const logger_1 = require("../ui/logger");
 const en_1 = require("../../lang/en");
-const child_process_1 = require("child_process");
 const promptUtils_1 = require("../prompts/promptUtils");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const errorHandlers_1 = require("../errorHandlers");
-const fs_1 = __importDefault(require("fs"));
 const command_1 = require("../../mcp-server/utils/command");
+const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const fs_1 = require("fs");
 const mcpServerName = 'hubspot-cli-mcp';
 const claudeCode = 'claude';
 const windsurf = 'windsurf';
@@ -26,12 +31,14 @@ exports.supportedTools = [
     { name: en_1.commands.mcp.setup.cursor, value: cursor },
     { name: en_1.commands.mcp.setup.windsurf, value: windsurf },
 ];
-const hsCommand = 'hs';
-const mcpCommandArgs = ['mcp', 'start'];
+const defaultMcpCommand = {
+    command: 'hs',
+    args: ['mcp', 'start'],
+};
 async function addMintlifyMcpServer(installTargets) {
     await runSetupFunction(() => setupMintlify(installTargets));
 }
-async function setupMintlify(derivedTargets) {
+async function setupMintlify(derivedTargets = supportedMintlifyClients) {
     logger_1.uiLogger.info(en_1.commands.mcp.setup.installingDocSearch);
     logger_1.uiLogger.log('');
     return new Promise(resolve => {
@@ -101,15 +108,12 @@ function setupMcpConfigFile(config) {
         SpinniesManager_1.default.add('spinner', {
             text: config.configuringMessage,
         });
-        if (!fs_1.default.existsSync(config.configPath)) {
-            SpinniesManager_1.default.fail('spinner', {
-                text: config.configMissingMessage,
-            });
-            return false;
+        if (!(0, fs_1.existsSync)(config.configPath)) {
+            fs_extra_1.default.writeFileSync(config.configPath, JSON.stringify({}, null, 2));
         }
         let mcpConfig = {};
         try {
-            const configContent = fs_1.default.readFileSync(config.configPath, 'utf8');
+            const configContent = fs_extra_1.default.readFileSync(config.configPath, 'utf8');
             mcpConfig = JSON.parse(configContent);
         }
         catch (error) {
@@ -125,11 +129,10 @@ function setupMcpConfigFile(config) {
         }
         // Add or update HubSpot CLI MCP server
         mcpConfig.mcpServers[mcpServerName] = {
-            command: hsCommand,
-            args: mcpCommandArgs,
+            ...config.mcpCommand,
         };
         // Write the updated config
-        fs_1.default.writeFileSync(config.configPath, JSON.stringify(mcpConfig, null, 2));
+        fs_extra_1.default.writeFileSync(config.configPath, JSON.stringify(mcpConfig, null, 2));
         SpinniesManager_1.default.succeed('spinner', {
             text: config.configuredMessage,
         });
@@ -143,7 +146,7 @@ function setupMcpConfigFile(config) {
         return false;
     }
 }
-async function setupClaudeCode() {
+async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
     try {
         SpinniesManager_1.default.add('claudeCode', {
             text: en_1.commands.mcp.setup.spinners.configuringClaudeCode,
@@ -154,8 +157,7 @@ async function setupClaudeCode() {
             // Run claude mcp add command
             const mcpConfig = JSON.stringify({
                 type: 'stdio',
-                command: hsCommand,
-                args: mcpCommandArgs,
+                ...mcpCommand,
             });
             const { stdout } = await (0, command_1.execAsync)('claude mcp list');
             if (stdout.includes(mcpServerName)) {
@@ -194,23 +196,23 @@ async function setupClaudeCode() {
         return false;
     }
 }
-function setupCursor() {
+function setupCursor(mcpCommand = defaultMcpCommand) {
     const cursorConfigPath = path_1.default.join(os_1.default.homedir(), '.cursor', 'mcp.json');
     return setupMcpConfigFile({
         configPath: cursorConfigPath,
         configuringMessage: en_1.commands.mcp.setup.spinners.configuringCursor,
         configuredMessage: en_1.commands.mcp.setup.spinners.configuredCursor,
         failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureCursor,
-        configMissingMessage: en_1.commands.mcp.setup.spinners.noCursorMcpFile(cursorConfigPath),
+        mcpCommand,
     });
 }
-function setupWindsurf() {
+function setupWindsurf(mcpCommand = defaultMcpCommand) {
     const windsurfConfigPath = path_1.default.join(os_1.default.homedir(), '.codeium', 'windsurf', 'mcp_config.json');
     return setupMcpConfigFile({
         configPath: windsurfConfigPath,
         configuringMessage: en_1.commands.mcp.setup.spinners.configuringWindsurf,
         configuredMessage: en_1.commands.mcp.setup.spinners.configuredWindsurf,
         failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureWindsurf,
-        configMissingMessage: en_1.commands.mcp.setup.spinners.noWindsurfFile(windsurfConfigPath),
+        mcpCommand,
     });
 }

package/mcp-server/tools/index.js

@@ -6,6 +6,7 @@ const CreateProjectTool_1 = require("./project/CreateProjectTool");
 const GuidedWalkthroughTool_1 = require("./project/GuidedWalkthroughTool");
 const DeployProject_1 = require("./project/DeployProject");
 const AddFeatureToProject_1 = require("./project/AddFeatureToProject");
+const ValidateProjectTool_1 = require("./project/ValidateProjectTool");
 function registerProjectTools(mcpServer) {
     return [
         new UploadProjectTools_1.UploadProjectTools(mcpServer).register(),
@@ -13,5 +14,6 @@ function registerProjectTools(mcpServer) {
         new GuidedWalkthroughTool_1.GuidedWalkthroughTool(mcpServer).register(),
         new DeployProject_1.DeployProject(mcpServer).register(),
         new AddFeatureToProject_1.AddFeatureToProject(mcpServer).register(),
+        new ValidateProjectTool_1.ValidateProjectTool(mcpServer).register(),
     ];
 }

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

@@ -3,26 +3,26 @@ import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: z.ZodString;
-    name: z.ZodString;
+    name: z.ZodOptional<z.ZodString>;
     destination: z.ZodString;
     projectBase: z.ZodUnion<[z.ZodLiteral<"empty">, z.ZodLiteral<"app">]>;
     distribution: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"marketplace">, z.ZodLiteral<"private">]>>;
     auth: z.ZodOptional<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"oauth">]>>>;
     features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">]>, "many">>;
 }, "strip", z.ZodTypeAny, {
-    name: string;
     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;
     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;
 }>;

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

@@ -13,7 +13,8 @@ const inputSchema = {
     absoluteCurrentWorkingDirectory: constants_2.absoluteCurrentWorkingDirectory,
     name: zod_1.z
         .string()
-        .describe('The name of the project to be created.  This name is how your project will appear in HubSpot.'),
+        .describe('The name of the project to be created.  This name is how your project will appear in HubSpot. If not specified by the user, do not choose for them.  Changing this is potentially destructive.')
+        .optional(),
     destination: zod_1.z
         .string()
         .describe('Relative path to the directory the project will be created in. DO NOT use the current directory unless the user has explicitly stated to do so.'),
@@ -56,6 +57,9 @@ class CreateProjectTool extends types_1.Tool {
         if (name) {
             command = (0, command_1.addFlag)(command, 'name', name);
         }
+        else {
+            content.push((0, content_1.formatTextContent)(`Ask the user what they would like to name the project.`));
+        }
         if (destination) {
             command = (0, command_1.addFlag)(command, 'dest', destination);
         }

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

@@ -42,7 +42,7 @@ class DeployProject extends types_1.Tool {
     register() {
         return this.mcpServer.registerTool('deploy-hubspot-project', {
             title: 'Deploy a build of HubSpot Project',
-            description: 'Takes a build number and a project name and deploys that build of the 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,
         }, this.handler);
     }

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

@@ -27,7 +27,7 @@ class UploadProjectTools extends types_1.Tool {
     register() {
         return this.mcpServer.registerTool('upload-hubspot-project', {
             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.',
+            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,
         }, this.handler);
     }

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

@@ -0,0 +1,17 @@
+import { TextContentResponse, Tool } from '../../types';
+import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { z } from 'zod';
+declare const inputSchemaZodObject: z.ZodObject<{
+    absoluteProjectPath: z.ZodString;
+}, "strip", z.ZodTypeAny, {
+    absoluteProjectPath: string;
+}, {
+    absoluteProjectPath: string;
+}>;
+export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
+export declare class ValidateProjectTool extends Tool<CreateProjectInputSchema> {
+    constructor(mcpServer: McpServer);
+    handler({ absoluteProjectPath, }: CreateProjectInputSchema): Promise<TextContentResponse>;
+    register(): RegisteredTool;
+}
+export {};

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValidateProjectTool = void 0;
+const types_1 = require("../../types");
+const zod_1 = require("zod");
+const constants_1 = require("./constants");
+const project_1 = require("../../utils/project");
+const content_1 = require("../../utils/content");
+const inputSchema = {
+    absoluteProjectPath: constants_1.absoluteProjectPath,
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const inputSchemaZodObject = zod_1.z.object({ ...inputSchema });
+class ValidateProjectTool extends types_1.Tool {
+    constructor(mcpServer) {
+        super(mcpServer);
+    }
+    async handler({ absoluteProjectPath, }) {
+        try {
+            const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, 'hs project validate');
+            return (0, content_1.formatTextContents)(stdout, stderr);
+        }
+        catch (error) {
+            return (0, content_1.formatTextContents)(error instanceof Error ? error.message : `${error}`);
+        }
+    }
+    register() {
+        return this.mcpServer.registerTool('validate-hubspot-project', {
+            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,
+        }, this.handler);
+    }
+}
+exports.ValidateProjectTool = ValidateProjectTool;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.5.3",
+    "version": "7.5.4-beta.1",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -66,22 +66,23 @@
     },
     "scripts": {
         "build": "ts-node ./scripts/build.ts",
+        "build-docker": "docker image build --tag hs-cli-image . && docker image prune -f",
+        "circular-deps": "yarn madge --circular .",
         "debug-mcp": "yarn build && npx @modelcontextprotocol/inspector node dist/mcp-server/server.js",
+        "hs": "yarn build && node ./dist/bin/hs",
+        "hs-debug": "yarn build && NODE_DEBUG=http* node --inspect-brk ./dist/bin/hs",
         "lint": "echo 'Linting is disabled for Blazar'",
         "lint:local": "eslint . && prettier --list-different './**/*.{ts,js,json}'",
         "list-all-commands": "yarn ts-node ./scripts/get-all-commands.ts",
         "local-link": "yarn ts-node ./scripts/linking.ts",
+        "mcp-local": "yarn ts-node ./scripts/mcp-local.ts",
         "prettier:write": "prettier --write './**/*.{ts,js,json}'",
+        "release": "yarn ts-node ./scripts/release.ts release",
         "test": "node --experimental-vm-modules ./node_modules/jest/bin/jest.js",
         "test-cli": "yarn build && yarn --cwd 'acceptance-tests' test-ci",
         "test-cli-debug": "yarn build && yarn --cwd 'acceptance-tests' test-debug",
-        "test-cli-qa": "yarn build && yarn --cwd 'acceptance-tests' test-qa",
         "test-cli-latest": "yarn build && yarn build-docker && docker container run -it --rm --name=hs-cli-container hs-cli-image yarn --cwd 'acceptance-tests' test-latest",
-        "build-docker": "docker image build --tag hs-cli-image . && docker image prune -f",
-        "circular-deps": "yarn madge --circular .",
-        "release": "yarn ts-node ./scripts/release.ts release",
-        "hs": "yarn build && node ./dist/bin/hs",
-        "hs-debug": "yarn build && NODE_DEBUG=http* node --inspect-brk ./dist/bin/hs",
+        "test-cli-qa": "yarn build && yarn --cwd 'acceptance-tests' test-qa",
         "update-ldl": "yarn add --exact @hubspot/local-dev-lib@latest",
         "view-unreleased-changes": "node ./scripts/unreleasedChanges.js"
     },