@hubspot/cli 7.6.0-beta.3 → 7.6.0-beta.5

package/lib/mcp/setup.js

@@ -112,9 +112,9 @@ function setupMcpConfigFile(config) {
             fs_extra_1.default.writeFileSync(config.configPath, JSON.stringify({}, null, 2));
         }
         let mcpConfig = {};
+        let configContent;
         try {
-            const configContent = fs_extra_1.default.readFileSync(config.configPath, 'utf8');
-            mcpConfig = JSON.parse(configContent);
+            configContent = fs_extra_1.default.readFileSync(config.configPath, 'utf8');
         }
         catch (error) {
             SpinniesManager_1.default.fail('spinner', {
@@ -123,6 +123,22 @@ function setupMcpConfigFile(config) {
             (0, errorHandlers_1.logError)(error);
             return false;
         }
+        try {
+            // In the event the file exists, but is empty, initialize it to and empty object
+            if (configContent.trim() === '') {
+                mcpConfig = {};
+            }
+            else {
+                mcpConfig = JSON.parse(configContent);
+            }
+        }
+        catch (error) {
+            SpinniesManager_1.default.fail('spinner', {
+                text: config.failedMessage,
+            });
+            logger_1.uiLogger.error(en_1.commands.mcp.setup.errors.errorParsingJsonFIle(config.configPath, error instanceof Error ? error.message : `${error}`));
+            return false;
+        }
         // Initialize mcpServers if it doesn't exist
         if (!mcpConfig.mcpServers) {
             mcpConfig.mcpServers = {};
@@ -157,7 +173,7 @@ async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
             // Run claude mcp add command
             const mcpConfig = JSON.stringify({
                 type: 'stdio',
-                ...mcpCommand,
+                ...buildCommandWithAgentString(mcpCommand, claudeCode),
             });
             const { stdout } = await (0, command_1.execAsync)('claude mcp list');
             if (stdout.includes(mcpServerName)) {
@@ -203,7 +219,7 @@ function setupCursor(mcpCommand = defaultMcpCommand) {
         configuringMessage: en_1.commands.mcp.setup.spinners.configuringCursor,
         configuredMessage: en_1.commands.mcp.setup.spinners.configuredCursor,
         failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureCursor,
-        mcpCommand,
+        mcpCommand: buildCommandWithAgentString(mcpCommand, cursor),
     });
 }
 function setupWindsurf(mcpCommand = defaultMcpCommand) {
@@ -213,6 +229,11 @@ function setupWindsurf(mcpCommand = defaultMcpCommand) {
         configuringMessage: en_1.commands.mcp.setup.spinners.configuringWindsurf,
         configuredMessage: en_1.commands.mcp.setup.spinners.configuredWindsurf,
         failedMessage: en_1.commands.mcp.setup.spinners.failedToConfigureWindsurf,
-        mcpCommand,
+        mcpCommand: buildCommandWithAgentString(mcpCommand, windsurf),
     });
 }
+function buildCommandWithAgentString(mcpCommand, agent) {
+    const mcpCommandCopy = structuredClone(mcpCommand);
+    mcpCommandCopy.args.push('--ai-agent', agent);
+    return mcpCommandCopy;
+}

package/lib/middleware/__test__/configMiddleware.test.js

@@ -38,21 +38,21 @@ const cliConfig = __importStar(require("@hubspot/local-dev-lib/config"));
 const validation = __importStar(require("../../validation"));
 const exitCodes_1 = require("../../enums/exitCodes");
 const configMiddleware_1 = require("../configMiddleware");
-jest.mock('@hubspot/local-dev-lib/logger', () => ({
+vi.mock('@hubspot/local-dev-lib/logger', () => ({
     logger: {
-        error: jest.fn(),
-        log: jest.fn(),
+        error: vi.fn(),
+        log: vi.fn(),
     },
 }));
-jest.mock('@hubspot/local-dev-lib/config');
-jest.mock('../../validation');
-const validateAccountSpy = jest.spyOn(validation, 'validateAccount');
-const loadConfigSpy = jest.spyOn(cliConfig, 'loadConfig');
-const getAccountIdSpy = jest.spyOn(cliConfig, 'getAccountId');
-const configFileExistsSpy = jest.spyOn(cliConfig, 'configFileExists');
-const getConfigPathSpy = jest.spyOn(cliConfig, 'getConfigPath');
-const validateConfigSpy = jest.spyOn(cliConfig, 'validateConfig');
-const processExitSpy = jest.spyOn(process, 'exit');
+vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../validation');
+const validateAccountSpy = vi.spyOn(validation, 'validateAccount');
+const loadConfigSpy = vi.spyOn(cliConfig, 'loadConfig');
+const getAccountIdSpy = vi.spyOn(cliConfig, 'getAccountId');
+const configFileExistsSpy = vi.spyOn(cliConfig, 'configFileExists');
+const getConfigPathSpy = vi.spyOn(cliConfig, 'getConfigPath');
+const validateConfigSpy = vi.spyOn(cliConfig, 'validateConfig');
+const processExitSpy = vi.spyOn(process, 'exit');
 describe('lib/middleware/configMiddleware', () => {
     beforeEach(() => {
         processExitSpy.mockImplementation(code => {

package/lib/middleware/__test__/gitMiddleware.test.js

@@ -36,10 +36,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config = __importStar(require("@hubspot/local-dev-lib/config"));
 const gitUI = __importStar(require("../../ui/git"));
 const gitMiddleware_1 = require("../gitMiddleware");
-jest.mock('@hubspot/local-dev-lib/config');
-jest.mock('../../ui/git');
-const getConfigPathSpy = jest.spyOn(config, 'getConfigPath');
-const checkAndWarnGitInclusionSpy = jest.spyOn(gitUI, 'checkAndWarnGitInclusion');
+vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../ui/git');
+const getConfigPathSpy = vi.spyOn(config, 'getConfigPath');
+const checkAndWarnGitInclusionSpy = vi.spyOn(gitUI, 'checkAndWarnGitInclusion');
 describe('lib/middleware/gitMiddleware', () => {
     describe('checkAndWarnGitInclusionMiddleware()', () => {
         it('should call checkAndWarnGitInclusion when command is provided and config path exists', () => {

package/lib/middleware/__test__/notificationsMiddleware.test.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const { notifyAboutUpdates } = require('../notificationsMiddleware');
+const notificationsMiddleware_1 = require("../notificationsMiddleware");
 describe('lib/middleware/notificationsMiddleware', () => {
     describe('notifyAboutUpdates()', () => {
         it('should safely execute without throwing an error', () => {
-            expect(() => notifyAboutUpdates()).not.toThrow();
+            expect(() => (0, notificationsMiddleware_1.notifyAboutUpdates)()).not.toThrow();
         });
     });
 });

package/lib/middleware/__test__/requestMiddleware.test.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const http_1 = require("@hubspot/local-dev-lib/http");
 const requestMiddleware_1 = require("../requestMiddleware");
 const package_json_1 = __importDefault(require("../../../package.json"));
-jest.mock('@hubspot/local-dev-lib/http', () => ({
-    addUserAgentHeader: jest.fn(),
+vi.mock('@hubspot/local-dev-lib/http', () => ({
+    addUserAgentHeader: vi.fn(),
 }));
 describe('lib/middleware/requestMiddleware', () => {
     describe('setRequestHeaders()', () => {

package/lib/middleware/__test__/yargsChecksMiddleware.test.js

@@ -37,17 +37,17 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const exitCodes_1 = require("../../enums/exitCodes");
 const projectsConfig = __importStar(require("../../projects/config"));
 const yargsChecksMiddleware_1 = require("../yargsChecksMiddleware");
-jest.mock('@hubspot/local-dev-lib/logger', () => ({
+vi.mock('@hubspot/local-dev-lib/logger', () => ({
     logger: {
-        error: jest.fn(),
+        error: vi.fn(),
     },
 }));
-jest.mock('../../projects/config');
-jest.mock('../../lang', () => ({
-    i18n: jest.fn(key => key),
+vi.mock('../../projects/config');
+vi.mock('../../lang', () => ({
+    i18n: vi.fn(key => key),
 }));
-const getIsInProjectSpy = jest.spyOn(projectsConfig, 'getIsInProject');
-const processExitSpy = jest.spyOn(process, 'exit');
+const getIsInProjectSpy = vi.spyOn(projectsConfig, 'getIsInProject');
+const processExitSpy = vi.spyOn(process, 'exit');
 describe('lib/middleware/yargsChecksMiddleware', () => {
     beforeEach(() => {
         processExitSpy.mockImplementation(code => {

package/lib/middleware/notificationsMiddleware.js

@@ -1,38 +1,41 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.notifyAboutUpdates = notifyAboutUpdates;
 // Update-notifier is CommonJS, so we need to use require
 const updateNotifier = require('update-notifier');
-const chalk = require('chalk');
-const pkg = require('../../package.json');
-const { UI_COLORS, uiCommandReference } = require('../ui');
-const { i18n } = require('../lang');
+const chalk_1 = __importDefault(require("chalk"));
+const package_json_1 = __importDefault(require("../../package.json"));
+const ui_1 = require("../ui");
+const lang_1 = require("../lang");
 const notifier = updateNotifier({
-    pkg: { ...pkg, name: '@hubspot/cli' },
+    pkg: { ...package_json_1.default, name: '@hubspot/cli' },
     distTag: 'latest',
     shouldNotifyInNpmScript: true,
 });
 const CMS_CLI_PACKAGE_NAME = '@hubspot/cms-cli';
 function notifyAboutUpdates() {
     notifier.notify({
-        message: pkg.name === CMS_CLI_PACKAGE_NAME
-            ? i18n(`commands.generalErrors.updateNotify.cmsUpdateNotification`, {
+        message: package_json_1.default.name === CMS_CLI_PACKAGE_NAME
+            ? (0, lang_1.i18n)(`commands.generalErrors.updateNotify.cmsUpdateNotification`, {
                 packageName: CMS_CLI_PACKAGE_NAME,
-                updateCommand: uiCommandReference('{updateCommand}'),
+                updateCommand: (0, ui_1.uiCommandReference)('{updateCommand}'),
             })
-            : i18n(`commands.generalErrors.updateNotify.cliUpdateNotification`, {
-                updateCommand: uiCommandReference('{updateCommand}'),
+            : (0, lang_1.i18n)(`commands.generalErrors.updateNotify.cliUpdateNotification`, {
+                updateCommand: (0, ui_1.uiCommandReference)('{updateCommand}'),
             }),
         defer: false,
         boxenOptions: {
-            borderColor: UI_COLORS.MARIGOLD_DARK,
+            borderColor: ui_1.UI_COLORS.MARIGOLD_DARK,
             margin: 1,
             padding: 1,
             textAlignment: 'center',
             borderStyle: 'round',
-            title: pkg.name === CMS_CLI_PACKAGE_NAME
+            title: package_json_1.default.name === CMS_CLI_PACKAGE_NAME
                 ? null
-                : chalk.bold(i18n(`commands.generalErrors.updateNotify.notifyTitle`)),
+                : chalk_1.default.bold((0, lang_1.i18n)(`commands.generalErrors.updateNotify.notifyTitle`)),
         },
     });
 }

package/lib/projects/__tests__/AppDevModeInterface.test.d.ts

@@ -0,0 +1 @@
+export {};