@hubspot/cli 7.7.5-experimental.0 → 7.7.7-experimental.0

package/commands/mcp/setup.d.ts

@@ -6,7 +6,7 @@ declare function builder(yargs: Argv): Argv;
 declare function handler(argv: ArgumentsCamelCase<MCPSetupArgs>): Promise<void>;
 declare const _default: {
     command: string[];
-    describe: string;
+    describe: undefined;
     builder: typeof builder;
     handler: typeof handler;
 };

package/commands/mcp/setup.js

@@ -14,8 +14,7 @@ const exitCodes_1 = require("../../lib/enums/exitCodes");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const chalk_1 = __importDefault(require("chalk"));
 const command = ['setup', 'update'];
-const describe = 'Add or update MCP server configuration to claude and cursor';
-const mcpServerPath = path_1.default.join(os_1.default.homedir(), 'src', 'hubspot-cli', 'dist', 'mcp-server', 'server.js');
+const describe = undefined;
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 const supportedTools = [
     { name: 'Claude', value: 'claude' },
@@ -31,6 +30,14 @@ function builder(yargs) {
     return yargs;
 }
 async function handler(argv) {
+    const mcpsdk = '@modelcontextprotocol/sdk';
+    try {
+        await import(mcpsdk);
+    }
+    catch (e) {
+        logger_1.logger.error(`This feature requires the ${mcpsdk} dependency to be installed, which requires node >=20`);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     await addMcpServerToConfig(argv.targets);
 }
 exports.default = { command, describe, builder, handler };
@@ -108,9 +115,8 @@ async function setupClaudeDesktop() {
         }
         // Add or update HubSpot CLI MCP server
         config.mcpServers['hubspot-cli-mcp'] = {
-            // TODO: Before merging, change these to `hs mcp start` and do a test publish
-            command: 'node',
-            args: [mcpServerPath],
+            command: 'hs',
+            args: ['mcp', 'start'],
         };
         // Write the updated config
         fs_1.default.writeFileSync(configPath, JSON.stringify(config, null, 2));
@@ -138,22 +144,15 @@ async function setupClaudeCode() {
             // Run claude mcp add command
             const mcpConfig = JSON.stringify({
                 type: 'stdio',
-                // TODO: Before merging, change these to `hs mcp start` and do a test publish
-                command: 'node',
-                args: [mcpServerPath],
+                command: 'hs',
+                args: ['mcp', 'start'],
             });
             const { stdout } = await execAsync('claude mcp list');
             if (stdout.includes('hubspot-cli-mcp')) {
                 SpinniesManager_1.default.update('claudeCode', {
                     text: 'CLI mcp server already installed, reinstalling',
                 });
-                try {
-                    await execAsync('claude mcp remove "hubspot-cli-mcp" --scope user');
-                }
-                catch (error) {
-                    // @ts-ignore
-                    logger_1.logger.warn(error.stderr);
-                }
+                await execAsync('claude mcp remove "hubspot-cli-mcp" --scope user');
             }
             await execAsync(`claude mcp add-json "hubspot-cli-mcp" '${mcpConfig}' --scope user`);
             SpinniesManager_1.default.succeed('claudeCode', {
@@ -216,9 +215,8 @@ async function setupCursor() {
         }
         // Add or update HubSpot CLI MCP server
         config.mcpServers['hubspot-cli-mcp'] = {
-            // TODO: Before merging, change these to `hs mcp start` and do a test publish
-            command: 'node',
-            args: [mcpServerPath],
+            command: 'hs',
+            args: ['mcp', 'start'],
         };
         // Write the updated config
         fs_1.default.writeFileSync(cursorConfigPath, JSON.stringify(config, null, 2));

package/commands/mcp/start.js

@@ -7,12 +7,21 @@ 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 command = 'start';
 const describe = undefined; // Keep this command hidden, doesn't seem useful to expose
 function builder(yargs) {
     return yargs;
 }
 async function handler() {
+    const mcpsdk = '@modelcontextprotocol/sdk';
+    try {
+        await import(mcpsdk);
+    }
+    catch (e) {
+        logger_1.logger.error(`This feature requires the ${mcpsdk} dependency to be installed, which requires node >=20`);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     await startMcpServer();
 }
 exports.default = { command, describe, builder, handler };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.5-experimental.0",
+    "version": "7.7.7-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -10,7 +10,6 @@
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.9.2",
-        "@modelcontextprotocol/sdk": "1.13.3",
         "archiver": "7.0.1",
         "boxen": "8.0.1",
         "chalk": "4.1.2",
@@ -62,7 +61,8 @@
         "typescript": "^5.6.2"
     },
     "optionalDependencies": {
-        "@hubspot/cms-dev-server": "^1.0.9"
+        "@hubspot/cms-dev-server": "^1.0.9",
+        "@modelcontextprotocol/sdk": "1.13.3"
     },
     "scripts": {
         "build": "ts-node ./scripts/build.ts",