@hubspot/cli 7.7.6-experimental.0 → 7.7.8-experimental.0

package/commands/mcp/setup.d.ts

@@ -2,12 +2,11 @@ import { ArgumentsCamelCase, Argv } from 'yargs';
 interface MCPSetupArgs {
     targets?: string[];
 }
-declare function builder(yargs: Argv): Argv;
 declare function handler(argv: ArgumentsCamelCase<MCPSetupArgs>): Promise<void>;
 declare const _default: {
     command: string[];
     describe: undefined;
-    builder: typeof builder;
+    builder: (yargs: Argv) => Promise<Argv<{}>>;
     handler: typeof handler;
 };
 export default _default;

package/commands/mcp/setup.js

@@ -13,15 +13,16 @@ const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const chalk_1 = __importDefault(require("chalk"));
+const yargsUtils_1 = require("../../lib/yargsUtils");
 const command = ['setup', 'update'];
-const describe = undefined;
+const describe = undefined; // Leave hidden for now
 const execAsync = (0, util_1.promisify)(child_process_1.exec);
 const supportedTools = [
     { name: 'Claude', value: 'claude' },
     { name: 'Claude Desktop', value: 'claude-desktop' },
     { name: 'Cursor', value: 'cursor' },
 ];
-function builder(yargs) {
+function setupBuilder(yargs) {
     yargs.option('targets', {
         describe: 'Target application to configure',
         type: 'array',
@@ -29,10 +30,19 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(setupBuilder, command, describe, {
+    useGlobalOptions: true,
+});
 async function handler(argv) {
+    try {
+        await import('@modelcontextprotocol/sdk/server/mcp.js');
+    }
+    catch (e) {
+        logger_1.logger.error(`This feature requires node >=20`);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     await addMcpServerToConfig(argv.targets);
 }
-exports.default = { command, describe, builder, handler };
 async function addMcpServerToConfig(targets) {
     try {
         let derivedTargets = [];
@@ -136,8 +146,8 @@ async function setupClaudeCode() {
             // Run claude mcp add command
             const mcpConfig = JSON.stringify({
                 type: 'stdio',
-                command: 'hs',
-                args: ['mcp', 'start'],
+                command: 'yarn',
+                args: ['hs', 'mcp', 'start'],
             });
             const { stdout } = await execAsync('claude mcp list');
             if (stdout.includes('hubspot-cli-mcp')) {
@@ -236,3 +246,4 @@ function getClaudeDesktopConfigPath() {
         return path_1.default.join(homeDir, '.config', 'claude', 'claude_desktop_config.json');
     }
 }
+exports.default = { command, describe, builder, handler };

package/commands/mcp/start.d.ts

@@ -1,10 +1,9 @@
 import { Argv } from 'yargs';
-declare function builder(yargs: Argv): Argv;
 declare function handler(): Promise<void>;
 declare const _default: {
     command: string;
     describe: undefined;
-    builder: typeof builder;
+    builder: (yargs: Argv) => Promise<Argv<{}>>;
     handler: typeof handler;
 };
 export default _default;

package/commands/mcp/start.js

@@ -7,15 +7,26 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
 const command = 'start';
-const describe = undefined; // Keep this command hidden, doesn't seem useful to expose
-function builder(yargs) {
+const describe = undefined; // Leave hidden for now
+function startBuilder(yargs) {
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(startBuilder, command, describe, {
+    useGlobalOptions: true,
+});
 async function handler() {
+    try {
+        await import('@modelcontextprotocol/sdk/server/mcp.js');
+    }
+    catch (e) {
+        logger_1.logger.error(`This feature requires node >=20`);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     await startMcpServer();
 }
-exports.default = { command, describe, builder, handler };
 async function startMcpServer() {
     try {
         const serverPath = path_1.default.join(__dirname, '..', '..', 'mcp-server', 'server.js');
@@ -64,3 +75,4 @@ async function startMcpServer() {
         logger_1.logger.error('Error starting MCP server:', error);
     }
 }
+exports.default = { command, describe, builder, handler };

package/commands/mcp.d.ts

@@ -1,10 +1,3 @@
-import { Argv } from 'yargs';
-declare function builder(yargs: Argv): Argv;
-declare function handler(): void;
-declare const _default: {
-    command: string;
-    describe: string;
-    builder: typeof builder;
-    handler: typeof handler;
-};
-export default _default;
+import { YargsCommandModuleBucket } from '../types/Yargs';
+declare const mcpCommand: YargsCommandModuleBucket;
+export default mcpCommand;

package/commands/mcp.js

@@ -5,16 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const start_1 = __importDefault(require("./mcp/start"));
 const setup_1 = __importDefault(require("./mcp/setup"));
+const yargsUtils_1 = require("../lib/yargsUtils");
 const command = 'mcp';
 const describe = 'Manage the Model Context Protocol server';
-function builder(yargs) {
-    return yargs
-        .command(start_1.default)
-        .command(setup_1.default)
-        .demandCommand(1, 'You must specify a subcommand')
-        .help();
+function mcpBuilder(yargs) {
+    yargs.command(start_1.default).command(setup_1.default).demandCommand(1, '');
+    return yargs;
 }
-function handler() {
-    // This function is required by yargs but not used since we have subcommands
-}
-exports.default = { command, describe, builder, handler };
+const builder = (0, yargsUtils_1.makeYargsBuilder)(mcpBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const mcpCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = mcpCommand;

package/mcp-server/tools/index.js

@@ -8,10 +8,10 @@ const DeployProject_1 = require("./project/DeployProject");
 const AddFeatureToProject_1 = require("./project/AddFeatureToProject");
 function registerProjectTools(mcpServer) {
     return [
-        UploadProjectTools_1.UploadProjectTools.register(mcpServer),
-        CreateProjectTool_1.CreateProjectTool.register(mcpServer),
-        GuidedWalkthroughTool_1.GuidedWalkthroughTool.register(mcpServer),
-        DeployProject_1.DeployProject.register(mcpServer),
-        AddFeatureToProject_1.AddFeatureToProject.register(mcpServer),
+        new UploadProjectTools_1.UploadProjectTools(mcpServer).register(),
+        new CreateProjectTool_1.CreateProjectTool(mcpServer).register(),
+        new GuidedWalkthroughTool_1.GuidedWalkthroughTool(mcpServer).register(),
+        new DeployProject_1.DeployProject(mcpServer).register(),
+        new AddFeatureToProject_1.AddFeatureToProject(mcpServer).register(),
     ];
 }

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

@@ -1,6 +1,29 @@
-import { Tool } from '../../types';
+import { TextContentResponse, Tool } from '../../types';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
-export declare class AddFeatureToProject extends Tool {
-    private static mcpServer;
-    static register(mcpServer: McpServer): RegisteredTool;
+import { z } from 'zod';
+declare const inputSchemaZodObject: z.ZodObject<{
+    absoluteProjectPath: z.ZodString;
+    addApp: z.ZodBoolean;
+    distribution: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"marketplace">, z.ZodLiteral<"private">]>>;
+    auth: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"oauth">]>>;
+    features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">]>, "many">>;
+}, "strip", z.ZodTypeAny, {
+    absoluteProjectPath: string;
+    addApp: boolean;
+    auth?: "oauth" | "static" | undefined;
+    distribution?: "marketplace" | "private" | undefined;
+    features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+}, {
+    absoluteProjectPath: string;
+    addApp: boolean;
+    auth?: "oauth" | "static" | undefined;
+    distribution?: "marketplace" | "private" | undefined;
+    features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+}>;
+export type AddFeatureInputSchema = z.infer<typeof inputSchemaZodObject>;
+export declare class AddFeatureToProject extends Tool<AddFeatureInputSchema> {
+    constructor(mcpServer: McpServer);
+    handler({ absoluteProjectPath, distribution, auth, features, addApp, }: AddFeatureInputSchema): Promise<TextContentResponse>;
+    register(): RegisteredTool;
 }
+export {};

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

@@ -7,94 +7,100 @@ const constants_1 = require("../../../lib/constants");
 const command_1 = require("../../utils/command");
 const constants_2 = require("./constants");
 const project_1 = require("../../utils/project");
+const inputSchema = {
+    absoluteProjectPath: constants_2.absoluteProjectPath,
+    addApp: zod_1.z.boolean().describe('Would you like to add an app?'),
+    distribution: zod_1.z
+        .optional(zod_1.z.union([
+        zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE),
+        zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.PRIVATE),
+    ]))
+        .describe('Private is used if you do not wish to distribute your application on the HubSpot marketplace. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.'),
+    auth: zod_1.z
+        .optional(zod_1.z.union([
+        zod_1.z.literal(constants_1.APP_AUTH_TYPES.STATIC),
+        zod_1.z.literal(constants_1.APP_AUTH_TYPES.OAUTH),
+    ]))
+        .describe('Static uses a static non changing authentication token, and is only available for private distribution. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.'),
+    features: zod_1.z
+        .array(zod_1.z
+        .union([
+        zod_1.z.literal('card'),
+        zod_1.z.literal('settings'),
+        zod_1.z.literal('app-function'),
+        zod_1.z.literal('webhooks'),
+    ])
+        .describe('The features to include in the project, multiple options can be selected'))
+        .optional(),
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const inputSchemaZodObject = zod_1.z.object({
+    ...inputSchema,
+});
 class AddFeatureToProject extends types_1.Tool {
-    static mcpServer;
-    static register(mcpServer) {
-        this.mcpServer = mcpServer;
-        return this.mcpServer.registerTool('add-feature-to-hubspot-project', {
-            title: 'Add feature to HubSpot Project',
-            description: 'Adds a feature to an existing HubSpot project',
-            inputSchema: {
-                absoluteProjectPath: constants_2.absoluteProjectPath,
-                addApp: zod_1.z.boolean().describe('Would you like to add an app?'),
-                distribution: zod_1.z
-                    .optional(zod_1.z.union([
-                    zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE),
-                    zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.PRIVATE),
-                ]))
-                    .describe('Private is used if you do not wish to distribute your application on the HubSpot marketplace. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.'),
-                auth: zod_1.z
-                    .optional(zod_1.z.union([
-                    zod_1.z.literal(constants_1.APP_AUTH_TYPES.STATIC),
-                    zod_1.z.literal(constants_1.APP_AUTH_TYPES.OAUTH),
-                ]))
-                    .describe('Static uses a static non changing authentication token, and is only available for private distribution. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.')
-                    .optional(),
-                features: zod_1.z
-                    .array(zod_1.z
-                    .union([
-                    zod_1.z.literal('card'),
-                    zod_1.z.literal('settings'),
-                    zod_1.z.literal('app-function'),
-                    zod_1.z.literal('webhooks'),
-                ])
-                    .describe('The features to include in the project, multiple options can be selected'))
-                    .optional(),
-            },
-        }, async ({ absoluteProjectPath, distribution, auth, features, addApp }) => {
-            try {
-                let command = `hs project add`;
-                const content = [];
-                if (distribution) {
-                    command = (0, command_1.addFlag)(command, 'distribution', distribution);
-                }
-                else if (addApp) {
-                    content.push({
-                        type: 'text',
-                        text: `Ask the user how they would you like to distribute the application? Options are ${constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${constants_1.APP_DISTRIBUTION_TYPES.PRIVATE}`,
-                    });
-                }
-                if (auth) {
-                    command = (0, command_1.addFlag)(command, 'auth', auth);
-                }
-                else if (addApp) {
-                    content.push({
-                        type: 'text',
-                        text: `Ask the user which auth type they would like to use? Options are ${constants_1.APP_AUTH_TYPES.STATIC} and ${constants_1.APP_AUTH_TYPES.OAUTH}`,
-                    });
-                }
-                if (content.length > 0) {
-                    return {
-                        content,
-                    };
-                }
-                // If features isn't provided, pass an empty array to bypass the prompt
-                command = (0, command_1.addFlag)(command, 'features', features || []);
-                const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, command);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: stdout,
-                        },
-                        {
-                            type: 'text',
-                            text: stderr,
-                        },
-                    ],
-                };
+    constructor(mcpServer) {
+        super(mcpServer);
+    }
+    async handler({ absoluteProjectPath, distribution, auth, features, addApp, }) {
+        try {
+            let command = `hs project add`;
+            const content = [];
+            if (distribution) {
+                command = (0, command_1.addFlag)(command, 'distribution', distribution);
+            }
+            else if (addApp) {
+                content.push({
+                    type: 'text',
+                    text: `Ask the user how they would you like to distribute the application? Options are ${constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${constants_1.APP_DISTRIBUTION_TYPES.PRIVATE}`,
+                });
             }
-            catch (error) {
+            if (auth) {
+                command = (0, command_1.addFlag)(command, 'auth', auth);
+            }
+            else if (addApp) {
+                content.push({
+                    type: 'text',
+                    text: `Ask the user which auth type they would like to use? Options are ${constants_1.APP_AUTH_TYPES.STATIC} and ${constants_1.APP_AUTH_TYPES.OAUTH}`,
+                });
+            }
+            if (content.length > 0) {
                 return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: error instanceof Error ? error.message : `${error}`,
-                        },
-                    ],
+                    content,
                 };
             }
-        });
+            // If features isn't provided, pass an empty array to bypass the prompt
+            command = (0, command_1.addFlag)(command, 'features', features || []);
+            const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, command);
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: stdout,
+                    },
+                    {
+                        type: 'text',
+                        text: stderr,
+                    },
+                ],
+            };
+        }
+        catch (error) {
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: error instanceof Error ? error.message : `${error}`,
+                    },
+                ],
+            };
+        }
+    }
+    register() {
+        return this.mcpServer.registerTool('add-feature-to-hubspot-project', {
+            title: 'Add feature to HubSpot Project',
+            description: 'Adds a feature to an existing HubSpot project',
+            inputSchema,
+        }, this.handler);
     }
 }
 exports.AddFeatureToProject = AddFeatureToProject;

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

