@hubspot/cli 7.7.15-experimental.0 → 7.7.16-experimental.0

package/commands/mcp/setup.d.ts

@@ -1,13 +1,7 @@
-import { ArgumentsCamelCase, Argv } from 'yargs';
+import { YargsCommandModule } from '../../types/Yargs';
 interface MCPSetupArgs {
     client?: string[];
     addDocsSearch?: boolean;
 }
-declare function handler(args: ArgumentsCamelCase<MCPSetupArgs>): Promise<void>;
-declare const _default: {
-    command: string[];
-    describe: undefined;
-    builder: (yargs: Argv) => Promise<Argv<{}>>;
-    handler: typeof handler;
-};
-export default _default;
+declare const mcpSetupCommand: YargsCommandModule<unknown, MCPSetupArgs>;
+export default mcpSetupCommand;

package/commands/mcp/setup.js

@@ -1,50 +1,12 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const util_1 = require("util");
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-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 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 setup_1 = require("../../lib/mcp/setup");
 const command = ['setup', 'update'];
 const describe = undefined; // Leave hidden for now
-const execAsync = (0, util_1.promisify)(child_process_1.exec);
-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: 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('client', {
-        describe: en_1.commands.mcp.setup.args.client,
-        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(args) {
     try {
         await import('@modelcontextprotocol/sdk/server/mcp.js');
@@ -53,192 +15,36 @@ async function handler(args) {
         logger_1.uiLogger.error(en_1.commands.mcp.setup.errors.needsNode20);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    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 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 => {
-                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 {
-        let derivedTargets = [];
-        if (!targets || targets.length === 0) {
-            const { selectedTargets } = await (0, promptUtils_1.promptUser)({
-                name: 'selectedTargets',
-                type: 'checkbox',
-                message: en_1.commands.mcp.setup.prompts.targets,
-                choices: supportedTools,
-                validate: (choices) => {
-                    return choices.length === 0
-                        ? en_1.commands.mcp.setup.prompts.targetsRequired
-                        : true;
-                },
-            });
-            derivedTargets = selectedTargets;
-        }
-        else {
-            derivedTargets = targets;
-        }
-        SpinniesManager_1.default.init();
-        if (derivedTargets.includes(claudeCode)) {
-            await runSetupFunction(setupClaudeCode);
-        }
-        if (derivedTargets.includes(cursor)) {
-            await runSetupFunction(setupCursor);
+        const derivedTargets = await (0, setup_1.addMcpServerToConfig)(args.client);
+        if (args.addDocsSearch) {
+            await (0, setup_1.addMintlifyMcpServer)(derivedTargets);
         }
-        if (derivedTargets.includes(windsurf)) {
-            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) {
-    const result = await func();
-    if (!result) {
+    catch (e) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function setupMcpConfigFile(config) {
-    try {
-        SpinniesManager_1.default.add('spinner', {
-            text: config.configuringMessage,
-        });
-        if (!fs_1.default.existsSync(config.configPath)) {
-            SpinniesManager_1.default.succeed('spinner', {
-                text: config.configMissingMessage ||
-                    `Config file not found at ${config.configPath}`,
-            });
-            return false;
-        }
-        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 (!mcpConfig.mcpServers) {
-            mcpConfig.mcpServers = {};
-        }
-        // Add or update HubSpot CLI MCP server
-        mcpConfig.mcpServers[mcpServerName] = {
-            command: hsCommand,
-            args: mcpCommandArgs,
-        };
-        // Write the updated config
-        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('spinner', {
-            text: config.failedMessage,
-        });
-        (0, errorHandlers_1.logError)(error);
-        return false;
-    }
-}
-async function setupClaudeCode() {
-    try {
-        SpinniesManager_1.default.add('claudeCode', {
-            text: en_1.commands.mcp.setup.spinners.configuringClaudeCode,
-        });
-        try {
-            // Check if claude command is available
-            await execAsync('claude --version');
-            // Run claude mcp add command
-            const mcpConfig = JSON.stringify({
-                type: 'stdio',
-                command: hsCommand,
-                args: mcpCommandArgs,
-            });
-            const { stdout } = await execAsync('claude mcp list');
-            if (stdout.includes(mcpServerName)) {
-                SpinniesManager_1.default.update('claudeCode', {
-                    text: en_1.commands.mcp.setup.spinners.alreadyInstalled,
-                });
-                await execAsync(`claude mcp remove "${mcpServerName}" --scope user`);
-            }
-            await execAsync(`claude mcp add-json "${mcpServerName}" '${mcpConfig}' --scope user`);
-            SpinniesManager_1.default.succeed('claudeCode', {
-                text: en_1.commands.mcp.setup.spinners.configuredClaudeCode,
-            });
-            return true;
-        }
-        catch (error) {
-            if (error instanceof Error &&
-                error.message.includes('claude: command not found')) {
-                SpinniesManager_1.default.fail('claudeCode', {
-                    text: en_1.commands.mcp.setup.spinners.claudeCodeNotFound,
-                });
-            }
-            else {
-                SpinniesManager_1.default.fail('claudeCode', {
-                    text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
-                });
-                (0, errorHandlers_1.logError)(error);
-            }
-            return false;
-        }
-    }
-    catch (error) {
-        SpinniesManager_1.default.fail('claudeCode', {
-            text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
-        });
-        (0, errorHandlers_1.logError)(error);
-        return false;
-    }
-}
-function setupCursor() {
-    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() {
-    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),
+function setupBuilder(yargs) {
+    yargs
+        .option('client', {
+        describe: en_1.commands.mcp.setup.args.client,
+        type: 'array',
+        choices: [...setup_1.supportedTools.map(tool => tool.value)],
+    })
+        .option('add-docs-search', {
+        type: 'boolean',
     });
+    return yargs;
 }
-exports.default = { command, describe, builder, handler };
+const builder = (0, yargsUtils_1.makeYargsBuilder)(setupBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const mcpSetupCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = mcpSetupCommand;

package/commands/mcp/start.d.ts

@@ -1,9 +1,3 @@
-import { Argv } from 'yargs';
-declare function handler(): Promise<void>;
-declare const _default: {
-    command: string;
-    describe: undefined;
-    builder: (yargs: Argv) => Promise<Argv<{}>>;
-    handler: typeof handler;
-};
-export default _default;
+import { YargsCommandModule } from '../../types/Yargs';
+declare const mcpStartCommand: YargsCommandModule<unknown, unknown>;
+export default mcpStartCommand;

package/commands/mcp/start.js

@@ -11,14 +11,9 @@ 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 process_1 = require("../../lib/process");
 const command = 'start';
 const describe = undefined; // Leave hidden for now
-function startBuilder(yargs) {
-    return yargs;
-}
-const builder = (0, yargsUtils_1.makeYargsBuilder)(startBuilder, command, describe, {
-    useGlobalOptions: true,
-});
 async function handler() {
     try {
         await import('@modelcontextprotocol/sdk/server/mcp.js');
@@ -54,13 +49,7 @@ async function startMcpServer() {
         child.on('close', () => {
             logger_1.uiLogger.info(en_1.commands.mcp.start.stoppedSuccessfully);
         });
-        // Handle graceful shutdown
-        process.on('SIGINT', () => {
-            logger_1.uiLogger.info(en_1.commands.mcp.start.shuttingDown);
-            child.kill('SIGTERM');
-            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
-        });
-        process.on('SIGTERM', () => {
+        (0, process_1.handleExit)(() => {
             logger_1.uiLogger.info(en_1.commands.mcp.start.shuttingDown);
             child.kill('SIGTERM');
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
@@ -71,4 +60,16 @@ async function startMcpServer() {
         (0, errorHandlers_1.logError)(error);
     }
 }
-exports.default = { command, describe, builder, handler };
+function startBuilder(yargs) {
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(startBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const mcpStartCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = mcpStartCommand;

package/commands/mcp.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const start_1 = __importDefault(require("./mcp/start"));
 const setup_1 = __importDefault(require("./mcp/setup"));
 const yargsUtils_1 = require("../lib/yargsUtils");
+const en_1 = require("../lang/en");
 const command = 'mcp';
 // Leave this as undefined to hide the command
 const describe = undefined;
@@ -13,7 +14,7 @@ function mcpBuilder(yargs) {
     yargs.command(start_1.default).command(setup_1.default).demandCommand(1, '');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(mcpBuilder, command, describe, {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(mcpBuilder, command, en_1.commands.mcp.describe, {
     useGlobalOptions: true,
 });
 const mcpCommand = {

package/lang/en.d.ts

@@ -765,6 +765,7 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
         readonly tailLogs: (functionPath: string, accountId: string) => string;
     };
     readonly mcp: {
+        readonly describe: "Commands for managing HubSpot MCP servers";
         readonly setup: {
             readonly installingDocSearch: "Adding the docs-search mcp server";
             readonly claudeCode: "Claude Code";

package/lang/en.js

@@ -777,6 +777,7 @@ exports.commands = {
         tailLogs: (functionPath, accountId) => `Waiting for log entries for "${functionPath}" on account "${accountId}".\n`,
     },
     mcp: {
+        describe: 'Commands for managing HubSpot MCP servers',
         setup: {
             installingDocSearch: 'Adding the docs-search mcp server',
             claudeCode: 'Claude Code',

package/lib/mcp/setup.d.ts

@@ -0,0 +1,12 @@
+export declare const supportedTools: ({
+    name: "Claude Code";
+    value: string;
+} | {
+    name: "Cursor";
+    value: string;
+} | {
+    name: "Windsurf";
+    value: string;
+})[];
+export declare function addMintlifyMcpServer(installTargets: string[]): Promise<void>;
+export declare function addMcpServerToConfig(targets: string[] | undefined): Promise<string[]>;

package/lib/mcp/setup.js

@@ -0,0 +1,216 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.supportedTools = void 0;
+exports.addMintlifyMcpServer = addMintlifyMcpServer;
+exports.addMcpServerToConfig = addMcpServerToConfig;
+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 path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const mcpServerName = 'hubspot-cli-mcp';
+const claudeCode = 'claude';
+const windsurf = 'windsurf';
+const cursor = 'cursor';
+const supportedMintlifyClients = [windsurf, cursor];
+exports.supportedTools = [
+    { name: en_1.commands.mcp.setup.claudeCode, value: claudeCode },
+    { 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'];
+async function addMintlifyMcpServer(installTargets) {
+    await runSetupFunction(() => setupMintlify(installTargets));
+}
+async function setupMintlify(derivedTargets) {
+    logger_1.uiLogger.info(en_1.commands.mcp.setup.installingDocSearch);
+    logger_1.uiLogger.log('');
+    return new Promise(resolve => {
+        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 => {
+            if (code !== 0) {
+                resolve(false);
+            }
+            resolve(true);
+        });
+    });
+}
+async function addMcpServerToConfig(targets) {
+    try {
+        let derivedTargets = [];
+        if (!targets || targets.length === 0) {
+            const { selectedTargets } = await (0, promptUtils_1.promptUser)({
+                name: 'selectedTargets',
+                type: 'checkbox',
+                message: en_1.commands.mcp.setup.prompts.targets,
+                choices: exports.supportedTools,
+                validate: (choices) => {
+                    return choices.length === 0
+                        ? en_1.commands.mcp.setup.prompts.targetsRequired
+                        : true;
+                },
+            });
+            derivedTargets = selectedTargets;
+        }
+        else {
+            derivedTargets = targets;
+        }
+        SpinniesManager_1.default.init();
+        if (derivedTargets.includes(claudeCode)) {
+            await runSetupFunction(setupClaudeCode);
+        }
+        if (derivedTargets.includes(cursor)) {
+            await runSetupFunction(setupCursor);
+        }
+        if (derivedTargets.includes(windsurf)) {
+            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,
+        });
+        throw error;
+    }
+}
+async function runSetupFunction(func) {
+    const result = await func();
+    if (!result) {
+        throw new Error();
+    }
+}
+function setupMcpConfigFile(config) {
+    try {
+        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;
+        }
+        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 (!mcpConfig.mcpServers) {
+            mcpConfig.mcpServers = {};
+        }
+        // Add or update HubSpot CLI MCP server
+        mcpConfig.mcpServers[mcpServerName] = {
+            command: hsCommand,
+            args: mcpCommandArgs,
+        };
+        // Write the updated config
+        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('spinner', {
+            text: config.failedMessage,
+        });
+        (0, errorHandlers_1.logError)(error);
+        return false;
+    }
+}
+async function setupClaudeCode() {
+    try {
+        SpinniesManager_1.default.add('claudeCode', {
+            text: en_1.commands.mcp.setup.spinners.configuringClaudeCode,
+        });
+        try {
+            // Check if claude command is available
+            await (0, command_1.execAsync)('claude --version');
+            // Run claude mcp add command
+            const mcpConfig = JSON.stringify({
+                type: 'stdio',
+                command: hsCommand,
+                args: mcpCommandArgs,
+            });
+            const { stdout } = await (0, command_1.execAsync)('claude mcp list');
+            if (stdout.includes(mcpServerName)) {
+                SpinniesManager_1.default.update('claudeCode', {
+                    text: en_1.commands.mcp.setup.spinners.alreadyInstalled,
+                });
+                await (0, command_1.execAsync)(`claude mcp remove "${mcpServerName}" --scope user`);
+            }
+            await (0, command_1.execAsync)(`claude mcp add-json "${mcpServerName}" '${mcpConfig}' --scope user`);
+            SpinniesManager_1.default.succeed('claudeCode', {
+                text: en_1.commands.mcp.setup.spinners.configuredClaudeCode,
+            });
+            return true;
+        }
+        catch (error) {
+            if (error instanceof Error &&
+                error.message.includes('claude: command not found')) {
+                SpinniesManager_1.default.fail('claudeCode', {
+                    text: en_1.commands.mcp.setup.spinners.claudeCodeNotFound,
+                });
+            }
+            else {
+                SpinniesManager_1.default.fail('claudeCode', {
+                    text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
+                });
+                (0, errorHandlers_1.logError)(error);
+            }
+            return false;
+        }
+    }
+    catch (error) {
+        SpinniesManager_1.default.fail('claudeCode', {
+            text: en_1.commands.mcp.setup.spinners.claudeCodeInstallFailed,
+        });
+        (0, errorHandlers_1.logError)(error);
+        return false;
+    }
+}
+function setupCursor() {
+    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() {
+    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),
+    });
+}

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

@@ -7,11 +7,12 @@ const constants_1 = require("../../../lib/constants");
 const command_1 = require("../../utils/command");
 const constants_2 = require("./constants");
 const project_1 = require("../../utils/project");
+const content_1 = require("../../utils/content");
 const inputSchema = {
     absoluteProjectPath: constants_2.absoluteProjectPath,
     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'),
+        .describe('Should an app be added?  If there is no app in the project, an 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),
@@ -51,19 +52,13 @@ class AddFeatureToProject extends types_1.Tool {
                 command = (0, command_1.addFlag)(command, 'distribution', distribution);
             }
             else if (addApp) {
-                content.push({
-                    type: 'text',
-                    text: `Ask the user how they would you like to distribute the application? Options are ${constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${constants_1.APP_DISTRIBUTION_TYPES.PRIVATE}`,
-                });
+                content.push((0, content_1.formatTextContent)(`Ask the user how they would you like to distribute the application. Options are ${constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${constants_1.APP_DISTRIBUTION_TYPES.PRIVATE}`));
             }
             if (auth) {
                 command = (0, command_1.addFlag)(command, 'auth', auth);
             }
             else if (addApp) {
-                content.push({
-                    type: 'text',
-                    text: `Ask the user which auth type they would like to use? Options are ${constants_1.APP_AUTH_TYPES.STATIC} and ${constants_1.APP_AUTH_TYPES.OAUTH}`,
-                });
+                content.push((0, content_1.formatTextContent)(`Ask the user which auth type they would like to use. Options are ${constants_1.APP_AUTH_TYPES.STATIC} and ${constants_1.APP_AUTH_TYPES.OAUTH}`));
             }
             if (content.length > 0) {
                 return {
@@ -73,28 +68,10 @@ class AddFeatureToProject extends types_1.Tool {
             // If features isn't provided, pass an empty array to bypass the prompt
             command = (0, command_1.addFlag)(command, 'features', features || []);
             const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, command);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: stdout,
-                    },
-                    {
-                        type: 'text',
-                        text: stderr,
-                    },
-                ],
-            };
+            return (0, content_1.formatTextContents)(stdout, stderr);
         }
         catch (error) {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: error instanceof Error ? error.message : `${error}`,
-                    },
-                ],
-            };
+            return (0, content_1.formatTextContents)(error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

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

@@ -8,6 +8,7 @@ const command_1 = require("../../utils/command");
 const v3_1 = require("../../../lib/projects/create/v3");
 const constants_2 = require("./constants");
 const project_1 = require("../../utils/project");
+const content_1 = require("../../utils/content");
 const inputSchema = {
     absoluteCurrentWorkingDirectory: constants_2.absoluteCurrentWorkingDirectory,
     name: zod_1.z
@@ -15,10 +16,10 @@ const inputSchema = {
         .describe('The name of the project to be created.  This name is how your project will appear in HubSpot.'),
     destination: zod_1.z
         .string()
-        .describe('Relative path to the directory the project will be created in. It is not recommended to use the current directory unless it is an empty directory'),
+        .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.'),
     projectBase: zod_1.z
         .union([zod_1.z.literal(v3_1.EMPTY_PROJECT), zod_1.z.literal(v3_1.PROJECT_WITH_APP)])
-        .describe('Empty will create and empty project, and app will create a project with an app inside of it.'),
+        .describe('Empty will create an empty project, and app will create a project with an app inside of it.'),
     distribution: zod_1.z
         .optional(zod_1.z.union([
         zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE),
@@ -65,19 +66,13 @@ class CreateProjectTool extends types_1.Tool {
             command = (0, command_1.addFlag)(command, 'distribution', distribution);
         }
         else if (projectBase === v3_1.PROJECT_WITH_APP) {
-            content.push({
-                type: 'text',
-                text: `Ask the user how they would you like to distribute the application? Options are ${constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${constants_1.APP_DISTRIBUTION_TYPES.PRIVATE}`,
-            });
+            content.push((0, content_1.formatTextContent)(`Ask the user how they would you like to distribute the application? Options are ${constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${constants_1.APP_DISTRIBUTION_TYPES.PRIVATE}`));
         }
         if (auth) {
             command = (0, command_1.addFlag)(command, 'auth', auth);
         }
         else if (projectBase === v3_1.PROJECT_WITH_APP) {
-            content.push({
-                type: 'text',
-                text: `Ask the user which auth type they would like to use? Options are ${constants_1.APP_AUTH_TYPES.STATIC} and ${constants_1.APP_AUTH_TYPES.OAUTH}`,
-            });
+            content.push((0, content_1.formatTextContent)(`Ask the user which auth type they would like to use? Options are ${constants_1.APP_AUTH_TYPES.STATIC} and ${constants_1.APP_AUTH_TYPES.OAUTH}`));
         }
         if (content.length > 0) {
             return {
@@ -88,28 +83,10 @@ class CreateProjectTool extends types_1.Tool {
         command = (0, command_1.addFlag)(command, 'features', features || []);
         try {
             const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteCurrentWorkingDirectory, command);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: stdout,
-                    },
-                    {
-                        type: 'text',
-                        text: stderr,
-                    },
-                ],
-            };
+            return (0, content_1.formatTextContents)(stdout, stderr);
         }
         catch (error) {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: error instanceof Error ? error.message : `${error}`,
-                    },
-                ],
-            };
+            return (0, content_1.formatTextContents)(error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

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

@@ -6,6 +6,7 @@ const zod_1 = require("zod");
 const command_1 = require("../../utils/command");
 const constants_1 = require("./constants");
 const project_1 = require("../../utils/project");
+const content_1 = require("../../utils/content");
 const inputSchema = {
     absoluteProjectPath: constants_1.absoluteProjectPath,
     buildNumber: zod_1.z
@@ -25,10 +26,7 @@ class DeployProject extends types_1.Tool {
         const content = [];
         if (!buildNumber) {
             const { stdout } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project list-builds --limit 100`);
-            content.push({
-                type: 'text',
-                text: `Ask the user which build number they would like to deploy?  Build information: ${stdout}`,
-            });
+            content.push((0, content_1.formatTextContent)(`Ask the user which build number they would like to deploy?  Build information: ${stdout}`));
         }
         else {
             command = (0, command_1.addFlag)(command, 'build', buildNumber);
@@ -39,12 +37,7 @@ class DeployProject extends types_1.Tool {
             };
         }
         const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, command);
-        return {
-            content: [
-                { type: 'text', text: stdout },
-                { type: 'text', text: stderr },
-            ],
-        };
+        return (0, content_1.formatTextContents)(stdout, stderr);
     }
     register() {
         return this.mcpServer.registerTool('deploy-hubspot-project', {

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

@@ -4,6 +4,7 @@ exports.GuidedWalkthroughTool = void 0;
 const types_1 = require("../../types");
 const zod_1 = require("zod");
 const command_1 = require("../../utils/command");
+const content_1 = require("../../utils/content");
 const nextCommands = {
     'hs init': 'hs auth',
     'hs auth': 'hs project create',
@@ -32,23 +33,9 @@ class GuidedWalkthroughTool extends types_1.Tool {
     async handler({ command }) {
         if (command) {
             const { stdout } = await (0, command_1.execAsync)(`${command} --help`);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: `Display this help output for the user amd wait for them to acknowledge: ${stdout}. ${nextCommands[command] ? `Once they are ready, A good command to look at next is ${nextCommands[command]}` : ''}`,
-                    },
-                ],
-            };
+            return (0, content_1.formatTextContents)(`Display this help output for the user amd wait for them to acknowledge: ${stdout}. ${nextCommands[command] ? `Once they are ready, A good command to look at next is ${nextCommands[command]}` : ''}`);
         }
-        return {
-            content: [
-                {
-                    type: 'text',
-                    text: 'Is there another command you would like to learn more about?',
-                },
-            ],
-        };
+        return (0, content_1.formatTextContents)('Is there another command you would like to learn more about?');
     }
     register() {
         return this.mcpServer.registerTool('guided-walkthrough-hubspot-cli', {

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

@@ -8,6 +8,7 @@ const types_1 = require("../../types");
 const project_1 = require("../../utils/project");
 const constants_1 = require("./constants");
 const zod_1 = __importDefault(require("zod"));
+const content_1 = require("../../utils/content");
 const inputSchema = {
     absoluteProjectPath: constants_1.absoluteProjectPath,
 };
@@ -21,12 +22,7 @@ class UploadProjectTools extends types_1.Tool {
     }
     async handler({ absoluteProjectPath, }) {
         const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project upload --force-create`);
-        return {
-            content: [
-                { type: 'text', text: stdout },
-                { type: 'text', text: stderr },
-            ],
-        };
+        return (0, content_1.formatTextContents)(stdout, stderr);
     }
     register() {
         return this.mcpServer.registerTool('upload-hubspot-project', {

package/mcp-server/utils/content.d.ts

@@ -0,0 +1,3 @@
+import { TextContent, TextContentResponse } from '../types';
+export declare function formatTextContents(...outputs: (string | undefined)[]): TextContentResponse;
+export declare function formatTextContent(text: string): TextContent;

package/mcp-server/utils/content.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatTextContents = formatTextContents;
+exports.formatTextContent = formatTextContent;
+function formatTextContents(...outputs) {
+    const content = [];
+    outputs.forEach(output => {
+        if (output !== undefined) {
+            content.push(formatTextContent(output));
+        }
+    });
+    return {
+        content,
+    };
+}
+function formatTextContent(text) {
+    return {
+        type: 'text',
+        text,
+    };
+}

package/package.json

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