@hubspot/cli 8.0.8-experimental.5 → 8.0.8-experimental.6

package/commands/mcp/__tests__/start.test.js

@@ -7,20 +7,14 @@ import * as errorHandlers from '../../../lib/errorHandlers/index.js';
 import * as usageTrackingLib from '../../../lib/usageTracking.js';
 import * as processLib from '../../../lib/process.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-// Create a mock execAsync function before importing the module
-const execAsyncMock = vi.fn();
+import startCommand from '../start.js';
 vi.mock('yargs');
 vi.mock('../../../lib/commonOpts');
 vi.mock('node:child_process');
-vi.mock('node:util', () => ({
-    promisify: vi.fn(() => execAsyncMock),
-}));
 vi.mock('fs');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/errorHandlers/index.js');
 vi.mock('../../../lib/process.js');
-// Import after mocks are set up
-const startCommand = await import('../start.js').then(m => m.default);
 const spawnSpy = vi.mocked(spawn);
 const existsSyncSpy = vi.spyOn(fs, 'existsSync');
 const trackCommandUsageSpy = vi.spyOn(usageTrackingLib, 'trackCommandUsage');
@@ -42,7 +36,6 @@ describe('commands/mcp/start', () => {
         processExitSpy.mockImplementation(() => { });
         // Mock config to prevent reading actual config file in CI
         getConfigAccountIfExistsSpy.mockReturnValue(undefined);
-        execAsyncMock.mockClear();
     });
     describe('command', () => {
         it('should have the correct command structure', () => {

package/commands/mcp/start.js

@@ -28,6 +28,7 @@ async function startMcpServer(aiAgent) {
         uiLogger.debug(commands.mcp.start.startingServer);
         uiLogger.debug(commands.mcp.start.stopInstructions);
         const args = [serverPath];
+        // Start the server using ts-node
         const child = spawn(`node`, args, {
             stdio: 'inherit',
             env: {

package/lang/en.d.ts

@@ -1295,8 +1295,6 @@ export declare const commands: {
             prompts: {
                 targets: string;
                 targetsRequired: string;
-                standaloneMode: string;
-                cliVersion: string;
             };
         };
         start: {

package/lang/en.js

@@ -1311,8 +1311,6 @@ export const commands = {
             prompts: {
                 targets: '[--client] Which tools would you like to add the HubSpot CLI MCP server to?',
                 targetsRequired: 'Must choose at least one app to configure.',
-                standaloneMode: 'Do you want to run in standalone mode? (This will use npx @hubspot/cli instead of the installed hs command)',
-                cliVersion: 'Specify a CLI version to pin (leave blank for latest):',
             },
         },
         start: {

package/lib/mcp/__tests__/setup.test.js

@@ -132,21 +132,6 @@ describe('lib/mcp/setup', () => {
             });
             expect(mockedLogError).toHaveBeenCalledWith(error);
         });
-        it('should pass through environment variables in command', async () => {
-            const mockMcpCommandWithEnv = {
-                command: 'test-command',
-                args: ['--arg1'],
-                env: { HUBSPOT_MCP_STANDALONE: 'true' },
-            };
-            mockedExecAsync.mockResolvedValueOnce({
-                stdout: 'codex version 1.0.0',
-                stderr: '',
-            });
-            mockedExecAsync.mockResolvedValueOnce({ stdout: '', stderr: '' });
-            const result = await setupCodex(mockMcpCommandWithEnv);
-            expect(result).toBe(true);
-            expect(mockedExecAsync).toHaveBeenCalledWith('codex mcp add "HubSpotDev" --env HUBSPOT_MCP_STANDALONE=true -- test-command --arg1 --ai-agent codex');
-        });
     });
     describe('setupGemini', () => {
         const mockMcpCommand = {

package/lib/mcp/setup.d.ts

@@ -5,7 +5,6 @@ export declare const supportedTools: {
 interface McpCommand {
     command: string;
     args: string[];
-    env?: Record<string, string>;
 }
 export declare function addMcpServerToConfig(targets: string[] | undefined): Promise<string[]>;
 export declare function setupVsCode(mcpCommand?: McpCommand): Promise<boolean>;

package/lib/mcp/setup.js

@@ -47,56 +47,23 @@ export async function addMcpServerToConfig(targets) {
         else {
             derivedTargets = targets;
         }
-        // Prompt for standalone mode
-        const { useStandaloneMode } = await promptUser({
-            name: 'useStandaloneMode',
-            type: 'confirm',
-            message: commands.mcp.setup.prompts.standaloneMode,
-            default: false,
-        });
-        const { cliVersion } = useStandaloneMode
-            ? await promptUser({
-                name: 'cliVersion',
-                type: 'input',
-                message: commands.mcp.setup.prompts.cliVersion,
-                validate: (v) => !v || /^[\d]+\.[\d]+\.[\d]+([-+][\w.]+)?$/.test(v.trim())
-                    ? true
-                    : 'Please enter a valid semver version (e.g. 8.0.1) or leave blank for latest.',
-            })
-            : { cliVersion: '' };
-        const cliPackage = cliVersion
-            ? `@hubspot/cli@${cliVersion}`
-            : '@hubspot/cli';
-        const standaloneEnv = {
-            HUBSPOT_MCP_STANDALONE: 'true',
-        };
-        if (cliVersion) {
-            standaloneEnv.HUBSPOT_CLI_VERSION = cliVersion;
-        }
-        const mcpCommand = useStandaloneMode
-            ? {
-                command: 'npx',
-                args: ['-y', '-p', cliPackage, 'hs', 'mcp', 'start'],
-                env: standaloneEnv,
-            }
-            : defaultMcpCommand;
         if (derivedTargets.includes(claudeCode)) {
-            await runSetupFunction(() => setupClaudeCode(mcpCommand));
+            await runSetupFunction(setupClaudeCode);
         }
         if (derivedTargets.includes(cursor)) {
-            await runSetupFunction(() => setupCursor(mcpCommand));
+            await runSetupFunction(setupCursor);
         }
         if (derivedTargets.includes(windsurf)) {
-            await runSetupFunction(() => setupWindsurf(mcpCommand));
+            await runSetupFunction(setupWindsurf);
         }
         if (derivedTargets.includes(vscode)) {
-            await runSetupFunction(() => setupVsCode(mcpCommand));
+            await runSetupFunction(setupVsCode);
         }
         if (derivedTargets.includes(codex)) {
-            await runSetupFunction(() => setupCodex(mcpCommand));
+            await runSetupFunction(setupCodex);
         }
         if (derivedTargets.includes(gemini)) {
-            await runSetupFunction(() => setupGemini(mcpCommand));
+            await runSetupFunction(setupGemini);
         }
         uiLogger.info(commands.mcp.setup.success(derivedTargets));
         return derivedTargets;
@@ -154,7 +121,10 @@ function setupMcpConfigFile(config) {
         if (!mcpConfig.mcpServers) {
             mcpConfig.mcpServers = {};
         }
-        mcpConfig.mcpServers[mcpServerName] = config.mcpCommand;
+        // Add or update HubSpot CLI MCP server
+        mcpConfig.mcpServers[mcpServerName] = {
+            ...config.mcpCommand,
+        };
         // Write the updated config
         fs.writeFileSync(config.configPath, JSON.stringify(mcpConfig, null, 2));
         SpinniesManager.succeed('spinner', {
@@ -175,12 +145,10 @@ export async function setupVsCode(mcpCommand = defaultMcpCommand) {
         SpinniesManager.add('vsCode', {
             text: commands.mcp.setup.spinners.configuringVsCode,
         });
-        const commandWithAgent = buildCommandWithAgentString(mcpCommand, vscode);
-        const configObject = {
+        const mcpConfig = JSON.stringify({
             name: mcpServerName,
-            ...commandWithAgent,
-        };
-        const mcpConfig = JSON.stringify(configObject);
+            ...buildCommandWithAgentString(mcpCommand, vscode),
+        });
         await execAsync(`code --add-mcp ${JSON.stringify(mcpConfig)}`);
         SpinniesManager.succeed('vsCode', {
             text: commands.mcp.setup.spinners.configuredVsCode,
@@ -204,27 +172,25 @@ export async function setupVsCode(mcpCommand = defaultMcpCommand) {
     }
 }
 export async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
-    SpinniesManager.add('claudeCode', {
-        text: commands.mcp.setup.spinners.configuringClaudeCode,
-    });
     try {
-        // Check if claude command is available
-        await execAsync('claude --version');
-    }
-    catch (e) {
-        SpinniesManager.fail('claudeCode', {
-            text: commands.mcp.setup.spinners.claudeCodeNotFound,
+        SpinniesManager.add('claudeCode', {
+            text: commands.mcp.setup.spinners.configuringClaudeCode,
         });
-        return false;
-    }
-    try {
+        try {
+            // Check if claude command is available
+            await execAsync('claude --version');
+        }
+        catch (e) {
+            SpinniesManager.fail('claudeCode', {
+                text: commands.mcp.setup.spinners.claudeCodeNotFound,
+            });
+            return false;
+        }
         // Run claude mcp add command
-        const commandWithAgent = buildCommandWithAgentString(mcpCommand, claudeCode);
-        const configObject = {
+        const mcpConfig = JSON.stringify({
             type: 'stdio',
-            ...commandWithAgent,
-        };
-        const mcpConfig = JSON.stringify(configObject);
+            ...buildCommandWithAgentString(mcpCommand, claudeCode),
+        });
         const { stdout } = await execAsync('claude mcp list');
         if (stdout.includes(mcpServerName)) {
             SpinniesManager.update('claudeCode', {
@@ -282,7 +248,7 @@ export async function setupCodex(mcpCommand = defaultMcpCommand) {
             return false;
         }
         const mcpCommandWithAgent = buildCommandWithAgentString(mcpCommand, codex);
-        await execAsync(`codex mcp add "${mcpServerName}"${buildEnvFlagString(mcpCommand)} -- ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}`);
+        await execAsync(`codex mcp add "${mcpServerName}" -- ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}`);
         SpinniesManager.succeed('codexSpinner', {
             text: commands.mcp.setup.spinners.configuredCodex,
         });
@@ -311,7 +277,7 @@ export async function setupGemini(mcpCommand = defaultMcpCommand) {
             return false;
         }
         const mcpCommandWithAgent = buildCommandWithAgentString(mcpCommand, gemini);
-        await execAsync(`gemini mcp add -s user${buildEnvFlagString(mcpCommand)} "${mcpServerName}" ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}`);
+        await execAsync(`gemini mcp add -s user "${mcpServerName}" ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}`);
         SpinniesManager.succeed('geminiSpinner', {
             text: commands.mcp.setup.spinners.configuredGemini,
         });
@@ -330,16 +296,3 @@ function buildCommandWithAgentString(mcpCommand, agent) {
     mcpCommandCopy.args.push('--ai-agent', agent);
     return mcpCommandCopy;
 }
-function buildEnvFlagString(mcpCommand) {
-    const envFlags = [];
-    if (mcpCommand.env) {
-        const env = Object.entries(mcpCommand.env);
-        env.forEach(([key, value]) => {
-            envFlags.push(`--env ${key}=${value}`);
-        });
-    }
-    if (envFlags.length === 0) {
-        return '';
-    }
-    return ` ${envFlags.join(' ')}`;
-}

package/mcp-server/tools/cms/HsCreateFunctionTool.js

@@ -1,7 +1,7 @@
 import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { addFlag } from '../../utils/command.js';

package/mcp-server/tools/cms/HsCreateModuleTool.js

@@ -1,7 +1,7 @@
 import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { addFlag } from '../../utils/command.js';

package/mcp-server/tools/cms/HsCreateTemplateTool.js

@@ -1,7 +1,7 @@
 import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { addFlag } from '../../utils/command.js';

package/mcp-server/tools/cms/HsFunctionLogsTool.js

@@ -2,7 +2,7 @@ import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { addFlag } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';

package/mcp-server/tools/cms/HsListFunctionsTool.js

@@ -2,7 +2,7 @@ import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { addFlag } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';

package/mcp-server/tools/cms/HsListTool.js

@@ -2,7 +2,7 @@ import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { addFlag } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';

package/mcp-server/tools/cms/__tests__/HsCreateFunctionTool.test.js

@@ -1,10 +1,11 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsCreateFunctionTool } from '../HsCreateFunctionTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

package/mcp-server/tools/cms/__tests__/HsCreateModuleTool.test.js

@@ -1,11 +1,11 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsCreateModuleTool } from '../HsCreateModuleTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

package/mcp-server/tools/cms/__tests__/HsCreateTemplateTool.test.js

@@ -1,11 +1,11 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsCreateTemplateTool } from '../HsCreateTemplateTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

package/mcp-server/tools/cms/__tests__/HsFunctionLogsTool.test.js

@@ -1,11 +1,11 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsFunctionLogsTool } from '../HsFunctionLogsTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

package/mcp-server/tools/cms/__tests__/HsListFunctionsTool.test.js

@@ -1,11 +1,11 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsListFunctionsTool } from '../HsListFunctionsTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

package/mcp-server/tools/cms/__tests__/HsListTool.test.js

@@ -1,11 +1,11 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsListTool } from '../HsListTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

package/mcp-server/tools/project/AddFeatureToProjectTool.d.ts

@@ -17,8 +17,8 @@ declare const inputSchemaZodObject: z.ZodObject<{
         card: "card";
         settings: "settings";
         "app-event": "app-event";
-        page: "page";
         "workflow-action-tool": "workflow-action-tool";
+        page: "page";
         webhooks: "webhooks";
         "workflow-action": "workflow-action";
         "app-function": "app-function";

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

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, } from '../../../lib/constants.js';
 import { addFlag } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, features, } from './constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';

package/mcp-server/tools/project/CreateProjectTool.d.ts

@@ -21,8 +21,8 @@ declare const inputSchemaZodObject: z.ZodObject<{
         card: "card";
         settings: "settings";
         "app-event": "app-event";
-        page: "page";
         "workflow-action-tool": "workflow-action-tool";
+        page: "page";
         webhooks: "webhooks";
         "workflow-action": "workflow-action";
         "app-function": "app-function";

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

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, EMPTY_PROJECT, PROJECT_WITH_APP, } from '../../../lib/constants.js';
 import { addFlag } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory, features } from './constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';

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

@@ -3,7 +3,7 @@ import fs from 'fs';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { addFlag } from '../../utils/command.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { ACCOUNT_LEVELS, ACCOUNT_LEVEL_CHOICES, } from '../../../lib/constants.js';
 import { Tool } from '../../types.js';
 import { absoluteCurrentWorkingDirectory } from './constants.js';

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

@@ -2,7 +2,7 @@ import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { addFlag } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';

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

@@ -3,7 +3,7 @@ import z from 'zod';
 import { getAllHsProfiles } from '@hubspot/project-parsing-lib/profiles';
 import { getProjectConfig } from '../../../lib/projects/config.js';
 import { Tool } from '../../types.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
 import { formatTextContent, formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';

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

@@ -1,7 +1,7 @@
 import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';

package/mcp-server/tools/project/__tests__/AddFeatureToProjectTool.test.js

@@ -1,11 +1,11 @@
 import { AddFeatureToProjectTool, } from '../AddFeatureToProjectTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, } from '../../../../lib/constants.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../../lib/constants');
 vi.mock('../../../utils/toolUsageTracking');

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

@@ -1,11 +1,11 @@
 import { CreateProjectTool, } from '../CreateProjectTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { APP_DISTRIBUTION_TYPES, EMPTY_PROJECT, PROJECT_WITH_APP, } from '../../../../lib/constants.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../../lib/constants');
 vi.mock('../../../../lib/projects/create/v2');

package/mcp-server/tools/project/__tests__/CreateTestAccountTool.test.js

@@ -1,12 +1,12 @@
 import { CreateTestAccountTool, } from '../CreateTestAccountTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 import fs from 'fs';
 import * as config from '@hubspot/local-dev-lib/config';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

package/mcp-server/tools/project/__tests__/DeployProjectTool.test.js

@@ -1,10 +1,10 @@
 import { DeployProjectTool } from '../DeployProjectTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

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

@@ -1,21 +1,13 @@
 import { UploadProjectTools } from '../UploadProjectTools.js';
 import { getAllHsProfiles } from '@hubspot/project-parsing-lib/profiles';
 import { getProjectConfig } from '../../../../lib/projects/config.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('@hubspot/project-parsing-lib/profiles');
 vi.mock('../../../../lib/projects/config.js');
-vi.mock('../../../utils/command', () => ({
-    runCommandInDir: vi.fn(),
-    addFlag: vi.fn((command, flagName, value) => {
-        if (Array.isArray(value)) {
-            return `${command} --${flagName} ${value.map(item => `"${item}"`).join(' ')}`;
-        }
-        return `${command} --${flagName} "${value}"`;
-    }),
-}));
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
 const mockTrackToolUsage = trackToolUsage;

package/mcp-server/tools/project/__tests__/ValidateProjectTool.test.js

@@ -1,9 +1,9 @@
 import { ValidateProjectTool, } from '../ValidateProjectTool.js';
-import { runCommandInDir } from '../../../utils/command.js';
+import { runCommandInDir } from '../../../utils/project.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 import { trackToolUsage } from '../../../utils/toolUsageTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
-vi.mock('../../../utils/command');
+vi.mock('../../../utils/project');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
 const mockTrackToolUsage = trackToolUsage;

package/mcp-server/tools/project/constants.d.ts

@@ -5,8 +5,8 @@ export declare const features: z.ZodOptional<z.ZodArray<z.ZodEnum<{
     card: "card";
     settings: "settings";
     "app-event": "app-event";
-    page: "page";
     "workflow-action-tool": "workflow-action-tool";
+    page: "page";
     webhooks: "webhooks";
     "workflow-action": "workflow-action";
     "app-function": "app-function";

package/mcp-server/utils/__tests__/command.test.js

@@ -1,20 +1,6 @@
-import fs from 'fs';
-import path from 'path';
-const mockExecAsync = vi.fn();
-vi.mock('node:child_process');
-vi.mock('util', () => ({
-    default: {
-        promisify: () => mockExecAsync,
-    },
-    promisify: () => mockExecAsync,
-}));
-vi.mock('fs');
-vi.mock('path');
-// Import after mocks are set up
-const { addFlag, runCommandInDir } = await import('../command.js');
-const mockExistsSync = vi.mocked(fs.existsSync);
-const mockMkdirSync = vi.mocked(fs.mkdirSync);
-const mockResolve = vi.mocked(path.resolve);
+import { addFlag } from '../command.js';
+vi.mock('child_process');
+vi.mock('util');
 describe('mcp-server/utils/command', () => {
     describe('addFlag', () => {
         it('should add string flag to command', () => {
@@ -56,220 +42,4 @@ describe('mcp-server/utils/command', () => {
             expect(result).toBe('hs project create --features "card with spaces" "settings"');
         });
     });
-    describe('runCommandInDir', () => {
-        const mockDirectory = '/test/directory';
-        const mockCommand = 'npm install';
-        const mockResolvedPath = '/resolved/test/directory';
-        beforeEach(() => {
-            mockResolve.mockReturnValue(mockResolvedPath);
-        });
-        it('should run command in existing directory', async () => {
-            const expectedResult = {
-                stdout: 'command output',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            const result = await runCommandInDir(mockDirectory, mockCommand);
-            expect(mockExistsSync).toHaveBeenCalledWith(mockDirectory);
-            expect(mockMkdirSync).not.toHaveBeenCalled();
-            expect(mockResolve).toHaveBeenCalledWith(mockDirectory);
-            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-            expect(result).toEqual(expectedResult);
-        });
-        it('should create directory if it does not exist', async () => {
-            const expectedResult = {
-                stdout: 'command output',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(false);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            const result = await runCommandInDir(mockDirectory, mockCommand);
-            expect(mockExistsSync).toHaveBeenCalledWith(mockDirectory);
-            expect(mockMkdirSync).toHaveBeenCalledWith(mockDirectory);
-            expect(mockResolve).toHaveBeenCalledWith(mockDirectory);
-            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-            expect(result).toEqual(expectedResult);
-        });
-        it('should propagate execAsync errors', async () => {
-            const error = new Error('Command failed');
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockRejectedValue(error);
-            await expect(runCommandInDir(mockDirectory, mockCommand)).rejects.toThrow('Command failed');
-            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-        it('should handle stderr in results', async () => {
-            const expectedResult = {
-                stdout: 'some output',
-                stderr: 'warning message',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            const result = await runCommandInDir(mockDirectory, mockCommand);
-            expect(result.stdout).toBe('some output');
-            expect(result.stderr).toBe('warning message');
-        });
-        it('should add --disable-usage-tracking flag to hs commands', async () => {
-            const hsCommand = 'hs project upload';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('hs project upload --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-        it('should not add --disable-usage-tracking flag to non-hs commands', async () => {
-            const nonHsCommand = 'npm install';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, nonHsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('npm install', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-        it('should add --disable-usage-tracking flag to hs commands with existing flags', async () => {
-            const hsCommand = 'hs project upload --profile prod';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('hs project upload --profile prod --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-        it('should handle hs commands that start with whitespace', async () => {
-            const hsCommand = 'hs init';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('hs init --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-        });
-        it('should use npx -p @hubspot/cli when HUBSPOT_MCP_STANDALONE is true', async () => {
-            const originalEnv = process.env.HUBSPOT_MCP_STANDALONE;
-            process.env.HUBSPOT_MCP_STANDALONE = 'true';
-            const hsCommand = 'hs project upload';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('npx -y -p @hubspot/cli hs project upload --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-            // Restore original env
-            if (originalEnv === undefined) {
-                delete process.env.HUBSPOT_MCP_STANDALONE;
-            }
-            else {
-                process.env.HUBSPOT_MCP_STANDALONE = originalEnv;
-            }
-        });
-        it('should use regular hs command when HUBSPOT_MCP_STANDALONE is not set', async () => {
-            const originalEnv = process.env.HUBSPOT_MCP_STANDALONE;
-            delete process.env.HUBSPOT_MCP_STANDALONE;
-            const hsCommand = 'hs project upload';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('hs project upload --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-            // Restore original env
-            if (originalEnv !== undefined) {
-                process.env.HUBSPOT_MCP_STANDALONE = originalEnv;
-            }
-        });
-        it('should use npx -p @hubspot/cli for hs commands with flags in standalone mode', async () => {
-            const originalEnv = process.env.HUBSPOT_MCP_STANDALONE;
-            process.env.HUBSPOT_MCP_STANDALONE = 'true';
-            const hsCommand = 'hs project upload --profile prod';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('npx -y -p @hubspot/cli hs project upload --profile prod --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-            // Restore original env
-            if (originalEnv === undefined) {
-                delete process.env.HUBSPOT_MCP_STANDALONE;
-            }
-            else {
-                process.env.HUBSPOT_MCP_STANDALONE = originalEnv;
-            }
-        });
-        it('should use pinned CLI version when HUBSPOT_CLI_VERSION is set in standalone mode', async () => {
-            const originalStandaloneEnv = process.env.HUBSPOT_MCP_STANDALONE;
-            const originalVersionEnv = process.env.HUBSPOT_CLI_VERSION;
-            process.env.HUBSPOT_MCP_STANDALONE = 'true';
-            process.env.HUBSPOT_CLI_VERSION = '8.1.0';
-            const hsCommand = 'hs project upload';
-            const expectedResult = {
-                stdout: 'success',
-                stderr: '',
-            };
-            mockExistsSync.mockReturnValue(true);
-            mockExecAsync.mockResolvedValue(expectedResult);
-            await runCommandInDir(mockDirectory, hsCommand);
-            expect(mockExecAsync).toHaveBeenCalledWith('npx -y -p @hubspot/cli@8.1.0 hs project upload --disable-usage-tracking "true"', expect.objectContaining({
-                cwd: mockResolvedPath,
-                env: expect.any(Object),
-            }));
-            // Restore original env
-            if (originalStandaloneEnv === undefined) {
-                delete process.env.HUBSPOT_MCP_STANDALONE;
-            }
-            else {
-                process.env.HUBSPOT_MCP_STANDALONE = originalStandaloneEnv;
-            }
-            if (originalVersionEnv === undefined) {
-                delete process.env.HUBSPOT_CLI_VERSION;
-            }
-            else {
-                process.env.HUBSPOT_CLI_VERSION = originalVersionEnv;
-            }
-        });
-    });
 });

package/mcp-server/utils/__tests__/project.test.d.ts

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

package/mcp-server/utils/__tests__/project.test.js

@@ -0,0 +1,140 @@
+import { runCommandInDir } from '../project.js';
+import { execAsync } from '../command.js';
+import fs from 'fs';
+import path from 'path';
+vi.mock('../command', () => ({
+    execAsync: vi.fn(),
+    addFlag: vi.fn((command, flagName, value) => {
+        if (Array.isArray(value)) {
+            return `${command} --${flagName} ${value.map(item => `"${item}"`).join(' ')}`;
+        }
+        return `${command} --${flagName} "${value}"`;
+    }),
+}));
+vi.mock('fs');
+vi.mock('path');
+const mockExecAsync = execAsync;
+const mockExistsSync = fs.existsSync;
+const mockMkdirSync = fs.mkdirSync;
+const mockResolve = path.resolve;
+describe('mcp-server/utils/project', () => {
+    describe('runCommandInDir', () => {
+        const mockDirectory = '/test/directory';
+        const mockCommand = 'npm install';
+        const mockResolvedPath = '/resolved/test/directory';
+        beforeEach(() => {
+            mockResolve.mockReturnValue(mockResolvedPath);
+        });
+        it('should run command in existing directory', async () => {
+            const expectedResult = {
+                stdout: 'command output',
+                stderr: '',
+            };
+            mockExistsSync.mockReturnValue(true);
+            mockExecAsync.mockResolvedValue(expectedResult);
+            const result = await runCommandInDir(mockDirectory, mockCommand);
+            expect(mockExistsSync).toHaveBeenCalledWith(mockDirectory);
+            expect(mockMkdirSync).not.toHaveBeenCalled();
+            expect(mockResolve).toHaveBeenCalledWith(mockDirectory);
+            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
+                cwd: mockResolvedPath,
+                env: expect.any(Object),
+            }));
+            expect(result).toEqual(expectedResult);
+        });
+        it('should create directory if it does not exist', async () => {
+            const expectedResult = {
+                stdout: 'command output',
+                stderr: '',
+            };
+            mockExistsSync.mockReturnValue(false);
+            mockExecAsync.mockResolvedValue(expectedResult);
+            const result = await runCommandInDir(mockDirectory, mockCommand);
+            expect(mockExistsSync).toHaveBeenCalledWith(mockDirectory);
+            expect(mockMkdirSync).toHaveBeenCalledWith(mockDirectory);
+            expect(mockResolve).toHaveBeenCalledWith(mockDirectory);
+            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
+                cwd: mockResolvedPath,
+                env: expect.any(Object),
+            }));
+            expect(result).toEqual(expectedResult);
+        });
+        it('should propagate execAsync errors', async () => {
+            const error = new Error('Command failed');
+            mockExistsSync.mockReturnValue(true);
+            mockExecAsync.mockRejectedValue(error);
+            await expect(runCommandInDir(mockDirectory, mockCommand)).rejects.toThrow('Command failed');
+            expect(mockExecAsync).toHaveBeenCalledWith(mockCommand, expect.objectContaining({
+                cwd: mockResolvedPath,
+                env: expect.any(Object),
+            }));
+        });
+        it('should handle stderr in results', async () => {
+            const expectedResult = {
+                stdout: 'some output',
+                stderr: 'warning message',
+            };
+            mockExistsSync.mockReturnValue(true);
+            mockExecAsync.mockResolvedValue(expectedResult);
+            const result = await runCommandInDir(mockDirectory, mockCommand);
+            expect(result.stdout).toBe('some output');
+            expect(result.stderr).toBe('warning message');
+        });
+        it('should add --disable-usage-tracking flag to hs commands', async () => {
+            const hsCommand = 'hs project upload';
+            const expectedResult = {
+                stdout: 'success',
+                stderr: '',
+            };
+            mockExistsSync.mockReturnValue(true);
+            mockExecAsync.mockResolvedValue(expectedResult);
+            await runCommandInDir(mockDirectory, hsCommand);
+            expect(mockExecAsync).toHaveBeenCalledWith('hs project upload --disable-usage-tracking "true"', expect.objectContaining({
+                cwd: mockResolvedPath,
+                env: expect.any(Object),
+            }));
+        });
+        it('should not add --disable-usage-tracking flag to non-hs commands', async () => {
+            const nonHsCommand = 'npm install';
+            const expectedResult = {
+                stdout: 'success',
+                stderr: '',
+            };
+            mockExistsSync.mockReturnValue(true);
+            mockExecAsync.mockResolvedValue(expectedResult);
+            await runCommandInDir(mockDirectory, nonHsCommand);
+            expect(mockExecAsync).toHaveBeenCalledWith('npm install', expect.objectContaining({
+                cwd: mockResolvedPath,
+                env: expect.any(Object),
+            }));
+        });
+        it('should add --disable-usage-tracking flag to hs commands with existing flags', async () => {
+            const hsCommand = 'hs project upload --profile prod';
+            const expectedResult = {
+                stdout: 'success',
+                stderr: '',
+            };
+            mockExistsSync.mockReturnValue(true);
+            mockExecAsync.mockResolvedValue(expectedResult);
+            await runCommandInDir(mockDirectory, hsCommand);
+            expect(mockExecAsync).toHaveBeenCalledWith('hs project upload --profile prod --disable-usage-tracking "true"', expect.objectContaining({
+                cwd: mockResolvedPath,
+                env: expect.any(Object),
+            }));
+        });
+        it('should handle hs commands that start with whitespace', async () => {
+            const hsCommand = 'hs init';
+            const expectedResult = {
+                stdout: 'success',
+                stderr: '',
+            };
+            mockExistsSync.mockReturnValue(true);
+            mockExecAsync.mockResolvedValue(expectedResult);
+            await runCommandInDir(mockDirectory, hsCommand);
+            expect(mockExecAsync).toHaveBeenCalledWith('hs init --disable-usage-tracking "true"', expect.objectContaining({
+                cwd: mockResolvedPath,
+                env: expect.any(Object),
+            }));
+        });
+    });
+});

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

@@ -1,8 +1,3 @@
 import { exec } from 'node:child_process';
 export declare const execAsync: typeof exec.__promisify__;
 export declare function addFlag(command: string, flagName: string, value: string | number | boolean | string[]): string;
-export interface CommandResults {
-    stderr: string;
-    stdout: string;
-}
-export declare function runCommandInDir(directory: string, command: string): Promise<CommandResults>;

package/mcp-server/utils/command.js

@@ -1,5 +1,3 @@
-import path from 'path';
-import fs from 'fs';
 import util from 'util';
 import { exec } from 'node:child_process';
 export const execAsync = util.promisify(exec);
@@ -9,25 +7,3 @@ export function addFlag(command, flagName, value) {
     }
     return `${command} --${flagName} "${value}"`;
 }
-export async function runCommandInDir(directory, command) {
-    if (!fs.existsSync(directory)) {
-        fs.mkdirSync(directory);
-    }
-    let finalCommand = command;
-    if (command.startsWith('hs ')) {
-        // Check if running in standalone mode
-        if (process.env.HUBSPOT_MCP_STANDALONE === 'true') {
-            const cliPackage = process.env.HUBSPOT_CLI_VERSION
-                ? `@hubspot/cli@${process.env.HUBSPOT_CLI_VERSION}`
-                : '@hubspot/cli';
-            finalCommand = command.replace(/^hs /, `npx -y -p ${cliPackage} hs `);
-        }
-        finalCommand = addFlag(finalCommand, 'disable-usage-tracking', true);
-    }
-    return execAsync(finalCommand, {
-        cwd: path.resolve(directory),
-        env: {
-            ...process.env,
-        },
-    });
-}

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

@@ -0,0 +1,5 @@
+export interface CommandResults {
+    stderr: string;
+    stdout: string;
+}
+export declare function runCommandInDir(directory: string, command: string): Promise<CommandResults>;

package/mcp-server/utils/project.js

@@ -0,0 +1,18 @@
+import { addFlag, execAsync } from './command.js';
+import path from 'path';
+import fs from 'fs';
+export async function runCommandInDir(directory, command) {
+    if (!fs.existsSync(directory)) {
+        fs.mkdirSync(directory);
+    }
+    let finalCommand = command;
+    if (command.startsWith('hs ')) {
+        finalCommand = addFlag(finalCommand, 'disable-usage-tracking', true);
+    }
+    return execAsync(finalCommand, {
+        cwd: path.resolve(directory),
+        env: {
+            ...process.env,
+        },
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.0.8-experimental.5",
+    "version": "8.0.8-experimental.6",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -8,7 +8,7 @@
     "dependencies": {
         "@hubspot/cms-dev-server": "1.2.16",
         "@hubspot/local-dev-lib": "5.1.1",
-        "@hubspot/project-parsing-lib": "0.12.0",
+        "@hubspot/project-parsing-lib": "0.2.0-experimental.1",
         "@hubspot/serverless-dev-runtime": "7.0.7",
         "@hubspot/ui-extensions-dev-server": "1.1.8",
         "@inquirer/prompts": "7.1.0",