@@ -1,6 +1,35 @@
-import { Tool } from '../../types';
+import { TextContentResponse, Tool } from '../../types';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
-export declare class CreateProjectTool extends Tool {
-    private static mcpServer;
-    static register(mcpServer: McpServer): RegisteredTool;
+import { z } from 'zod';
+declare const inputSchemaZodObject: z.ZodObject<{
+    absoluteCurrentWorkingDirectory: z.ZodString;
+    name: z.ZodString;
+    destination: z.ZodString;
+    projectBase: z.ZodUnion<[z.ZodLiteral<"empty">, z.ZodLiteral<"app">]>;
+    distribution: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"marketplace">, z.ZodLiteral<"private">]>>;
+    auth: z.ZodOptional<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"oauth">]>>>;
+    features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">]>, "many">>;
+}, "strip", z.ZodTypeAny, {
+    name: string;
+    projectBase: "app" | "empty";
+    absoluteCurrentWorkingDirectory: string;
+    destination: string;
+    auth?: "oauth" | "static" | undefined;
+    distribution?: "marketplace" | "private" | undefined;
+    features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+}, {
+    name: string;
+    projectBase: "app" | "empty";
+    absoluteCurrentWorkingDirectory: string;
+    destination: string;
+    auth?: "oauth" | "static" | undefined;
+    distribution?: "marketplace" | "private" | undefined;
+    features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
+}>;
+export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
+export declare class CreateProjectTool extends Tool<CreateProjectInputSchema> {
+    constructor(mcpServer: McpServer);
+    handler({ name, destination, projectBase, distribution, auth, features, absoluteCurrentWorkingDirectory, }: CreateProjectInputSchema): Promise<TextContentResponse>;
+    register(): RegisteredTool;
 }
+export {};

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

@@ -8,112 +8,117 @@ const command_1 = require("../../utils/command");
 const v3_1 = require("../../../lib/projects/create/v3");
 const constants_2 = require("./constants");
 const project_1 = require("../../utils/project");
+const inputSchema = {
+    absoluteCurrentWorkingDirectory: constants_2.absoluteCurrentWorkingDirectory,
+    name: zod_1.z
+        .string()
+        .describe('The name of the project to be created.  This name is how your project will appear in HubSpot.'),
+    destination: zod_1.z
+        .string()
+        .describe('Relative path to the directory the project will be created in. It is not recommended to use the current directory unless it is an empty directory'),
+    projectBase: zod_1.z
+        .union([zod_1.z.literal(v3_1.EMPTY_PROJECT), zod_1.z.literal(v3_1.PROJECT_WITH_APP)])
+        .describe('Empty will create and empty project, and app will create a project with an app inside of it.'),
+    distribution: zod_1.z
+        .optional(zod_1.z.union([
+        zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE),
+        zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.PRIVATE),
+    ]))
+        .describe('Private is used if you do not wish to distribute your application on the HubSpot marketplace. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.'),
+    auth: zod_1.z
+        .optional(zod_1.z.union([
+        zod_1.z.literal(constants_1.APP_AUTH_TYPES.STATIC),
+        zod_1.z.literal(constants_1.APP_AUTH_TYPES.OAUTH),
+    ]))
+        .describe('Static uses a static non changing authentication token, and is only available for private distribution. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.')
+        .optional(),
+    features: zod_1.z
+        .array(zod_1.z
+        .union([
+        zod_1.z.literal('card'),
+        zod_1.z.literal('settings'),
+        zod_1.z.literal('app-function'),
+        zod_1.z.literal('webhooks'),
+    ])
+        .describe('The features to include in the project, multiple options can be selected'))
+        .optional(),
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const inputSchemaZodObject = zod_1.z.object({ ...inputSchema });
 class CreateProjectTool extends types_1.Tool {
-    static mcpServer;
-    static register(mcpServer) {
-        this.mcpServer = mcpServer;
+    constructor(mcpServer) {
+        super(mcpServer);
+    }
+    async handler({ name, destination, projectBase, distribution, auth, features, absoluteCurrentWorkingDirectory, }) {
+        let command = (0, command_1.addFlag)('hs project create', 'platform-version', '2025.2');
+        const content = [];
+        if (name) {
+            command = (0, command_1.addFlag)(command, 'name', name);
+        }
+        if (destination) {
+            command = (0, command_1.addFlag)(command, 'dest', destination);
+        }
+        if (projectBase) {
+            command = (0, command_1.addFlag)(command, 'project-base', projectBase);
+        }
+        if (distribution) {
+            command = (0, command_1.addFlag)(command, 'distribution', distribution);
+        }
+        else if (projectBase === v3_1.PROJECT_WITH_APP) {
+            content.push({
+                type: 'text',
+                text: `Ask the user how they would you like to distribute the application? Options are ${constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${constants_1.APP_DISTRIBUTION_TYPES.PRIVATE}`,
+            });
+        }
+        if (auth) {
+            command = (0, command_1.addFlag)(command, 'auth', auth);
+        }
+        else if (projectBase === v3_1.PROJECT_WITH_APP) {
+            content.push({
+                type: 'text',
+                text: `Ask the user which auth type they would like to use? Options are ${constants_1.APP_AUTH_TYPES.STATIC} and ${constants_1.APP_AUTH_TYPES.OAUTH}`,
+            });
+        }
+        if (content.length > 0) {
+            return {
+                content,
+            };
+        }
+        if (features && features.length) {
+            command = (0, command_1.addFlag)(command, 'features', features);
+        }
+        try {
+            const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteCurrentWorkingDirectory, command);
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: stdout,
+                    },
+                    {
+                        type: 'text',
+                        text: stderr,
+                    },
+                ],
+            };
+        }
+        catch (error) {
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: error instanceof Error ? error.message : `${error}`,
+                    },
+                ],
+            };
+        }
+    }
+    register() {
         return this.mcpServer.registerTool('create-hubspot-project', {
             title: 'Create HubSpot Project',
             description: 'Creates a HubSpot project with the provided name and outputs it in the provided destination',
-            inputSchema: {
-                absoluteCurrentWorkingDirectory: constants_2.absoluteCurrentWorkingDirectory,
-                name: zod_1.z
-                    .string()
-                    .describe('The name of the project to be created.  This name is how your project will appear in HubSpot.'),
-                destination: zod_1.z
-                    .string()
-                    .describe('Relative path to the directory the project will be created in. It is not recommended to use the current directory unless it is an empty directory'),
-                projectBase: zod_1.z
-                    .union([zod_1.z.literal(v3_1.EMPTY_PROJECT), zod_1.z.literal(v3_1.PROJECT_WITH_APP)])
-                    .describe('Empty will create and empty project, and app will create a project with an app inside of it.'),
-                distribution: zod_1.z
-                    .optional(zod_1.z.union([
-                    zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE),
-                    zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.PRIVATE),
-                ]))
-                    .describe('Private is used if you do not wish to distribute your application on the HubSpot marketplace. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.'),
-                auth: zod_1.z
-                    .optional(zod_1.z.union([
-                    zod_1.z.literal(constants_1.APP_AUTH_TYPES.STATIC),
-                    zod_1.z.literal(constants_1.APP_AUTH_TYPES.OAUTH),
-                ]))
-                    .describe('Static uses a static non changing authentication token, and is only available for private distribution. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.')
-                    .optional(),
-                features: zod_1.z
-                    .array(zod_1.z
-                    .union([
-                    zod_1.z.literal('card'),
-                    zod_1.z.literal('settings'),
-                    zod_1.z.literal('app-function'),
-                    zod_1.z.literal('webhooks'),
-                ])
-                    .describe('The features to include in the project, multiple options can be selected'))
-                    .optional(),
-            },
-        }, async ({ name, destination, projectBase, distribution, auth, features, absoluteCurrentWorkingDirectory, }) => {
-            let command = (0, command_1.addFlag)('hs project create', 'platform-version', '2025.2');
-            const content = [];
-            if (name) {
-                command = (0, command_1.addFlag)(command, 'name', name);
-            }
-            if (destination) {
-                command = (0, command_1.addFlag)(command, 'dest', destination);
-            }
-            if (projectBase) {
-                command = (0, command_1.addFlag)(command, 'project-base', projectBase);
-            }
-            if (distribution) {
-                command = (0, command_1.addFlag)(command, 'distribution', distribution);
-            }
-            else if (projectBase === v3_1.PROJECT_WITH_APP) {
-                content.push({
-                    type: 'text',
-                    text: `Ask the user how they would you like to distribute the application? Options are ${constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${constants_1.APP_DISTRIBUTION_TYPES.PRIVATE}`,
-                });
-            }
-            if (auth) {
-                command = (0, command_1.addFlag)(command, 'auth', auth);
-            }
-            else if (projectBase === v3_1.PROJECT_WITH_APP) {
-                content.push({
-                    type: 'text',
-                    text: `Ask the user which auth type they would like to use? Options are ${constants_1.APP_AUTH_TYPES.STATIC} and ${constants_1.APP_AUTH_TYPES.OAUTH}`,
-                });
-            }
-            if (content.length > 0) {
-                return {
-                    content,
-                };
-            }
-            if (features && features.length) {
-                command = (0, command_1.addFlag)(command, 'features', features);
-            }
-            try {
-                const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteCurrentWorkingDirectory, command);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: stdout,
-                        },
-                        {
-                            type: 'text',
-                            text: stderr,
-                        },
-                    ],
-                };
-            }
-            catch (error) {
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: error instanceof Error ? error.message : `${error}`,
-                        },
-                    ],
-                };
-            }
-        });
+            inputSchema,
+        }, this.handler);
     }
 }
 exports.CreateProjectTool = CreateProjectTool;

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

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

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

@@ -6,45 +6,52 @@ const zod_1 = require("zod");
 const command_1 = require("../../utils/command");
 const constants_1 = require("./constants");
 const project_1 = require("../../utils/project");
+const inputSchema = {
+    absoluteProjectPath: constants_1.absoluteProjectPath,
+    buildNumber: zod_1.z
+        .optional(zod_1.z.number())
+        .describe('The build number to be deployed.  This can be found in the project details page using `hs project open`.  If no build number is specified, the most recent build is deployed'),
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const inputSchemaZodObject = zod_1.z.object({
+    ...inputSchema,
+});
 class DeployProject extends types_1.Tool {
-    static mcpServer;
-    static register(mcpServer) {
-        this.mcpServer = mcpServer;
+    constructor(mcpServer) {
+        super(mcpServer);
+    }
+    async handler({ absoluteProjectPath, buildNumber, }) {
+        let command = `hs project deploy`;
+        const content = [];
+        if (!buildNumber) {
+            const { stdout } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project list-builds --limit 100`);
+            content.push({
+                type: 'text',
+                text: `Ask the user which build number they would like to deploy?  Build information: ${stdout}`,
+            });
+        }
+        else {
+            command = (0, command_1.addFlag)(command, 'build', buildNumber);
+        }
+        if (content.length) {
+            return {
+                content,
+            };
+        }
+        const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, command);
+        return {
+            content: [
+                { type: 'text', text: stdout },
+                { type: 'text', text: stderr },
+            ],
+        };
+    }
+    register() {
         return this.mcpServer.registerTool('deploy-hubspot-project', {
             title: 'Deploy a build of HubSpot Project',
             description: 'Takes a build number and a project name and deploys that build of the project',
-            inputSchema: {
-                absoluteProjectPath: constants_1.absoluteProjectPath,
-                buildNumber: zod_1.z
-                    .optional(zod_1.z.number())
-                    .describe('The build number to be deployed.  This can be found in the project details page using `hs project open`.  If no build number is specified, the most recent build is deployed'),
-            },
-        }, async ({ absoluteProjectPath, buildNumber }) => {
-            let command = `hs project deploy`;
-            const content = [];
-            if (!buildNumber) {
-                const { stdout } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project list-builds --limit 100`);
-                content.push({
-                    type: 'text',
-                    text: `Ask the user which build number they would like to deploy?  Build information: ${stdout}`,
-                });
-            }
-            else {
-                command = (0, command_1.addFlag)(command, 'build', buildNumber);
-            }
-            if (content.length) {
-                return {
-                    content,
-                };
-            }
-            const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, command);
-            return {
-                content: [
-                    { type: 'text', text: stdout },
-                    { type: 'text', text: stderr },
-                ],
-            };
-        });
+            inputSchema,
+        }, this.handler);
     }
 }
 exports.DeployProject = DeployProject;

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

