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

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,10 @@
 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/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

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

@@ -1,11 +1,10 @@
 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/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

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

@@ -1,11 +1,10 @@
 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/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

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

@@ -1,11 +1,10 @@
 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/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');

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

@@ -1,11 +1,10 @@
 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/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/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.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/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,10 @@
 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('../../../../lib/constants');
 vi.mock('../../../utils/toolUsageTracking');

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

@@ -1,11 +1,10 @@
 import { CreateProjectTool, } from '../CreateProjectTool.js';
-import { runCommandInDir } from '../../../utils/project.js';
+import { runCommandInDir } from '../../../utils/command.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/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,11 @@
 import { CreateTestAccountTool, } from '../CreateTestAccountTool.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';
 import fs from 'fs';
 import * as config from '@hubspot/local-dev-lib/config';
 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/project/__tests__/DeployProjectTool.test.js

@@ -1,10 +1,9 @@
 import { DeployProjectTool } from '../DeployProjectTool.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/project/__tests__/UploadProjectTools.test.js

@@ -1,13 +1,21 @@
 import { UploadProjectTools } from '../UploadProjectTools.js';
 import { getAllHsProfiles } from '@hubspot/project-parsing-lib/profiles';
 import { getProjectConfig } from '../../../../lib/projects/config.js';
-import { runCommandInDir } from '../../../utils/project.js';
+import { runCommandInDir } 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('@hubspot/project-parsing-lib/profiles');
 vi.mock('../../../../lib/projects/config.js');
-vi.mock('../../../utils/project');
+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/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/project.js';
+import { runCommandInDir } 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');
 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,6 +1,20 @@
-import { addFlag } from '../command.js';
-vi.mock('child_process');
-vi.mock('util');
+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);
 describe('mcp-server/utils/command', () => {
     describe('addFlag', () => {
         it('should add string flag to command', () => {
@@ -42,4 +56,220 @@ 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;
+            }
+        });
+    });
 });