@hubspot/cli 8.0.5-experimental.0 → 8.0.7-experimental.0

package/commands/cms/__tests__/upload.test.js

@@ -8,7 +8,6 @@ import * as modulesLib from '@hubspot/local-dev-lib/cms/modules';
 import * as ignoreRulesLib from '@hubspot/local-dev-lib/ignoreRules';
 import * as themesLib from '@hubspot/local-dev-lib/cms/themes';
 import * as configLib from '@hubspot/local-dev-lib/config';
-import * as handleFieldsJSLib from '@hubspot/local-dev-lib/cms/handleFieldsJS';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import * as errorHandlers from '../../../lib/errorHandlers/index.js';
 import * as commonOpts from '../../../lib/commonOpts.js';
@@ -27,7 +26,6 @@ vi.mock('@hubspot/local-dev-lib/cms/modules');
 vi.mock('@hubspot/local-dev-lib/ignoreRules');
 vi.mock('@hubspot/local-dev-lib/cms/themes');
 vi.mock('@hubspot/local-dev-lib/config');
-vi.mock('@hubspot/local-dev-lib/cms/handleFieldsJS');
 vi.mock('../../../lib/errorHandlers/index.js');
 vi.mock('../../../lib/commonOpts.js');
 vi.mock('../../../lib/prompts/uploadPrompt.js');
@@ -55,7 +53,6 @@ const hasUploadErrorsSpy = vi.spyOn(uploadFolderLib, 'hasUploadErrors');
 const processExitSpy = vi.spyOn(process, 'exit');
 const logErrorSpy = vi.spyOn(errorHandlers, 'logError');
 const getConfigAccountIfExistsSpy = vi.spyOn(configLib, 'getConfigAccountIfExists');
