@hubspot/cli 7.9.0-experimental.0 → 7.10.0-beta.0

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

@@ -1,20 +1,26 @@
-import { TextContentResponse, Tool } from '../../types.js';
-import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import z from 'zod';
+import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { TextContentResponse, Tool } from '../../types.js';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteProjectPath: z.ZodString;
     absoluteCurrentWorkingDirectory: z.ZodString;
+    uploadMessage: z.ZodString;
+    profile: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
+    uploadMessage: string;
     absoluteProjectPath: string;
     absoluteCurrentWorkingDirectory: string;
+    profile?: string | undefined;
 }, {
+    uploadMessage: string;
     absoluteProjectPath: string;
     absoluteCurrentWorkingDirectory: string;
+    profile?: string | undefined;
 }>;
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class UploadProjectTools extends Tool<InputSchemaType> {
     constructor(mcpServer: McpServer);
-    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }: InputSchemaType): Promise<TextContentResponse>;
+    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,12 +1,22 @@
+import path from 'path';
+import z from 'zod';
+import { getAllHsProfiles } from '@hubspot/project-parsing-lib';
+import { getProjectConfig } from '../../../lib/projects/config.js';
 import { Tool } from '../../types.js';
 import { runCommandInDir } from '../../utils/project.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import z from 'zod';
