@hubspot/cli 7.7.11-experimental.0 → 7.7.13-experimental.0

package/commands/mcp/setup.d.ts

@@ -1,6 +1,6 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 interface MCPSetupArgs {
-    targets?: string[];
+    client?: string[];
     addDocsSearch?: boolean;
 }
 declare function handler(args: ArgumentsCamelCase<MCPSetupArgs>): Promise<void>;

package/commands/mcp/setup.js

@@ -18,14 +18,13 @@ const logger_1 = require("../../lib/ui/logger");
 const command = ['setup', 'update'];
 const describe = undefined; // Leave hidden for now
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
-const claudeCode = 'claude-code';
-const claudeDesktop = 'claude-desktop';
+const claudeCode = 'claude';
 const windsurf = 'windsurf';
 const cursor = 'cursor';
 const mcpServerName = 'hubspot-cli-mcp';
+const supportedMintlifyClients = [windsurf, cursor];
 const supportedTools = [
     { name: en_1.commands.mcp.setup.claudeCode, value: claudeCode },
-    // { name: commands.mcp.setup.claudeDesktop, value: claudeDesktop },
     { name: en_1.commands.mcp.setup.cursor, value: cursor },
     { name: en_1.commands.mcp.setup.windsurf, value: windsurf },
 ];