-const isConvertableFieldJsSpy = vi.spyOn(handleFieldsJSLib, 'isConvertableFieldJs');
 describe('commands/cms/upload', () => {
     beforeEach(() => {
         // @ts-expect-error Mock implementation
@@ -70,7 +67,6 @@ describe('commands/cms/upload', () => {
         getThemePreviewUrlSpy.mockReturnValue(undefined);
         // Mock config to prevent reading actual config file in CI
         getConfigAccountIfExistsSpy.mockReturnValue(undefined);
-        isConvertableFieldJsSpy.mockReturnValue(false);
     });
     describe('command', () => {
         it('should have the correct command structure', () => {

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/commands/project/__tests__/migrate.test.js

@@ -9,7 +9,7 @@ import { uiBetaTag, uiCommandReference } from '../../../lib/ui/index.js';
 vi.mock('../../../lib/app/migrate');
 vi.mock('../../../lib/projects/config');
 vi.mock('../../../lib/ui');
-const { v2025_2, v2026_3_beta } = PLATFORM_VERSIONS;
+const { v2025_2 } = PLATFORM_VERSIONS;
 describe('commands/project/migrate', () => {
     const yargsMock = yargs;
     const optionsSpy = vi.spyOn(yargsMock, 'option').mockReturnValue(yargsMock);
@@ -48,7 +48,7 @@ describe('commands/project/migrate', () => {
             migrateCommand.builder(yargsMock);
             expect(optionsSpy).toHaveBeenCalledWith('platform-version', {
                 type: 'string',
-                choices: [v2025_2, v2026_3_beta],
+                choices: [v2025_2],
                 default: v2025_2,
             });
             expect(optionsSpy).toHaveBeenCalledWith('unstable', {

package/commands/project/migrate.js

@@ -13,7 +13,7 @@ import { getHasMigratableThemes, migrateThemes2025_2, } from '../../lib/theme/mi
 import { hasFeature } from '../../lib/hasFeature.js';
 import { FEATURES } from '../../lib/constants.js';
 import { trackCommandMetadataUsage, trackCommandUsage, } from '../../lib/usageTracking.js';
-const { v2025_2, v2026_3_beta } = PLATFORM_VERSIONS;
+const { v2025_2 } = PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = commands.project.migrate.describe;
 async function handler(args) {
@@ -26,8 +26,8 @@ async function handler(args) {
     }
     if (projectConfig?.projectConfig) {
         await renderInline(getWarningBox({
-            title: lib.migrate.projectMigrationWarningTitle(platformVersion),
-            message: lib.migrate.projectMigrationWarning(platformVersion),
+            title: lib.migrate.projectMigrationWarningTitle,
+            message: lib.migrate.projectMigrationWarning,
         }));
     }
     try {
@@ -67,7 +67,7 @@ function projectMigrateBuilder(yargs) {
     yargs
         .option('platform-version', {
         type: 'string',
-        choices: [v2025_2, v2026_3_beta],
+        choices: [v2025_2],
         default: v2025_2,
     })
         .option('unstable', {

package/lang/en.d.ts

@@ -1295,6 +1295,8 @@ export declare const commands: {
             prompts: {
                 targets: string;
                 targetsRequired: string;
+                standaloneMode: string;
+                cliVersion: string;
             };
         };
         start: {
@@ -3923,8 +3925,8 @@ export declare const lib: {
         componentsToBeMigrated: (components: string) => string;
         componentsThatWillNotBeMigrated: (components: string) => string;
         sourceContentsMoved: (newLocation: string) => string;
-        projectMigrationWarningTitle: (platformVersion: string) => string;
-        projectMigrationWarning: (platformVersion: string) => string;
+        projectMigrationWarningTitle: string;
+        projectMigrationWarning: string;
         exitWithoutMigrating: string;
         success: {
             downloadedProject: (projectName: string, projectDest: string) => string;

package/lang/en.js

@@ -1311,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: {
@@ -3946,8 +3948,8 @@ export const lib = {
         componentsToBeMigrated: (components) => `The following features will be migrated: ${components}`,
         componentsThatWillNotBeMigrated: (components) => `[NOTE] These features are not yet supported for migration but will be available later: ${components}`,
         sourceContentsMoved: (newLocation) => `The contents of your old source directory have been moved to ${newLocation}, move any required files to the new source directory.`,
-        projectMigrationWarningTitle: (platformVersion) => `Important: Migrating to platformVersion ${platformVersion} is irreversible`,
-        projectMigrationWarning: (platformVersion) => uiBetaTag(`Running the ${uiCommandReference('hs project migrate')} command will permanently upgrade your project to platformVersion ${platformVersion}. This action cannot be undone. To ensure you have access to your original files, they will be copied to a new directory (archive) for safekeeping.\n\nThis command will guide you through the process, prompting you to enter the required fields and will download the new project source code into your project source directory.`, false),
+        projectMigrationWarningTitle: 'Important: Migrating to platformVersion 2025.2 is irreversible',
+        projectMigrationWarning: uiBetaTag(`Running the ${uiCommandReference('hs project migrate')} command will permanently upgrade your project to platformVersion 2025.2. This action cannot be undone. To ensure you have access to your original files, they will be copied to a new directory (archive) for safekeeping.\n\nThis command will guide you through the process, prompting you to enter the required fields and will download the new project source code into your project source directory.`, false),
         exitWithoutMigrating: 'Exiting without migrating',
         success: {
             downloadedProject: (projectName, projectDest) => `Saved ${projectName} to ${projectDest}`,

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

@@ -132,6 +132,22 @@ 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);
+            // The HUBSPOT_MCP_STANDALONE env var is now passed in the command string using 'env'
+            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,8 @@ export async function setupCodex(mcpCommand = defaultMcpCommand) {
             return false;
         }
         const mcpCommandWithAgent = buildCommandWithAgentString(mcpCommand, codex);
-        await execAsync(`codex mcp add "${mcpServerName}" -- ${mcpCommandWithAgent.command} ${mcpCommandWithAgent.args.join(' ')}`);
+        const commandString = buildCommandStringWithEnv(mcpCommandWithAgent);
+        await execAsync(`codex mcp add "${mcpServerName}" -- ${commandString}`);
         SpinniesManager.succeed('codexSpinner', {
             text: commands.mcp.setup.spinners.configuredCodex,
         });
@@ -277,7 +336,8 @@ 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(' ')}`);
+        const commandString = buildCommandStringWithEnv(mcpCommandWithAgent);
+        await execAsync(`gemini mcp add -s user "${mcpServerName}" ${commandString}`);
         SpinniesManager.succeed('geminiSpinner', {
             text: commands.mcp.setup.spinners.configuredGemini,
         });
@@ -296,3 +356,18 @@ function buildCommandWithAgentString(mcpCommand, agent) {
     mcpCommandCopy.args.push('--ai-agent', agent);
     return mcpCommandCopy;
 }
+function buildCommandStringWithEnv(mcpCommand) {
+    const parts = [];
+    // Only pass HUBSPOT_MCP_STANDALONE environment variable if it exists
+    if (mcpCommand.env?.HUBSPOT_MCP_STANDALONE) {
+        parts.push(`HUBSPOT_MCP_STANDALONE=${mcpCommand.env.HUBSPOT_MCP_STANDALONE};`);
+    }
+    // Only pass HUBSPOT_MCP_STANDALONE environment variable if it exists
+    if (mcpCommand.env?.HUBSPOT_CLI_VERSION) {
+        parts.push(`HUBSPOT_CLI_VERSION=${mcpCommand.env.HUBSPOT_CLI_VERSION};`);
+    }
+    // Add the command and args
+    parts.push(mcpCommand.command);
+    parts.push(...mcpCommand.args);
+    return parts.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.d.ts

@@ -5,26 +5,9 @@ declare const inputSchemaZodObject: z.ZodObject<{
     absoluteProjectPath: z.ZodString;
     absoluteCurrentWorkingDirectory: z.ZodString;
     addApp: z.ZodBoolean;
-    distribution: z.ZodOptional<z.ZodEnum<{
-        marketplace: "marketplace";
-        private: "private";
-    }>>;
-    auth: z.ZodOptional<z.ZodEnum<{
-        oauth: "oauth";
-        static: "static";
-    }>>;
-    features: z.ZodOptional<z.ZodArray<z.ZodEnum<{
-        card: "card";
-        settings: "settings";
-        "app-event": "app-event";
-        page: "page";
-        "workflow-action-tool": "workflow-action-tool";
-        webhooks: "webhooks";
-        "workflow-action": "workflow-action";
-        "app-function": "app-function";
-        "app-object": "app-object";
-        scim: "scim";
-    }>>>;
+    distribution: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"marketplace">, z.ZodLiteral<"private">]>>;
+    auth: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"static">, z.ZodLiteral<"oauth">]>>;
+    features: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"app-event">, z.ZodLiteral<"scim">, z.ZodLiteral<"page">]>>>;
 }, z.core.$strip>;
 export type AddFeatureInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class AddFeatureToProjectTool extends Tool<AddFeatureInputSchema> {

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';
@@ -15,13 +15,17 @@ const inputSchema = {
         .boolean()
         .describe('Should an app be added?  If there is no app in the project, an app must be added to add a feature'),
     distribution: z
-        .enum([APP_DISTRIBUTION_TYPES.MARKETPLACE, APP_DISTRIBUTION_TYPES.PRIVATE])
-        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your app on the HubSpot marketplace. ')
-        .optional(),
+        .optional(z.union([
+        z.literal(APP_DISTRIBUTION_TYPES.MARKETPLACE),
+        z.literal(APP_DISTRIBUTION_TYPES.PRIVATE),
+    ]))
+        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your app on the HubSpot marketplace. '),
     auth: z
-        .enum([APP_AUTH_TYPES.STATIC, APP_AUTH_TYPES.OAUTH])
-        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Static uses a static non changing authentication token, and is only available for private distribution. ')
-        .optional(),
+        .optional(z.union([
+        z.literal(APP_AUTH_TYPES.STATIC),
+        z.literal(APP_AUTH_TYPES.OAUTH),
+    ]))
+        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Static uses a static non changing authentication token, and is only available for private distribution. '),
     features,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars