@hubspot/cli 7.7.8-experimental.0 → 7.7.10-experimental.0

package/commands/mcp/setup.d.ts

@@ -1,8 +1,9 @@
 import { ArgumentsCamelCase, Argv } from 'yargs';
 interface MCPSetupArgs {
     targets?: string[];
+    addDocsSearch?: boolean;
 }
-declare function handler(argv: ArgumentsCamelCase<MCPSetupArgs>): Promise<void>;
+declare function handler(args: ArgumentsCamelCase<MCPSetupArgs>): Promise<void>;
 declare const _default: {
     command: string[];
     describe: undefined;

package/commands/mcp/setup.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const child_process_1 = require("child_process");
 const util_1 = require("util");
 const path_1 = __importDefault(require("path"));
@@ -12,36 +11,65 @@ const os_1 = __importDefault(require("os"));
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
-const chalk_1 = __importDefault(require("chalk"));
 const yargsUtils_1 = require("../../lib/yargsUtils");
+const en_1 = require("../../lang/en");
+const errorHandlers_1 = require("../../lib/errorHandlers");
+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 windsurf = 'windsurf';
+const cursor = 'cursor';
+const mcpServerName = 'hubspot-cli-mcp';
 const supportedTools = [
-    { name: 'Claude', value: 'claude' },
-    { name: 'Claude Desktop', value: 'claude-desktop' },
-    { name: 'Cursor', value: 'cursor' },
+    { 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 },
 ];
+const hsCommand = 'hs';
+const mcpCommandArgs = ['mcp', 'start'];
 function setupBuilder(yargs) {
-    yargs.option('targets', {
-        describe: 'Target application to configure',
+    yargs
+        .option('targets', {
+        describe: en_1.commands.mcp.setup.args.targets,
         type: 'array',
         choices: [...supportedTools.map(tool => tool.value)],
+    })
+        .option('add-docs-search', {
+        type: 'boolean',
     });
     return yargs;
 }
 const builder = (0, yargsUtils_1.makeYargsBuilder)(setupBuilder, command, describe, {
     useGlobalOptions: true,
 });
-async function handler(argv) {
+async function handler(args) {
     try {
         await import('@modelcontextprotocol/sdk/server/mcp.js');
     }
     catch (e) {
-        logger_1.logger.error(`This feature requires node >=20`);
+        logger_1.uiLogger.error(en_1.commands.mcp.setup.errors.needsNode20);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    await addMcpServerToConfig(argv.targets);
+    await addMcpServerToConfig(args.targets);
+    if (args.addDocsSearch) {
+        logger_1.uiLogger.info(en_1.commands.mcp.setup.installingDocSearch);
+        await new Promise(() => {
+            const childProcess = (0, child_process_1.spawn)(`npx`, ['mint-mcp', 'add', 'hubspot-migration'], {
+                stdio: 'inherit',
+            });
+            childProcess.on('exit', code => {
+                if (code !== 0) {
+                    process.exit(exitCodes_1.EXIT_CODES.ERROR);
+                }
+                process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+            });
+        });
+    }
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
 async function addMcpServerToConfig(targets) {
     try {
@@ -50,10 +78,12 @@ async function addMcpServerToConfig(targets) {
             const { selectedTargets } = await (0, promptUtils_1.promptUser)({
                 name: 'selectedTargets',
                 type: 'checkbox',
-                message: '[--targets] Which tools would you like to add the HubSpot CLI MCP server to?',
+                message: en_1.commands.mcp.setup.prompts.targets,
                 choices: supportedTools,
                 validate: (choices) => {
-                    return choices.length === 0 ? 'Must choose at least one tool' : true;
+                    return choices.length === 0
+                        ? en_1.commands.mcp.setup.prompts.targetsRequired
+                        : true;
                 },
             });
             derivedTargets = selectedTargets;
@@ -62,22 +92,25 @@ async function addMcpServerToConfig(targets) {
             derivedTargets = targets;
         }
         SpinniesManager_1.default.init();
-        if (derivedTargets.includes('claude-desktop')) {
+        if (derivedTargets.includes(claudeDesktop)) {
             await runSetupFunction(setupClaudeDesktop);
         }
-        if (derivedTargets.includes('claude')) {
+        if (derivedTargets.includes(claudeCode)) {
             await runSetupFunction(setupClaudeCode);
         }
-        if (derivedTargets.includes('cursor')) {
+        if (derivedTargets.includes(cursor)) {
             await runSetupFunction(setupCursor);
         }
-        logger_1.logger.info(`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')}.`);
+        if (derivedTargets.includes(windsurf)) {
+            await runSetupFunction(setupWindsurf);
+        }
+        logger_1.uiLogger.info(en_1.commands.mcp.setup.success(derivedTargets));
     }
     catch (error) {
         SpinniesManager_1.default.fail('mcpSetup', {
-            text: 'Failed to configure HubSpot CLI MCP server.',
+            text: en_1.commands.mcp.setup.spinners.failedToConfigure,
         });
-        logger_1.logger.error(error);
+        (0, errorHandlers_1.logError)(error);
     }
 }
 async function runSetupFunction(func) {
@@ -86,59 +119,60 @@ async function runSetupFunction(func) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
-async function setupClaudeDesktop() {
+function setupClaudeDesktop() {
     try {
         const configPath = getClaudeDesktopConfigPath();
         SpinniesManager_1.default.add('claudeDesktop', {
-            text: 'Configuring Claude Desktop...',
+            text: en_1.commands.mcp.setup.spinners.configuringClaudeDesktop,
         });
-        // eslint-disable-next-line  @typescript-eslint/no-explicit-any
         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);
-                logger_1.logger.debug(`Found existing Claude Desktop config at ${configPath}`);
             }
             catch (error) {
-                logger_1.logger.debug(`Could not parse existing Claude Desktop config, creating new one: ${error}`);
+                SpinniesManager_1.default.fail('claudeDesktop', {
+                    text: en_1.commands.mcp.setup.spinners.failedToConfigureClaudeDesktop,
+                });
+                (0, errorHandlers_1.logError)(error);
+                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 });
-            logger_1.logger.debug(`Created Claude Desktop config directory at ${configDir}`);
         }
         // Initialize mcpServers if it doesn't exist
         if (!config.mcpServers) {
             config.mcpServers = {};
         }
         // Add or update HubSpot CLI MCP server
-        config.mcpServers['hubspot-cli-mcp'] = {
-            command: 'hs',
-            args: ['mcp', 'start'],
+        config.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: 'Configured Claude Desktop',
+            text: en_1.commands.mcp.setup.spinners.configuredClaudeDesktop,
         });
         return true;
     }
     catch (error) {
         SpinniesManager_1.default.fail('claudeDesktop', {
-            text: 'Failed to configure Claude Desktop',
+            text: en_1.commands.mcp.setup.spinners.failedToConfigureClaudeDesktop,
         });
-        logger_1.logger.debug(`Failed to configure Claude Desktop: ${error}`);
+        (0, errorHandlers_1.logError)(error);
         return false;
     }
 }
 async function setupClaudeCode() {
     try {
         SpinniesManager_1.default.add('claudeCode', {
-            text: 'Configuring Claude Code...',
+            text: en_1.commands.mcp.setup.spinners.configuringClaudeCode,
         });
         try {
             // Check if claude command is available
@@ -146,19 +180,19 @@ async function setupClaudeCode() {
             // Run claude mcp add command
             const mcpConfig = JSON.stringify({
                 type: 'stdio',
-                command: 'yarn',
-                args: ['hs', 'mcp', 'start'],
+                command: hsCommand,
+                args: mcpCommandArgs,
             });
             const { stdout } = await execAsync('claude mcp list');
-            if (stdout.includes('hubspot-cli-mcp')) {
+            if (stdout.includes(mcpServerName)) {
                 SpinniesManager_1.default.update('claudeCode', {
-                    text: 'CLI mcp server already installed, reinstalling',
+                    text: en_1.commands.mcp.setup.spinners.alreadyInstalled,
                 });
-                await execAsync('claude mcp remove "hubspot-cli-mcp" --scope user');
+                await execAsync(`claude mcp remove "${mcpServerName}" --scope user`);
             }
-            await execAsync(`claude mcp add-json "hubspot-cli-mcp" '${mcpConfig}' --scope user`);
+            await execAsync(`claude mcp add-json "${mcpServerName}" '${mcpConfig}' --scope user`);
             SpinniesManager_1.default.succeed('claudeCode', {
-                text: 'Configured Claude Code',
+                text: en_1.commands.mcp.setup.spinners.configuredClaudeCode,
             });
             return true;
         }
@@ -166,38 +200,36 @@ async function setupClaudeCode() {
             if (error instanceof Error &&
                 error.message.includes('claude: command not found')) {
                 SpinniesManager_1.default.fail('claudeCode', {
-                    text: 'Claude Code CLI not found - skipping configuration',
+                    text: en_1.commands.mcp.setup.spinners.claudeCodeNotFound,
                 });
-                logger_1.logger.info('  Install Claude Code CLI to enable this configuration');
             }
             else {
                 SpinniesManager_1.default.fail('claudeCode', {
-                    text: 'Claude Code CLI not working - skipping configuration',
+                    text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
                 });
-                logger_1.logger.error(`Error: ${error}`);
+                (0, errorHandlers_1.logError)(error);
             }
             return false;
         }
     }
     catch (error) {
         SpinniesManager_1.default.fail('claudeCode', {
-            text: 'Failed to configure Claude Code',
+            text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
         });
-        logger_1.logger.error(`Failed to configure Claude Code: ${error}`);
+        (0, errorHandlers_1.logError)(error);
         return false;
     }
 }
-async function setupCursor() {
+function setupCursor() {
     try {
         SpinniesManager_1.default.add('cursor', {
-            text: 'Configuring 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: 'No .cursor/mcp.json file found - skipping Cursor configuration',
+                text: en_1.commands.mcp.setup.spinners.noCursorMcpFile(cursorConfigPath),
             });
-            logger_1.logger.info('  Create a .cursor/mcp.json file in your project to enable Cursor MCP support');
             return false;
         }
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -206,32 +238,32 @@ async function setupCursor() {
         try {
             const configContent = fs_1.default.readFileSync(cursorConfigPath, 'utf8');
             config = JSON.parse(configContent);
-            logger_1.logger.debug(`Found existing Cursor config at ${cursorConfigPath}`);
         }
         catch (error) {
-            logger_1.logger.warn(`Could not parse existing Cursor config, creating new one: ${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['hubspot-cli-mcp'] = {
-            command: 'hs',
-            args: ['mcp', 'start'],
+        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: 'Configured Cursor',
+            text: en_1.commands.mcp.setup.spinners.configuredCursor,
         });
         return true;
     }
     catch (error) {
         SpinniesManager_1.default.fail('cursor', {
-            text: 'Failed to configure Cursor',
+            text: en_1.commands.mcp.setup.spinners.failedToConfigureCursor,
         });
-        logger_1.logger.error(`Failed to configure Cursor: ${error}`);
+        (0, errorHandlers_1.logError)(error);
         return false;
     }
 }
@@ -246,4 +278,51 @@ function getClaudeDesktopConfigPath() {
         return path_1.default.join(homeDir, '.config', 'claude', 'claude_desktop_config.json');
     }
 }
+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;
+    }
+}
 exports.default = { command, describe, builder, handler };

package/commands/mcp/start.js

@@ -3,12 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
+const logger_1 = require("../../lib/ui/logger");
+const errorHandlers_1 = require("../../lib/errorHandlers");
+const en_1 = require("../../lang/en");
 const command = 'start';
 const describe = undefined; // Leave hidden for now
 function startBuilder(yargs) {
@@ -22,7 +24,7 @@ async function handler() {
         await import('@modelcontextprotocol/sdk/server/mcp.js');
     }
     catch (e) {
-        logger_1.logger.error(`This feature requires node >=20`);
+        logger_1.uiLogger.error(en_1.commands.mcp.start.errors.needsNode20);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     await startMcpServer();
@@ -32,13 +34,11 @@ async function startMcpServer() {
         const serverPath = path_1.default.join(__dirname, '..', '..', 'mcp-server', 'server.js');
         // Check if server file exists
         if (!fs_1.default.existsSync(serverPath)) {
-            logger_1.logger.error(`MCP server file not found at ${serverPath}`);
+            logger_1.uiLogger.error(en_1.commands.mcp.start.errors.serverFileNotFound(serverPath));
             return;
         }
-        logger_1.logger.info('Starting HubSpot CLI MCP server...');
-        logger_1.logger.info(`Server path: ${serverPath}`);
-        logger_1.logger.info('The server will run in stdio mode for MCP client connections');
-        logger_1.logger.info('Press Ctrl+C to stop the server');
+        logger_1.uiLogger.info(en_1.commands.mcp.start.startingServer);
+        logger_1.uiLogger.info(en_1.commands.mcp.start.stopInstructions);
         // Start the server using ts-node
         const child = (0, child_process_1.spawn)('node', [serverPath], {
             stdio: 'inherit',
@@ -48,31 +48,27 @@ async function startMcpServer() {
         });
         // Handle server process events
         child.on('error', error => {
-            logger_1.logger.error(error);
-            logger_1.logger.error('Failed to start MCP server:', error.message);
+            (0, errorHandlers_1.logError)(error);
+            logger_1.uiLogger.error(en_1.commands.mcp.start.errors.failedToStart);
         });
-        child.on('close', code => {
-            if (code === 0) {
-                logger_1.logger.info('MCP server stopped gracefully');
-            }
-            else {
-                logger_1.logger.error(`MCP server exited with code ${code}`);
-            }
+        child.on('close', () => {
+            logger_1.uiLogger.info(en_1.commands.mcp.start.stoppedSuccessfully);
         });
         // Handle graceful shutdown
         process.on('SIGINT', () => {
-            logger_1.logger.info('Shutting down MCP server...');
+            logger_1.uiLogger.info(en_1.commands.mcp.start.shuttingDown);
             child.kill('SIGTERM');
-            process.exit(0);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         });
         process.on('SIGTERM', () => {
-            logger_1.logger.info('Shutting down MCP server...');
+            logger_1.uiLogger.info(en_1.commands.mcp.start.shuttingDown);
             child.kill('SIGTERM');
-            process.exit(0);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         });
     }
     catch (error) {
-        logger_1.logger.error('Error starting MCP server:', error);
+        logger_1.uiLogger.error(en_1.commands.mcp.start.errors.failedToStart);
+        (0, errorHandlers_1.logError)(error);
     }
 }
 exports.default = { command, describe, builder, handler };

package/commands/mcp.js

@@ -7,7 +7,8 @@ const start_1 = __importDefault(require("./mcp/start"));
 const setup_1 = __importDefault(require("./mcp/setup"));
 const yargsUtils_1 = require("../lib/yargsUtils");
 const command = 'mcp';
-const describe = 'Manage the Model Context Protocol server';
+// Leave this as undefined to hide the command
+const describe = undefined;
 function mcpBuilder(yargs) {
     yargs.command(start_1.default).command(setup_1.default).demandCommand(1, '');
     return yargs;

package/lang/en.d.ts

@@ -764,6 +764,57 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
         };
         readonly tailLogs: (functionPath: string, accountId: string) => string;
     };
+    readonly mcp: {
+        readonly setup: {
+            readonly installingDocSearch: "Adding the docs-search mcp server, please follow the prompt";
+            readonly claudeCode: "Claude Code";
+            readonly claudeDesktop: "Claude Desktop";
+            readonly cursor: "Cursor";
+            readonly windsurf: "Windsurf";
+            readonly args: {
+                readonly targets: "Target applications to configure";
+                readonly docsSearch: "Should the docs search mcp server be installed";
+            };
+            readonly success: (derivedTargets: string[]) => string;
+            readonly errors: {
+                readonly needsNode20: "This feature requires node >=20";
+            };
+            readonly spinners: {
+                readonly failedToConfigure: "Failed to configure the HubSpot mcp server.";
+                readonly configuringClaudeDesktop: "Configuring Claude Desktop...";
+                readonly configuredClaudeDesktop: "Configured Claude Desktop";
+                readonly configuringClaudeCode: "Configuring Claude Code...";
+                readonly configuredClaudeCode: "Configured Claude Code";
+                readonly claudeCodeNotFound: "Claude Code not found - skipping configuration";
+                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 configuredWindsurf: "Configured Windsurf";
+            };
+            readonly prompts: {
+                readonly targets: "[--targets] Which tools would you like to add the HubSpot CLI MCP server to?";
+                readonly targetsRequired: "Must choose at least one application to configure.";
+            };
+        };
+        readonly start: {
+            readonly errors: {
+                readonly needsNode20: "This feature requires node >=20";
+                readonly serverFileNotFound: (serverPath: string) => string;
+                readonly failedToStart: "Failed to start MCP server";
+            };
+            readonly startingServer: "Starting HubSpot CLI MCP server...";
+            readonly stopInstructions: "Press Ctrl+C to stop the server";
+            readonly stoppedSuccessfully: "Stopped successfully.";
+            readonly shuttingDown: "Shutting down MCP server...";
+        };
+    };
     readonly mv: {
         readonly describe: "Move a remote file or folder in HubSpot. This feature is currently in beta and the CLI contract is subject to change.";
         readonly errors: {

package/lang/en.js

@@ -776,6 +776,57 @@ exports.commands = {
         },
         tailLogs: (functionPath, accountId) => `Waiting for log entries for "${functionPath}" on account "${accountId}".\n`,
     },
+    mcp: {
+        setup: {
+            installingDocSearch: 'Adding the docs-search mcp server, please follow the prompt',
+            claudeCode: 'Claude Code',
+            claudeDesktop: 'Claude Desktop',
+            cursor: 'Cursor',
+            windsurf: 'Windsurf',
+            args: {
+                targets: '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')}.`,
+            errors: {
+                needsNode20: `This feature requires node >=20`,
+            },
+            spinners: {
+                failedToConfigure: 'Failed to configure the HubSpot mcp server.',
+                configuringClaudeDesktop: 'Configuring Claude Desktop...',
+                configuredClaudeDesktop: 'Configured Claude Desktop',
+                configuringClaudeCode: 'Configuring Claude Code...',
+                configuredClaudeCode: 'Configured Claude Code',
+                claudeCodeNotFound: 'Claude Code not found - skipping configuration',
+                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',
+                configuredWindsurf: 'Configured Windsurf',
+            },
+            prompts: {
+                targets: '[--targets] Which tools would you like to add the HubSpot CLI MCP server to?',
+                targetsRequired: 'Must choose at least one application to configure.',
+            },
+        },
+        start: {
+            errors: {
+                needsNode20: `This feature requires node >=20`,
+                serverFileNotFound: (serverPath) => `MCP server file not found at ${serverPath}`,
+                failedToStart: 'Failed to start MCP server',
+            },
+            startingServer: 'Starting HubSpot CLI MCP server...',
+            stopInstructions: 'Press Ctrl+C to stop the server',
+            stoppedSuccessfully: 'Stopped successfully.',
+            shuttingDown: 'Shutting down MCP server...',
+        },
+    },
     mv: {
         describe: 'Move a remote file or folder in HubSpot. This feature is currently in beta and the CLI contract is subject to change.',
         errors: {

package/lib/middleware/configMiddleware.js

@@ -40,6 +40,7 @@ async function injectAccountIdMiddleware(argv) {
 const SKIP_CONFIG_VALIDATION = {
     init: { target: true },
     auth: { target: true },
+    mcp: { target: true },
 };
 async function loadConfigMiddleware(argv) {
     // Skip this when no command is provided

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

@@ -9,7 +9,9 @@ const constants_2 = require("./constants");
 const project_1 = require("../../utils/project");
 const inputSchema = {
     absoluteProjectPath: constants_2.absoluteProjectPath,
-    addApp: zod_1.z.boolean().describe('Would you like to add an app?'),
+    addApp: zod_1.z
+        .boolean()
+        .describe('Should an app be added?  If there is no app in the project, and app must be added to add a feature'),
     distribution: zod_1.z
         .optional(zod_1.z.union([
         zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE),

package/package.json

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