@@ -1,6 +1,17 @@
-import { Tool } from '../../types';
+import { TextContentResponse, Tool } from '../../types';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
-export declare class GuidedWalkthroughTool extends Tool {
-    private static mcpServer;
-    static register(mcpServer: McpServer): RegisteredTool;
+import { z } from 'zod';
+declare const inputSchemaZodObject: z.ZodObject<{
+    command: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"hs init">, z.ZodLiteral<"hs auth">, z.ZodLiteral<"hs project create">, z.ZodLiteral<"hs project upload">]>>;
+}, "strip", z.ZodTypeAny, {
+    command?: "hs auth" | "hs project upload" | "hs project create" | "hs init" | undefined;
+}, {
+    command?: "hs auth" | "hs project upload" | "hs project create" | "hs init" | undefined;
+}>;
+type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
+export declare class GuidedWalkthroughTool extends Tool<InputSchemaType> {
+    constructor(mcpServer: McpServer);
+    handler({ command }: InputSchemaType): Promise<TextContentResponse>;
+    register(): RegisteredTool;
 }
+export {};

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

@@ -10,10 +10,47 @@ const nextCommands = {
     'hs project create': 'hs project upload',
     'hs project upload': 'hs project dev',
 };
+const inputSchema = {
+    command: zod_1.z
+        .union([
+        zod_1.z.literal('hs init'),
+        zod_1.z.literal('hs auth'),
+        zod_1.z.literal('hs project create'),
+        zod_1.z.literal('hs project upload'),
+    ])
+        .describe('The command to learn more about.  Start with `hs init`')
+        .optional(),
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const inputSchemaZodObject = zod_1.z.object({
+    ...inputSchema,
+});
 class GuidedWalkthroughTool extends types_1.Tool {
-    static mcpServer;
-    static register(mcpServer) {
-        this.mcpServer = mcpServer;
+    constructor(mcpServer) {
+        super(mcpServer);
+    }
+    async handler({ command }) {
+        if (command) {
+            const { stdout } = await (0, command_1.execAsync)(`${command} --help`);
+            return {
+                content: [
+                    {
+                        type: 'text',
+                        text: `Display this help output for the user amd wait for them to acknowledge: ${stdout}. ${nextCommands[command] ? `Once they are ready, A good command to look at next is ${nextCommands[command]}` : ''}`,
+                    },
+                ],
+            };
+        }
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: 'Is there another command you would like to learn more about?',
+                },
+            ],
+        };
+    }
+    register() {
         return this.mcpServer.registerTool('guided-walkthrough-hubspot-cli', {
             title: 'Guided walkthrough of the CLI',
             description: 'Give the user a guided walkthrough of the HubSpot CLI.',
@@ -28,27 +65,7 @@ class GuidedWalkthroughTool extends types_1.Tool {
                     .describe('The command to learn more about.  Start with `hs init`')
                     .optional(),
             },
-        }, async ({ command }) => {
-            if (command) {
-                const { stdout } = await (0, command_1.execAsync)(`${command} --help`);
-                return {
-                    content: [
-                        {
-                            type: 'text',
-                            text: `Display this help output for the user amd wait for them to acknowledge: ${stdout}. ${nextCommands[command] ? `Once they are ready, A good command to look at next is ${nextCommands[command]}` : ''}`,
-                        },
-                    ],
-                };
-            }
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: 'Is there another command you would like to learn more about?',
-                    },
-                ],
-            };
-        });
+        }, this.handler);
     }
 }
 exports.GuidedWalkthroughTool = GuidedWalkthroughTool;

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

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

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

