@hubspot/cli 7.7.15-experimental.0 → 7.7.16-experimental.1

package/lib/projects/upload.js

@@ -4,22 +4,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleProjectUpload = handleProjectUpload;
+exports.validateSourceDirectory = validateSourceDirectory;
+exports.validateNoHSMetaMismatch = validateNoHSMetaMismatch;
+exports.handleTranslate = handleTranslate;
 const archiver_1 = __importDefault(require("archiver"));
 const tmp_1 = __importDefault(require("tmp"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const ignoreRules_1 = require("@hubspot/local-dev-lib/ignoreRules");
+const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const ui_1 = require("../ui");
-const exitCodes_1 = require("../enums/exitCodes");
-const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const errorHandlers_1 = require("../errorHandlers");
 const node_util_1 = __importDefault(require("node:util"));
 const en_1 = require("../../lang/en");
 const ensureProjectExists_1 = require("./ensureProjectExists");
 const logger_1 = require("../ui/logger");
 const buildAndDeploy_1 = require("./buildAndDeploy");
+const exitCodes_1 = require("../enums/exitCodes");
 async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
     SpinniesManager_1.default.init({});
     const accountIdentifier = (0, ui_1.uiAccountDescription)(accountId);
@@ -49,14 +52,18 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
 }
 async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, }) {
     const srcDir = path_1.default.resolve(projectDir, projectConfig.srcDir);
-    const filenames = fs_extra_1.default.readdirSync(srcDir);
-    if (!filenames || filenames.length === 0) {
-        logger_1.uiLogger.log(en_1.lib.projectUpload.handleProjectUpload.emptySource(projectConfig.srcDir));
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    try {
+        validateSourceDirectory(srcDir, projectConfig);
     }
-    const hasHsMetaFiles = await (0, project_parsing_lib_1.projectContainsHsMetaFiles)(srcDir);
-    if (!(0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion) && hasHsMetaFiles) {
-        logger_1.uiLogger.error(en_1.lib.projectUpload.wrongPlatformVersionMetaFiles);
+    catch (e) {
+        (0, errorHandlers_1.logError)(e);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    try {
+        await validateNoHSMetaMismatch(srcDir, projectConfig);
+    }
+    catch (e) {
+        (0, errorHandlers_1.logError)(e);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const tempFile = tmp_1.default.fileSync({ postfix: '.zip' });
@@ -68,21 +75,11 @@ async function handleProjectUpload({ accountId, projectConfig, projectDir, callb
         let intermediateRepresentation;
         if (sendIR) {
             try {
-                intermediateRepresentation = await (0, project_parsing_lib_1.translate)({
-                    projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
-                    platformVersion: projectConfig.platformVersion,
-                    accountId,
-                }, { skipValidation, profile });
-                logger_1.uiLogger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
+                intermediateRepresentation = await handleTranslate(projectDir, projectConfig, accountId, skipValidation, profile);
             }
             catch (e) {
-                if ((0, project_parsing_lib_1.isTranslationError)(e)) {
-                    logger_1.uiLogger.error(e.toString());
-                }
-                else {
-                    (0, errorHandlers_1.logError)(e);
-                }
-                return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+                (0, errorHandlers_1.logError)(e);
+                process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
         }
         await (0, ensureProjectExists_1.ensureProjectExists)(accountId, projectConfig.name, {
@@ -116,3 +113,40 @@ async function handleProjectUpload({ accountId, projectConfig, projectDir, callb
     archive.finalize();
     return result;
 }
+function validateSourceDirectory(srcDir, projectConfig) {
+    const filenames = fs_extra_1.default.readdirSync(srcDir);
+    if (!filenames || filenames.length === 0) {
+        const validationError = new Error(en_1.lib.projectUpload.handleProjectUpload.emptySource(projectConfig.srcDir));
+        validationError.name = 'ProjectValidationError';
+        throw validationError;
+    }
+}
+async function validateNoHSMetaMismatch(srcDir, projectConfig) {
+    const hasHsMetaFiles = await (0, project_parsing_lib_1.projectContainsHsMetaFiles)(srcDir);
+    if (!(0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion) && hasHsMetaFiles) {
+        const validationError = new Error(en_1.lib.projectUpload.wrongPlatformVersionMetaFiles);
+        validationError.name = 'ProjectValidationError';
+        throw validationError;
+    }
+}
+async function handleTranslate(projectDir, projectConfig, accountId, skipValidation, profile) {
+    try {
+        const intermediateRepresentation = await (0, project_parsing_lib_1.translate)({
+            projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
+            platformVersion: projectConfig.platformVersion,
+            accountId,
+        }, { skipValidation, profile });
+        logger_1.uiLogger.debug(node_util_1.default.inspect(intermediateRepresentation, false, null, true));
+        return intermediateRepresentation;
+    }
+    catch (e) {
+        if ((0, project_parsing_lib_1.isTranslationError)(e)) {
+            const validationError = new Error(e.toString());
+            validationError.name = 'ProjectValidationError';
+            throw validationError;
+        }
+        else {
+            (0, errorHandlers_1.logError)(e);
+        }
+    }
+}

package/lib/projects/urls.d.ts

@@ -1,3 +1,5 @@
+export declare function getProjectComponentDistributionUrl(projectName: string, componentName: string, accountId: number): string;
+export declare function getDeveloperOverviewUrl(accountId: number): string;
 export declare function getProjectDetailUrl(projectName: string, accountId: number): string | undefined;
 export declare function getProjectSettingsUrl(projectName: string, accountId: number): string | undefined;
 export declare function getProjectActivityUrl(projectName: string, accountId: number): string;

package/lib/projects/urls.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProjectComponentDistributionUrl = getProjectComponentDistributionUrl;
+exports.getDeveloperOverviewUrl = getDeveloperOverviewUrl;
 exports.getProjectDetailUrl = getProjectDetailUrl;
 exports.getProjectSettingsUrl = getProjectSettingsUrl;
 exports.getProjectActivityUrl = getProjectActivityUrl;
@@ -15,6 +17,14 @@ function getBaseUrl(accountId) {
 function getProjectHomeUrl(accountId) {
     return `${getBaseUrl(accountId)}/developer-projects/${accountId}`;
 }
+function getProjectComponentDistributionUrl(projectName, componentName, accountId) {
+    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)(accountId) === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
+    return `${baseUrl}/developer-projects/${accountId}/project/${projectName}/component/${componentName}/distribution`;
+}
+function getDeveloperOverviewUrl(accountId) {
+    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)(accountId) === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
+    return `${baseUrl}/developer-overview/${accountId}`;
+}
 function getProjectDetailUrl(projectName, accountId) {
     if (!projectName)
         return;

package/lib/prompts/createDeveloperTestAccountConfigPrompt.d.ts

@@ -0,0 +1,17 @@
+import { DeveloperTestAccountConfig } from '@hubspot/local-dev-lib/types/developerTestAccounts';
+declare const hubs: {
+    readonly MARKETING: "marketingLevel";
+    readonly OPS: "opsLevel";
+    readonly SERVICE: "serviceLevel";
+    readonly SALES: "salesLevel";
+    readonly CONTENT: "contentLevel";
+};
+type HubName = keyof typeof hubs;
+type HubTier = 'STARTER' | 'PROFESSIONAL' | 'ENTERPRISE';
+export type HubConfig = `${HubName}:${HubTier}`;
+export declare function createDeveloperTestAccountConfigPrompt(args?: {
+    name?: string;
+    description?: string;
+    tiers?: HubConfig[];
+}): Promise<DeveloperTestAccountConfig>;
+export {};

package/lib/prompts/createDeveloperTestAccountConfigPrompt.js

@@ -0,0 +1,96 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDeveloperTestAccountConfigPrompt = createDeveloperTestAccountConfigPrompt;
+const en_1 = require("../../lang/en");
+const promptUtils_1 = require("./promptUtils");
+const hubs = {
+    MARKETING: 'marketingLevel',
+    OPS: 'opsLevel',
+    SERVICE: 'serviceLevel',
+    SALES: 'salesLevel',
+    CONTENT: 'contentLevel',
+};
+const TEST_ACCOUNT_TIERS = [
+    { name: 'Marketing STARTER', value: 'MARKETING:STARTER' },
+    {
+        name: 'Marketing PROFESSIONAL',
+        value: 'MARKETING:PROFESSIONAL',
+    },
+    { name: 'Marketing ENTERPRISE', value: 'MARKETING:ENTERPRISE' },
+    promptUtils_1.Separator,
+    { name: 'Ops STARTER', value: 'OPS:STARTER' },
+    { name: 'Ops PROFESSIONAL', value: 'OPS:PROFESSIONAL' },
+    { name: 'Ops ENTERPRISE', value: 'OPS:ENTERPRISE' },
+    promptUtils_1.Separator,
+    { name: 'Service STARTER', value: 'SERVICE:STARTER' },
+    { name: 'Service PROFESSIONAL', value: 'SERVICE:PROFESSIONAL' },
+    { name: 'Service ENTERPRISE', value: 'SERVICE:ENTERPRISE' },
+    promptUtils_1.Separator,
+    { name: 'Sales STARTER', value: 'SALES:STARTER' },
+    { name: 'Sales PROFESSIONAL', value: 'SALES:PROFESSIONAL' },
+    { name: 'Sales ENTERPRISE', value: 'SALES:ENTERPRISE' },
+    promptUtils_1.Separator,
+    { name: 'Content STARTER', value: 'CONTENT:STARTER' },
+    { name: 'Content PROFESSIONAL', value: 'CONTENT:PROFESSIONAL' },
+    { name: 'Content ENTERPRISE', value: 'CONTENT:ENTERPRISE' },
+    promptUtils_1.Separator,
+];
+async function createDeveloperTestAccountConfigPrompt(args = {}) {
+    const { name, description, tiers } = args;
+    let accountName = name;
+    let accountDescription = description;
+    let accountLevelsArray = tiers;
+    if (!accountName) {
+        const namePromptResult = await (0, promptUtils_1.promptUser)({
+            name: 'accountName',
+            message: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.namePrompt,
+            type: 'input',
+        });
+        accountName = namePromptResult.accountName;
+    }
+    if (!accountDescription) {
+        const descriptionPromptResult = await (0, promptUtils_1.promptUser)({
+            name: 'description',
+            message: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.descriptionPrompt,
+            type: 'input',
+        });
+        accountDescription = descriptionPromptResult.description;
+    }
+    if (!accountLevelsArray) {
+        const accountLevelsPromptResult = await (0, promptUtils_1.promptUser)({
+            name: 'testAccountLevels',
+            message: en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.tiersPrompt,
+            type: 'checkbox',
+            choices: TEST_ACCOUNT_TIERS,
+            validate: choices => {
+                if (choices?.length > 1) {
+                    const hubMap = {};
+                    for (const choice of choices) {
+                        const hub = choice.split(':')[0];
+                        if (hubMap[hub]) {
+                            return en_1.lib.prompts.createDeveloperTestAccountConfigPrompt.errors
+                                .tiersError;
+                        }
+                        hubMap[hub] = true;
+                    }
+                }
+                return true;
+            },
+        });
+        accountLevelsArray = accountLevelsPromptResult.testAccountLevels;
+    }
+    if (!accountLevelsArray) {
+        accountLevelsArray = [];
+    }
+    const accountLevels = accountLevelsArray.reduce((acc, level) => {
+        const [hubName, hubTier] = level.split(':');
+        const hubLevel = hubs[hubName];
+        acc[hubLevel] = hubTier;
+        return acc;
+    }, {});
+    return {
+        accountName: accountName,
+        description: accountDescription,
+        ...accountLevels,
+    };
+}

package/lib/prompts/installAppPrompt.d.ts

@@ -1 +1,2 @@
-export declare function installAppPrompt(installUrl: string, isReinstall?: boolean): Promise<void>;
+export declare function installAppBrowserPrompt(installUrl: string, isReinstall?: boolean): Promise<void>;
+export declare function installAppAutoPrompt(): Promise<boolean>;

package/lib/prompts/installAppPrompt.js

@@ -3,13 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installAppPrompt = installAppPrompt;
+exports.installAppBrowserPrompt = installAppBrowserPrompt;
+exports.installAppAutoPrompt = installAppAutoPrompt;
 const open_1 = __importDefault(require("open"));
 const promptUtils_1 = require("./promptUtils");
 const exitCodes_1 = require("../enums/exitCodes");
 const en_1 = require("../../lang/en");
 const logger_1 = require("../ui/logger");
-async function installAppPrompt(installUrl, isReinstall = false) {
+async function installAppBrowserPrompt(installUrl, isReinstall = false) {
     logger_1.uiLogger.log('');
     if (isReinstall) {
         logger_1.uiLogger.log(en_1.lib.prompts.installAppPrompt.reinstallExplanation);
@@ -33,3 +34,12 @@ async function installAppPrompt(installUrl, isReinstall = false) {
     }
     (0, open_1.default)(installUrl);
 }
+async function installAppAutoPrompt() {
+    logger_1.uiLogger.log('');
+    const { shouldInstall } = await (0, promptUtils_1.promptUser)({
+        name: 'shouldInstall',
+        type: 'confirm',
+        message: en_1.lib.prompts.installAppPrompt.autoPrompt,
+    });
+    return shouldInstall;
+}

package/lib/prompts/promptUtils.d.ts

@@ -1,4 +1,5 @@
 import { PromptConfig, GenericPromptResponse, PromptWhen, PromptChoices } from '../../types/Prompts';
+export declare const Separator: any;
 export declare function promptUser<T extends GenericPromptResponse>(config: PromptConfig<T> | PromptConfig<T>[]): Promise<T>;
 export declare function confirmPrompt(message: string, options?: {
     defaultAnswer?: boolean;

package/lib/prompts/promptUtils.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Separator = void 0;
 exports.promptUser = promptUser;
 exports.confirmPrompt = confirmPrompt;
 exports.listPrompt = listPrompt;
 exports.inputPrompt = inputPrompt;
 const inquirer = require('inquirer');
 const promptModule = inquirer.createPromptModule();
+exports.Separator = new inquirer.Separator();
 function promptUser(config) {
     return promptModule(config);
 }

package/lib/ui/logger.d.ts

@@ -7,4 +7,5 @@ export declare const uiLogger: {
     debug: (...args: any[]) => void;
     group: (message: string) => void;
     groupEnd: () => void;
+    json: (json: object) => void;
 };

package/lib/ui/logger.js

@@ -12,4 +12,5 @@ exports.uiLogger = {
     debug: logger_1.logger.debug,
     group: (message) => logger_1.logger.group(message),
     groupEnd: () => logger_1.logger.groupEnd(),
+    json: (json) => console.log(JSON.stringify(json, null, 2)),
 };

package/lib/yargsUtils.d.ts

@@ -10,4 +10,5 @@ export declare function makeYargsBuilder<T>(callback: (yargs: Argv) => Argv<T>,
         read?: boolean;
         write?: boolean;
     };
+    useJSONOutputOptions?: boolean;
 }): (yargs: Argv) => Promise<Argv<T>>;

package/lib/yargsUtils.js

@@ -32,6 +32,9 @@ function makeYargsBuilder(callback, command, describe, options = {}) {
         if (options.useTestingOptions) {
             (0, commonOpts_1.addTestingOptions)(yargs);
         }
+        if (options.useJSONOutputOptions) {
+            (0, commonOpts_1.addJSONOutputOptions)(yargs);
+        }
         if (options.useCmsPublishModeOptions) {
             const opts = typeof options.useCmsPublishModeOptions === 'object'
                 ? options.useCmsPublishModeOptions

package/mcp-server/tools/index.js

@@ -6,6 +6,7 @@ const CreateProjectTool_1 = require("./project/CreateProjectTool");
 const GuidedWalkthroughTool_1 = require("./project/GuidedWalkthroughTool");
 const DeployProject_1 = require("./project/DeployProject");
 const AddFeatureToProject_1 = require("./project/AddFeatureToProject");
+const ValidateProjectTool_1 = require("./project/ValidateProjectTool");
 function registerProjectTools(mcpServer) {
     return [
         new UploadProjectTools_1.UploadProjectTools(mcpServer).register(),
@@ -13,5 +14,6 @@ function registerProjectTools(mcpServer) {
         new GuidedWalkthroughTool_1.GuidedWalkthroughTool(mcpServer).register(),
         new DeployProject_1.DeployProject(mcpServer).register(),
         new AddFeatureToProject_1.AddFeatureToProject(mcpServer).register(),
+        new ValidateProjectTool_1.ValidateProjectTool(mcpServer).register(),
     ];
 }

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

@@ -7,11 +7,12 @@ const constants_1 = require("../../../lib/constants");
 const command_1 = require("../../utils/command");
 const constants_2 = require("./constants");
 const project_1 = require("../../utils/project");
+const content_1 = require("../../utils/content");
 const inputSchema = {
     absoluteProjectPath: constants_2.absoluteProjectPath,
     addApp: zod_1.z
         .boolean()
-        .describe('Should an app be added?  If there is no app in the project, and app must be added to add a feature'),
+        .describe('Should an app be added?  If there is no app in the project, an app must be added to add a feature'),
     distribution: zod_1.z
         .optional(zod_1.z.union([
         zod_1.z.literal(constants_1.APP_DISTRIBUTION_TYPES.MARKETPLACE),
@@ -51,19 +52,13 @@ class AddFeatureToProject extends types_1.Tool {
                 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}`,
-                });
+                content.push((0, content_1.formatTextContent)(`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}`,
-                });
+                content.push((0, content_1.formatTextContent)(`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 {
@@ -73,28 +68,10 @@ class AddFeatureToProject extends types_1.Tool {
             // 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,
-                    },
-                ],
-            };
+            return (0, content_1.formatTextContents)(stdout, stderr);
         }
         catch (error) {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: error instanceof Error ? error.message : `${error}`,
-                    },
-                ],
-            };
+            return (0, content_1.formatTextContents)(error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

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

@@ -3,26 +3,26 @@ import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: z.ZodString;
-    name: z.ZodString;
+    name: z.ZodOptional<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;
+    name?: string | 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;
+    name?: string | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "app-function" | "webhooks")[] | undefined;
 }>;

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

@@ -8,17 +8,19 @@ 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 content_1 = require("../../utils/content");
 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.'),
+        .describe('The name of the project to be created.  This name is how your project will appear in HubSpot. If not specified by the user, do not choose for them.  Changing this is potentially destructive.')
+        .optional(),
     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'),
+        .describe('Relative path to the directory the project will be created in. DO NOT use the current directory unless the user has explicitly stated to do so.'),
     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.'),
+        .describe('Empty will create an 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),
@@ -55,6 +57,9 @@ class CreateProjectTool extends types_1.Tool {
         if (name) {
             command = (0, command_1.addFlag)(command, 'name', name);
         }
+        else {
+            content.push((0, content_1.formatTextContent)(`Ask the user what they would like to name the project.`));
+        }
         if (destination) {
             command = (0, command_1.addFlag)(command, 'dest', destination);
         }
@@ -65,19 +70,13 @@ class CreateProjectTool extends types_1.Tool {
             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}`,
-            });
+            content.push((0, content_1.formatTextContent)(`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}`,
-            });
+            content.push((0, content_1.formatTextContent)(`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 {
@@ -88,28 +87,10 @@ class CreateProjectTool extends types_1.Tool {
         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,
-                    },
-                ],
-            };
+            return (0, content_1.formatTextContents)(stdout, stderr);
         }
         catch (error) {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: error instanceof Error ? error.message : `${error}`,
-                    },
-                ],
-            };
+            return (0, content_1.formatTextContents)(error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

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

@@ -6,6 +6,7 @@ const zod_1 = require("zod");
 const command_1 = require("../../utils/command");
 const constants_1 = require("./constants");
 const project_1 = require("../../utils/project");
+const content_1 = require("../../utils/content");
 const inputSchema = {
     absoluteProjectPath: constants_1.absoluteProjectPath,
     buildNumber: zod_1.z
@@ -25,10 +26,7 @@ class DeployProject extends types_1.Tool {
         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}`,
-            });
+            content.push((0, content_1.formatTextContent)(`Ask the user which build number they would like to deploy?  Build information: ${stdout}`));
         }
         else {
             command = (0, command_1.addFlag)(command, 'build', buildNumber);
@@ -39,17 +37,12 @@ class DeployProject extends types_1.Tool {
             };
         }
         const { stdout, stderr } = await (0, project_1.runCommandInDir)(absoluteProjectPath, command);
-        return {
-            content: [
-                { type: 'text', text: stdout },
-                { type: 'text', text: stderr },
-            ],
-        };
+        return (0, content_1.formatTextContents)(stdout, 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',
+            description: 'Takes a build number and a project name and deploys that build of the project. DO NOT run this tool unless the user specifies they would like to deploy the project.',
             inputSchema,
         }, this.handler);
     }

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

@@ -4,6 +4,7 @@ exports.GuidedWalkthroughTool = void 0;
 const types_1 = require("../../types");
 const zod_1 = require("zod");
 const command_1 = require("../../utils/command");
+const content_1 = require("../../utils/content");
 const nextCommands = {
     'hs init': 'hs auth',
     'hs auth': 'hs project create',
@@ -32,23 +33,9 @@ class GuidedWalkthroughTool extends types_1.Tool {
     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 (0, content_1.formatTextContents)(`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?',
-                },
-            ],
-        };
+        return (0, content_1.formatTextContents)('Is there another command you would like to learn more about?');
     }
     register() {
         return this.mcpServer.registerTool('guided-walkthrough-hubspot-cli', {