@@ -33,8 +32,8 @@ const hsCommand = 'hs';
 const mcpCommandArgs = ['mcp', 'start'];
 function setupBuilder(yargs) {
     yargs
-        .option('targets', {
-        describe: en_1.commands.mcp.setup.args.targets,
+        .option('client', {
+        describe: en_1.commands.mcp.setup.args.client,
         type: 'array',
         choices: [...supportedTools.map(tool => tool.value)],
     })
@@ -54,11 +53,16 @@ async function handler(args) {
         logger_1.uiLogger.error(en_1.commands.mcp.setup.errors.needsNode20);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    await addMcpServerToConfig(args.targets);
+    const derivedTargets = await addMcpServerToConfig(args.client);
     if (args.addDocsSearch) {
         logger_1.uiLogger.info(en_1.commands.mcp.setup.installingDocSearch);
+        logger_1.uiLogger.log('');
         await new Promise(() => {
-            const childProcess = (0, child_process_1.spawn)(`npx`, ['mint-mcp', 'add', 'hubspot-migration'], {
+            const subcommands = ['mint-mcp', 'add', 'hubspot-migration'];
+            const docsSearchClients = derivedTargets.filter(target => supportedMintlifyClients.includes(target));
+            const childProcess = (0, child_process_1.spawn)(`npx`, docsSearchClients && docsSearchClients.length
+                ? [...subcommands, '--client', ...docsSearchClients]
+                : subcommands, {
                 stdio: 'inherit',
             });
             childProcess.on('exit', code => {
@@ -92,9 +96,6 @@ async function addMcpServerToConfig(targets) {
             derivedTargets = targets;
         }
         SpinniesManager_1.default.init();
-        if (derivedTargets.includes(claudeDesktop)) {
-            await runSetupFunction(setupClaudeDesktop);
-        }
         if (derivedTargets.includes(claudeCode)) {
             await runSetupFunction(setupClaudeCode);
         }
@@ -105,12 +106,14 @@ async function addMcpServerToConfig(targets) {
             await runSetupFunction(setupWindsurf);
         }
         logger_1.uiLogger.info(en_1.commands.mcp.setup.success(derivedTargets));
+        return derivedTargets;
     }
     catch (error) {
         SpinniesManager_1.default.fail('mcpSetup', {
             text: en_1.commands.mcp.setup.spinners.failedToConfigure,
         });
         (0, errorHandlers_1.logError)(error);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
 async function runSetupFunction(func) {
@@ -119,51 +122,49 @@ async function runSetupFunction(func) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
-function setupClaudeDesktop() {
+function setupMcpConfigFile(config) {
     try {
-        const configPath = getClaudeDesktopConfigPath();
-        SpinniesManager_1.default.add('claudeDesktop', {
-            text: en_1.commands.mcp.setup.spinners.configuringClaudeDesktop,
+        SpinniesManager_1.default.add('spinner', {
+            text: config.configuringMessage,
         });
-        let config = {};
-        // Read existing config if it exists
-        if (fs_1.default.existsSync(configPath)) {
-            try {
-                const configContent = fs_1.default.readFileSync(configPath, 'utf8');
-                config = JSON.parse(configContent);
-            }
-            catch (error) {
-                SpinniesManager_1.default.fail('claudeDesktop', {
-                    text: en_1.commands.mcp.setup.spinners.failedToConfigureClaudeDesktop,
-                });
-                (0, errorHandlers_1.logError)(error);
-                return false;
-            }
+        if (!fs_1.default.existsSync(config.configPath)) {
+            SpinniesManager_1.default.succeed('spinner', {
+                text: config.configMissingMessage ||
+                    `Config file not found at ${config.configPath}`,
+            });
+            return false;
         }
-        else {
-            // Create config directory if it doesn't exist
-            const configDir = path_1.default.dirname(configPath);
-            fs_1.default.mkdirSync(configDir, { recursive: true });
+        let mcpConfig = {};
+        try {
+            const configContent = fs_1.default.readFileSync(config.configPath, 'utf8');
+            mcpConfig = JSON.parse(configContent);
+        }
+        catch (error) {
+            SpinniesManager_1.default.fail('spinner', {
+                text: config.failedMessage,
+            });
+            (0, errorHandlers_1.logError)(error);
+            return false;
         }
         // Initialize mcpServers if it doesn't exist
-        if (!config.mcpServers) {
-            config.mcpServers = {};
+        if (!mcpConfig.mcpServers) {
+            mcpConfig.mcpServers = {};
         }
         // Add or update HubSpot CLI MCP server
-        config.mcpServers[mcpServerName] = {
+        mcpConfig.mcpServers[mcpServerName] = {
             command: hsCommand,
             args: mcpCommandArgs,
         };
         // Write the updated config
-        fs_1.default.writeFileSync(configPath, JSON.stringify(config, null, 2));
-        SpinniesManager_1.default.succeed('claudeDesktop', {
-            text: en_1.commands.mcp.setup.spinners.configuredClaudeDesktop,
+        fs_1.default.writeFileSync(config.configPath, JSON.stringify(mcpConfig, null, 2));
+        SpinniesManager_1.default.succeed('spinner', {
+            text: config.configuredMessage,
         });
         return true;
     }
     catch (error) {
-        SpinniesManager_1.default.fail('claudeDesktop', {
-            text: en_1.commands.mcp.setup.spinners.failedToConfigureClaudeDesktop,
+        SpinniesManager_1.default.fail('spinner', {
+            text: config.failedMessage,
         });
         (0, errorHandlers_1.logError)(error);
         return false;
@@ -221,108 +222,23 @@ async function setupClaudeCode() {
     }
 }
 function setupCursor() {
-    try {
-        SpinniesManager_1.default.add('cursor', {
-            text: en_1.commands.mcp.setup.spinners.configuringCursor,
-        });
-        const cursorConfigPath = path_1.default.join(os_1.default.homedir(), '.cursor', 'mcp.json');
-        if (!fs_1.default.existsSync(cursorConfigPath)) {
-            SpinniesManager_1.default.succeed('cursor', {
-                text: en_1.commands.mcp.setup.spinners.noCursorMcpFile(cursorConfigPath),
-            });
-            return false;
-        }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let config = {};
-        // Read existing config
-        try {
-            const configContent = fs_1.default.readFileSync(cursorConfigPath, 'utf8');
-            config = JSON.parse(configContent);
-        }
-        catch (error) {
-            (0, errorHandlers_1.logError)(error);
-            return false;
-        }
-        // Initialize mcpServers if it doesn't exist
-        if (!config.mcpServers) {
-            config.mcpServers = {};
-        }
-        // Add or update HubSpot CLI MCP server
-        config.mcpServers[mcpServerName] = {
-            command: hsCommand,
-            args: mcpCommandArgs,
-        };
-        // Write the updated config
-        fs_1.default.writeFileSync(cursorConfigPath, JSON.stringify(config, null, 2));
-        SpinniesManager_1.default.succeed('cursor', {
-            text: en_1.commands.mcp.setup.spinners.configuredCursor,
-        });
-        return true;
-    }
-    catch (error) {
-        SpinniesManager_1.default.fail('cursor', {
-            text: en_1.commands.mcp.setup.spinners.failedToConfigureCursor,
-        });
-        (0, errorHandlers_1.logError)(error);
-        return false;
-    }
-}
-function getClaudeDesktopConfigPath() {
-    const platform = os_1.default.platform();
-    const homeDir = os_1.default.homedir();
-    if (platform === 'win32') {
-        const appData = process.env.APPDATA || path_1.default.join(homeDir, 'AppData', 'Roaming');
-        return path_1.default.join(appData, 'Claude', 'claude_desktop_config.json');
-    }
-    else {
-        return path_1.default.join(homeDir, '.config', 'claude', 'claude_desktop_config.json');
-    }
+    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),
+    });
 }
 function setupWindsurf() {
-    try {
-        SpinniesManager_1.default.add('cursor', {
-            text: en_1.commands.mcp.setup.spinners.configuringWindsurf,
-        });
-        const windsurf = path_1.default.join(os_1.default.homedir(), '.codeium', 'windsurf', 'mcp_config.json');
-        if (!fs_1.default.existsSync(windsurf)) {
-            SpinniesManager_1.default.succeed('cursor', {
-                text: en_1.commands.mcp.setup.spinners.noWindsurfFile(windsurf),
-            });
-            return false;
-        }
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let config = {};
-        // Read existing config
-        try {
-            const configContent = fs_1.default.readFileSync(windsurf, 'utf8');
-            config = JSON.parse(configContent);
-        }
-        catch (error) {
-            (0, errorHandlers_1.logError)(error);
-            return false;
-        }
-        // Initialize mcpServers if it doesn't exist
-        if (!config.mcpServers) {
-            config.mcpServers = {};
-        }
-        // Add or update HubSpot CLI MCP server
-        config.mcpServers[mcpServerName] = {
-            command: hsCommand,
-            args: mcpCommandArgs,
-        };
-        // Write the updated config
-        fs_1.default.writeFileSync(windsurf, JSON.stringify(config, null, 2));
-        SpinniesManager_1.default.succeed('cursor', {
-            text: en_1.commands.mcp.setup.spinners.configuredWindsurf,
-        });
-        return true;
-    }
-    catch (error) {
-        SpinniesManager_1.default.fail('cursor', {
-            text: en_1.commands.mcp.setup.spinners.failedToConfigureWindsurf,
-        });
-        (0, errorHandlers_1.logError)(error);
-        return false;
-    }
+    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),
+    });
 }
 exports.default = { command, describe, builder, handler };

package/lang/en.d.ts

@@ -766,13 +766,13 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
     };
     readonly mcp: {
         readonly setup: {
-            readonly installingDocSearch: "Adding the docs-search mcp server, please follow the prompt";
+            readonly installingDocSearch: "Adding the docs-search mcp server";
             readonly claudeCode: "Claude Code";
             readonly claudeDesktop: "Claude Desktop";
             readonly cursor: "Cursor";
             readonly windsurf: "Windsurf";
             readonly args: {
-                readonly targets: "Target applications to configure";
+                readonly client: "Target applications to configure";
                 readonly docsSearch: "Should the docs search mcp server be installed";
             };
             readonly success: (derivedTargets: string[]) => string;
@@ -799,7 +799,7 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
                 readonly configuredWindsurf: "Configured Windsurf";
             };
             readonly prompts: {
-                readonly targets: "[--targets] Which tools would you like to add the HubSpot CLI MCP server to?";
+                readonly targets: "[--client] Which tools would you like to add the HubSpot CLI MCP server to?";
                 readonly targetsRequired: "Must choose at least one application to configure.";
             };
         };

package/lang/en.js

@@ -778,13 +778,13 @@ exports.commands = {
     },
     mcp: {
         setup: {
-            installingDocSearch: 'Adding the docs-search mcp server, please follow the prompt',
+            installingDocSearch: 'Adding the docs-search mcp server',
             claudeCode: 'Claude Code',
             claudeDesktop: 'Claude Desktop',
             cursor: 'Cursor',
             windsurf: 'Windsurf',
             args: {
-                targets: 'Target applications to configure',
+                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')}.`,
@@ -811,7 +811,7 @@ exports.commands = {
                 configuredWindsurf: 'Configured Windsurf',
             },
             prompts: {
-                targets: '[--targets] Which tools would you like to add the HubSpot CLI MCP server to?',
+                targets: '[--client] Which tools would you like to add the HubSpot CLI MCP server to?',
                 targetsRequired: 'Must choose at least one application to configure.',
             },
         },

package/lib/middleware/configMiddleware.js

@@ -40,7 +40,13 @@ async function injectAccountIdMiddleware(argv) {
 const SKIP_CONFIG_VALIDATION = {
     init: { target: true },
     auth: { target: true },
-    mcp: { target: true },
+    mcp: {
+        target: false,
+        subCommands: {
+            setup: { target: true },
+            start: { target: true },
+        },
+    },
 };
 async function loadConfigMiddleware(argv) {
     // Skip this when no command is provided
@@ -106,7 +112,13 @@ const configSubCommands = {
 const SKIP_ACCOUNT_VALIDATION = {
     init: { target: true },
     auth: { target: true },
-    mcp: { target: true },
+    mcp: {
+        target: false,
+        subCommands: {
+            setup: { target: true },
+            start: { target: true },
+        },
+    },
     account: accountsSubCommands,
     accounts: accountsSubCommands,
     sandbox: sandboxesSubCommands,

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

@@ -84,9 +84,7 @@ class CreateProjectTool extends types_1.Tool {
                 content,
             };
         }
-        if (features && features.length) {
-            command = (0, command_1.addFlag)(command, 'features', features);
-        }
+        command = (0, command_1.addFlag)(command, 'features', features || []);
         try {
             const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteCurrentWorkingDirectory, command);
             return {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.11-experimental.0",
+    "version": "7.7.13-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",