@@ -1,26 +1,39 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UploadProjectTools = void 0;
 const types_1 = require("../../types");
 const project_1 = require("../../utils/project");
 const constants_1 = require("./constants");
+const zod_1 = __importDefault(require("zod"));
+const inputSchema = {
+    absoluteProjectPath: constants_1.absoluteProjectPath,
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const inputSchemaZodObject = zod_1.default.object({
+    ...inputSchema,
+});
 class UploadProjectTools extends types_1.Tool {
-    static register(mcpServer) {
-        return mcpServer.registerTool('upload-hubspot-project', {
+    constructor(mcpServer) {
+        super(mcpServer);
+    }
+    async handler({ absoluteProjectPath, }) {
+        const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project upload --force-create`);
+        return {
+            content: [
+                { type: 'text', text: stdout },
+                { type: 'text', text: stderr },
+            ],
+        };
+    }
+    register() {
+        return this.mcpServer.registerTool('upload-hubspot-project', {
             title: 'Upload HubSpot Project',
             description: 'Uploads the HubSpot project in current working directory.  If the project does not exist, it will be created. MUST be ran from within the project directory.',
-            inputSchema: {
-                absoluteProjectPath: constants_1.absoluteProjectPath,
-            },
-        }, async ({ absoluteProjectPath }) => {
-            const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, `hs project upload --force-create`);
-            return {
-                content: [
-                    { type: 'text', text: stdout },
-                    { type: 'text', text: stderr },
-                ],
-            };
-        });
+            inputSchema,
+        }, this.handler);
     }
 }
 exports.UploadProjectTools = UploadProjectTools;

package/mcp-server/types.d.ts

@@ -1,8 +1,14 @@
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
-export declare class Tool {
-    static register: (McpServer: McpServer) => RegisteredTool;
+export declare class Tool<InputSchema, ResponseType = TextContentResponse> {
+    protected mcpServer: McpServer;
+    constructor(mcpServer: McpServer);
+    register(): RegisteredTool;
+    handler(input: InputSchema): ResponseType | Promise<ResponseType>;
 }
-export type Content = {
+export type TextContent = {
     type: 'text';
     text: string;
 };
+export type TextContentResponse = {
+    content: TextContent[];
+};

package/mcp-server/types.js

@@ -2,6 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Tool = void 0;
 class Tool {
-    static register;
+    mcpServer;
+    constructor(mcpServer) {
+        this.mcpServer = mcpServer;
+    }
+    register() {
+        throw new Error('Must implement register');
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    handler(input) {
+        throw new Error('Must implement handler');
+    }
 }
 exports.Tool = Tool;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.6-experimental.0",
+    "version": "7.7.8-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -10,7 +10,6 @@
         "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.9.2",
-        "@modelcontextprotocol/sdk": "1.13.3",
         "archiver": "7.0.1",
         "boxen": "8.0.1",
         "chalk": "4.1.2",
@@ -62,7 +61,8 @@
         "typescript": "^5.6.2"
     },
     "optionalDependencies": {
-        "@hubspot/cms-dev-server": "^1.0.9"
+        "@hubspot/cms-dev-server": "^1.0.9",
+        "@modelcontextprotocol/sdk": "1.13.3"
     },
     "scripts": {
         "build": "ts-node ./scripts/build.ts",