-import { formatTextContents } from '../../utils/content.js';
+import { formatTextContent, formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
+import { addFlag } from '../../utils/command.js';
 const inputSchema = {
     absoluteProjectPath,
     absoluteCurrentWorkingDirectory,
+    uploadMessage: z
+        .string()
+        .describe('A 1 sentence message that concisely describes the changes that are being uploaded.'),
+    profile: z
+        .optional(z.string())
+        .describe('CRITICAL: If the user has not explicitly specified a profile name, you MUST ask them which profile to use. NEVER automatically choose a profile based on files you see in the directory (e.g., seeing "hsprofile.prod.json" does NOT mean you should use "prod"). The profile to be used for the upload. All projects configured to use profiles must specify a profile when uploading. Profile files have the following format: "hsprofile.<profile>.json".'),
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({
@@ -17,9 +27,39 @@ export class UploadProjectTools extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }) {
         await trackToolUsage(toolName);
-        const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, `hs project upload --force-create`);
+        let command = addFlag('hs project upload', 'force-create', true);
+        const content = [];
+        if (uploadMessage) {
+            command = addFlag(command, 'message', uploadMessage);
+        }
+        if (profile) {
+            command = addFlag(command, 'profile', profile);
+        }
+        else {
+            let hasProfiles = false;
+            try {
+                const { projectConfig } = await getProjectConfig(absoluteProjectPath);
+                if (projectConfig) {
+                    const profiles = await getAllHsProfiles(path.join(absoluteProjectPath, projectConfig.srcDir));
+                    hasProfiles = profiles.length > 0;
+                }
+            }
+            catch (e) {
+                // If any of these checks fail, the safest thing to do is to assume there are no profiles.
+                hasProfiles = false;
+            }
+            if (hasProfiles) {
+                content.push(formatTextContent(`Ask the user which profile they would like to use for the upload.`));
+            }
+        }
+        if (content.length > 0) {
+            return {
+                content,
+            };
+        }
+        const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, command);
         return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
     }
     register() {

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

@@ -1,12 +1,18 @@
 import { UploadProjectTools } from '../UploadProjectTools.js';
+import { getAllHsProfiles } from '@hubspot/project-parsing-lib';
+import { getProjectConfig } from '../../../../lib/projects/config.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
+vi.mock('@hubspot/project-parsing-lib');
+vi.mock('../../../../lib/projects/config.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/feedbackTracking');
 const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
+const mockGetProjectConfig = getProjectConfig;
+const mockGetAllHsProfiles = getAllHsProfiles;
 describe('mcp-server/tools/project/UploadProjectTools', () => {
     let mockMcpServer;
     let tool;
@@ -20,6 +26,15 @@ describe('mcp-server/tools/project/UploadProjectTools', () => {
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
         mockMcpFeedbackRequest.mockResolvedValue('');
+        mockGetProjectConfig.mockResolvedValue({
+            projectConfig: {
+                srcDir: 'src',
+                name: 'test-project',
+                platformVersion: '2025.2',
+            },
+            projectDir: '/test/project',
+        });
+        mockGetAllHsProfiles.mockResolvedValue([]);
         tool = new UploadProjectTools(mockMcpServer);
     });
     describe('register', () => {
@@ -37,6 +52,7 @@ describe('mcp-server/tools/project/UploadProjectTools', () => {
         const input = {
             absoluteCurrentWorkingDirectory: '/test/dir',
             absoluteProjectPath: '/test/project',
+            uploadMessage: 'Test upload message',
         };
         it('should upload project successfully', async () => {
             mockRunCommandInDir.mockResolvedValue({
@@ -44,7 +60,9 @@ describe('mcp-server/tools/project/UploadProjectTools', () => {
                 stderr: '',
             });
             const result = await tool.handler(input);
-            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', 'hs project upload --force-create');
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('hs project upload'));
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('--force-create'));
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('--message "Test upload message"'));
             expect(result).toEqual({
                 content: [
                     { type: 'text', text: 'Project uploaded successfully' },
@@ -68,13 +86,44 @@ describe('mcp-server/tools/project/UploadProjectTools', () => {
             mockRunCommandInDir.mockRejectedValue(error);
             await expect(tool.handler(input)).rejects.toThrow('Upload failed');
         });
-        it('should use force-create flag', async () => {
+        it('should use force-create and message flags', async () => {
             mockRunCommandInDir.mockResolvedValue({
                 stdout: 'Project created and uploaded',
                 stderr: '',
             });
             await tool.handler(input);
-            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', 'hs project upload --force-create');
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('hs project upload'));
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('--force-create'));
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('--message "Test upload message"'));
+        });
+        it('should use profiles', async () => {
+            mockRunCommandInDir.mockResolvedValue({
+                stdout: 'Project created and uploaded',
+                stderr: '',
+            });
+            await tool.handler({
+                ...input,
+                profile: 'dev',
+            });
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('hs project upload'));
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('--force-create'));
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('--message "Test upload message"'));
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/test/project', expect.stringContaining('--profile "dev"'));
+        });
+        it('should prompt for profile if not specified and the project requires them', async () => {
+            mockGetAllHsProfiles.mockResolvedValue(['prod', 'dev']);
+            mockRunCommandInDir.mockResolvedValue({
+                stdout: 'Project created and uploaded',
+                stderr: '',
+            });
+            const result = await tool.handler(input);
+            expect(mockRunCommandInDir).not.toHaveBeenCalled();
+            expect(result.content).toEqual([
+                {
+                    type: 'text',
+                    text: 'Ask the user which profile they would like to use for the upload.',
+                },
+            ]);
         });
         it('should handle empty stdout and stderr', async () => {
             mockRunCommandInDir.mockResolvedValue({
@@ -95,9 +144,12 @@ describe('mcp-server/tools/project/UploadProjectTools', () => {
             const differentInput = {
                 absoluteCurrentWorkingDirectory: '/test/dir',
                 absoluteProjectPath: '/different/path/to/project',
+                uploadMessage: 'Different test upload message',
             };
             await tool.handler(differentInput);
-            expect(mockRunCommandInDir).toHaveBeenCalledWith('/different/path/to/project', 'hs project upload --force-create');
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/different/path/to/project', expect.stringContaining('hs project upload'));
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/different/path/to/project', expect.stringContaining('--force-create'));
+            expect(mockRunCommandInDir).toHaveBeenCalledWith('/different/path/to/project', expect.stringContaining('--message "Different test upload message"'));
         });
         it('should handle very long output', async () => {
             const longOutput = 'A'.repeat(10000);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.9.0-experimental.0",
+    "version": "7.10.0-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",