@hubspot/cli 8.0.8-experimental.1 → 8.0.8-experimental.2

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

@@ -7,14 +7,20 @@ 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';
-import startCommand from '../start.js';
+// Create a mock execAsync function before importing the module
+const execAsyncMock = vi.fn();
 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');
@@ -36,6 +42,7 @@ 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,7 +28,6 @@ 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

@@ -43,6 +43,11 @@ export declare const commands: {
             checkOutConfig: (configPath: string) => string;
             pressEnterToInstall: (accountName: string) => string;
             pressKeyToExit: string;
+            installingApp: (appName: string, accountName: string) => string;
+            installInstructions: string;
+            browserFailedToOpen: (url: string) => string;
+            pollingTimeout: (minutes: number) => string;
+            pressEnterToContinueSetup: string;
             prompts: {
                 selectOptionV2: string;
                 options: {
@@ -1290,6 +1295,8 @@ export declare const commands: {
             prompts: {
                 targets: string;
                 targetsRequired: string;
+                standaloneMode: string;
+                cliVersion: string;
             };
         };
         start: {

package/lang/en.js

@@ -51,6 +51,11 @@ export const commands = {
             checkOutConfig: (configPath) => `Check out ${chalk.cyan(configPath)} for the full configuration.`,
             pressEnterToInstall: (accountName) => `? Press ${chalk.bold('<enter>')} to continue installing and previewing this app in ${chalk.bold(accountName)}`,
             pressKeyToExit: `Press any key to exit...`,
+            installingApp: (appName, accountName) => `Installing ${chalk.bold(appName)} in ${chalk.bold(accountName)}...`,
+            installInstructions: `We'll take you to your HubSpot account and walk you through installing your app.`,
+            browserFailedToOpen: (url) => `⚠️  Failed to open browser automatically. Please open this URL manually:\n${chalk.cyan(url)}`,
+            pollingTimeout: (minutes) => `⚠️  Installation polling timed out after ${minutes} minutes. The app may still be installing in the background.`,
+            pressEnterToContinueSetup: `Press ${chalk.bold('<enter>')} to continue with card setup...`,
             prompts: {
                 selectOptionV2: 'Choose a component type to get started',
                 options: {
@@ -1306,6 +1311,8 @@ 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: {
@@ -3076,7 +3083,7 @@ export const lib = {
             updateSucceeded: (latestVersion) => `Successfully updated HubSpot CLI to version ${chalk.bold(latestVersion)}`,
             notInstalledGlobally: 'Cannot auto-update the HubSpot CLI because NPM is not installed globally',
             updateFailed: (latestVersion) => `Failed to update HubSpot CLI to version ${chalk.bold(latestVersion)}`,
-            enableAutoUpdatesMessage: `The HubSpot CLI can automatically keep itself up to date.\n\nThis helps ensure compatibility with the HubSpot platform. You can change this later at any time.\n\nRun${uiCommandReference('hs config set --allow-auto-updates=true')}`,
+            enableAutoUpdatesMessage: `The HubSpot CLI can automatically keep itself up to date.\n\nThis helps ensure compatibility with the HubSpot platform. You can change this later at any time.\n\nRun ${uiCommandReference('hs config set --allow-auto-updates=true')}`,
         },
     },
     projectProfiles: {

package/lib/getStartedV2Actions.d.ts

@@ -35,3 +35,16 @@ export declare function uploadAndDeployAction({ accountId, projectDest, }: {
     projectDest: string;
 }): Promise<UploadAndDeployResult>;
 export declare function trackGetStartedUsage(params: Record<string, unknown>, accountId: number): Promise<void>;
+export type PollAppInstallationOptions = {
+    accountId: number;
+    projectId: number;
+    appUid: string;
+    requiredScopes?: string[];
+    optionalScopes?: string[];
+    timeoutMs?: number;
+    intervalMs?: number;
+    onTimeout?: () => void;
+};
+export declare function pollAppInstallation({ accountId, projectId, appUid, requiredScopes, optionalScopes, timeoutMs, // 2 minutes
+intervalMs, // 2 seconds
+onTimeout, }: PollAppInstallationOptions): Promise<void>;

package/lib/getStartedV2Actions.js

@@ -1,6 +1,7 @@
 import fs from 'fs-extra';
 import path from 'path';
 import { fetchPublicAppsForPortal } from '@hubspot/local-dev-lib/api/appsDev';
+import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { cloneGithubRepo } from '@hubspot/local-dev-lib/github';
@@ -144,3 +145,55 @@ export async function uploadAndDeployAction({ accountId, projectDest, }) {
 export function trackGetStartedUsage(params, accountId) {
     return trackCommandMetadataUsage('get-started', params, accountId);
 }
+export async function pollAppInstallation({ accountId, projectId, appUid, requiredScopes = [], optionalScopes = [], timeoutMs = 2 * 60 * 1000, // 2 minutes
+intervalMs = 2000, // 2 seconds
+onTimeout, }) {
+    return new Promise((resolve, reject) => {
+        let consecutiveErrors = 0;
+        const MAX_CONSECUTIVE_ERRORS = 5;
+        let pollInterval = null;
+        let pollTimeout = null;
+        const cleanup = () => {
+            if (pollInterval) {
+                clearTimeout(pollInterval);
+                pollInterval = null;
+            }
+            if (pollTimeout) {
+                clearTimeout(pollTimeout);
+                pollTimeout = null;
+            }
+        };
+        pollTimeout = setTimeout(() => {
+            cleanup();
+            if (onTimeout) {
+                onTimeout();
+            }
+            resolve(); // Resolve instead of reject to allow continuing with timeout state
+        }, timeoutMs);
+        const poll = async () => {
+            try {
+                const { data } = await fetchAppInstallationData(accountId, projectId, appUid, requiredScopes, optionalScopes);
+                // Reset error counter on successful fetch
+                consecutiveErrors = 0;
+                if (data.isInstalledWithScopeGroups) {
+                    cleanup();
+                    resolve();
+                }
+                else if (pollInterval) {
+                    pollInterval = setTimeout(poll, intervalMs);
+                }
+            }
+            catch (error) {
+                consecutiveErrors++;
+                if (consecutiveErrors >= MAX_CONSECUTIVE_ERRORS) {
+                    cleanup();
+                    reject(new Error(`Failed to check app installation status after ${MAX_CONSECUTIVE_ERRORS} consecutive errors`, { cause: error }));
+                }
+                else if (pollInterval !== null) {
+                    pollInterval = setTimeout(poll, intervalMs);
+                }
+            }
+        };
+        pollInterval = setTimeout(poll, 0);
+    });
+}

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

@@ -132,6 +132,21 @@ 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,6 +5,7 @@ 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,23 +47,56 @@ 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);
+            await runSetupFunction(() => setupClaudeCode(mcpCommand));
         }
         if (derivedTargets.includes(cursor)) {
-            await runSetupFunction(setupCursor);
+            await runSetupFunction(() => setupCursor(mcpCommand));
         }
         if (derivedTargets.includes(windsurf)) {
-            await runSetupFunction(setupWindsurf);
+            await runSetupFunction(() => setupWindsurf(mcpCommand));
         }
         if (derivedTargets.includes(vscode)) {
-            await runSetupFunction(setupVsCode);
+            await runSetupFunction(() => setupVsCode(mcpCommand));
         }
         if (derivedTargets.includes(codex)) {
-            await runSetupFunction(setupCodex);
+            await runSetupFunction(() => setupCodex(mcpCommand));
         }
         if (derivedTargets.includes(gemini)) {
-            await runSetupFunction(setupGemini);
+            await runSetupFunction(() => setupGemini(mcpCommand));
         }
         uiLogger.info(commands.mcp.setup.success(derivedTargets));
         return derivedTargets;
@@ -122,9 +155,14 @@ function setupMcpConfigFile(config) {
             mcpConfig.mcpServers = {};
         }
         // Add or update HubSpot CLI MCP server
-        mcpConfig.mcpServers[mcpServerName] = {
-            ...config.mcpCommand,
+        const serverConfig = {
+            command: config.mcpCommand.command,
+            args: config.mcpCommand.args,
         };
+        if (config.mcpCommand.env) {
+            serverConfig.env = config.mcpCommand.env;
+        }
+        mcpConfig.mcpServers[mcpServerName] = serverConfig;
         // Write the updated config
         fs.writeFileSync(config.configPath, JSON.stringify(mcpConfig, null, 2));
         SpinniesManager.succeed('spinner', {
@@ -145,10 +183,16 @@ export async function setupVsCode(mcpCommand = defaultMcpCommand) {
         SpinniesManager.add('vsCode', {
             text: commands.mcp.setup.spinners.configuringVsCode,
         });
-        const mcpConfig = JSON.stringify({
+        const commandWithAgent = buildCommandWithAgentString(mcpCommand, vscode);
+        const configObject = {
             name: mcpServerName,
-            ...buildCommandWithAgentString(mcpCommand, vscode),
-        });
+            command: commandWithAgent.command,
+            args: commandWithAgent.args,
+        };
+        if (commandWithAgent.env) {
+            configObject.env = commandWithAgent.env;
+        }
+        const mcpConfig = JSON.stringify(configObject);
         await execAsync(`code --add-mcp ${JSON.stringify(mcpConfig)}`);
         SpinniesManager.succeed('vsCode', {
             text: commands.mcp.setup.spinners.configuredVsCode,
@@ -179,30 +223,44 @@ export async function setupClaudeCode(mcpCommand = defaultMcpCommand) {
         try {
             // Check if claude command is available
             await execAsync('claude --version');
-        }
-        catch (e) {
-            SpinniesManager.fail('claudeCode', {
-                text: commands.mcp.setup.spinners.claudeCodeNotFound,
+            // Run claude mcp add command
+            const commandWithAgent = buildCommandWithAgentString(mcpCommand, claudeCode);
+            const configObject = {
+                type: 'stdio',
+                command: commandWithAgent.command,
+                args: commandWithAgent.args,
+            };
+            if (commandWithAgent.env) {
+                configObject.env = commandWithAgent.env;
+            }
+            const mcpConfig = JSON.stringify(configObject);
+            const { stdout } = await execAsync('claude mcp list');
+            if (stdout.includes(mcpServerName)) {
+                SpinniesManager.update('claudeCode', {
+                    text: commands.mcp.setup.spinners.alreadyInstalled,
+                });
+                await execAsync(`claude mcp remove "${mcpServerName}" --scope user`);
+            }
+            await execAsync(`claude mcp add-json "${mcpServerName}" ${JSON.stringify(mcpConfig)} --scope user`);
+            SpinniesManager.succeed('claudeCode', {
+                text: commands.mcp.setup.spinners.configuredClaudeCode,
             });
-            return false;
+            return true;
         }
-        // Run claude mcp add command
-        const mcpConfig = JSON.stringify({
-            type: 'stdio',
-            ...buildCommandWithAgentString(mcpCommand, claudeCode),
-        });
-        const { stdout } = await execAsync('claude mcp list');
-        if (stdout.includes(mcpServerName)) {
-            SpinniesManager.update('claudeCode', {
-                text: commands.mcp.setup.spinners.alreadyInstalled,
-            });
-            await execAsync(`claude mcp remove "${mcpServerName}" --scope user`);
+        catch (error) {
+            if (error instanceof Error && error.message.includes('claude')) {
+                SpinniesManager.fail('claudeCode', {
+                    text: commands.mcp.setup.spinners.claudeCodeNotFound,
+                });
+            }
+            else {
+                SpinniesManager.fail('claudeCode', {
+                    text: commands.mcp.setup.spinners.claudeCodeInstallFailed,
+                });
+                logError(error);
+            }
+            return false;
         }
-        await execAsync(`claude mcp add-json "${mcpServerName}" ${JSON.stringify(mcpConfig)} --scope user`);
-        SpinniesManager.succeed('claudeCode', {
-            text: commands.mcp.setup.spinners.configuredClaudeCode,
-        });
-        return true;
     }
     catch (error) {
         SpinniesManager.fail('claudeCode', {
@@ -248,7 +306,7 @@ export async function setupCodex(mcpCommand = defaultMcpCommand) {
             return false;
         }
         const mcpCommandWithAgent = buildCommandWithAgentString(mcpCommand, codex);
-        await execAsync(`codex mcp add "${mcpServerName}" -- ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}`);
+        await execAsync(`codex mcp add "${mcpServerName}"${buildEnvFlagString(mcpCommand)} -- ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}`);
         SpinniesManager.succeed('codexSpinner', {
             text: commands.mcp.setup.spinners.configuredCodex,
         });
@@ -277,7 +335,7 @@ export async function setupGemini(mcpCommand = defaultMcpCommand) {
             return false;
         }
         const mcpCommandWithAgent = buildCommandWithAgentString(mcpCommand, gemini);
-        await execAsync(`gemini mcp add -s user "${mcpServerName}" ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}`);
+        await execAsync(`gemini mcp add -s user${buildEnvFlagString(mcpCommand)} "${mcpServerName}" ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}`);
         SpinniesManager.succeed('geminiSpinner', {
             text: commands.mcp.setup.spinners.configuredGemini,
         });
@@ -296,3 +354,16 @@ 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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../utils/command.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,11 +1,10 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsCreateFunctionTool } from '../HsCreateFunctionTool.js';
-import { runCommandInDir } from '../../../utils/project.js';
+import { runCommandInDir } from '../../../utils/command.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/project.js';
+import { runCommandInDir } from '../../../utils/command.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/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/project.js';
+import { runCommandInDir } from '../../../utils/command.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/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/project.js';
+import { runCommandInDir } from '../../../utils/command.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/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/project.js';
+import { runCommandInDir } from '../../../utils/command.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/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/project.js';
+import { runCommandInDir } from '../../../utils/command.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/command');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

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/project.js';
+import { runCommandInDir } from '../../utils/command.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.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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../utils/command.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/project.js';
+import { runCommandInDir } from '../../../utils/command.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/project');
+vi.mock('../../../utils/command');
 vi.mock('../../../utils/command');
 vi.mock('../../../../lib/constants');
 vi.mock('../../../utils/toolUsageTracking');