@hubspot/cli 7.7.34-experimental.0 → 7.8.0-experimental.0

package/lib/hasFeature.js

@@ -1,13 +1,7 @@
 import { http } from '@hubspot/local-dev-lib/http';
 import { fetchEnabledFeatures } from '@hubspot/local-dev-lib/api/localDevAuth';
-import { FEATURES } from './constants.js';
-const FEATURES_THAT_DEFAULT_ON = [FEATURES.APPS_HOME];
 export async function hasFeature(accountId, feature) {
     const { data: { enabledFeatures }, } = await fetchEnabledFeatures(accountId);
-    if (enabledFeatures[feature] === undefined &&
-        FEATURES_THAT_DEFAULT_ON.includes(feature)) {
-        return true;
-    }
     return Boolean(enabledFeatures[feature]);
 }
 export async function hasUnfiedAppsAccess(accountId) {

package/lib/mcp/setup.js

@@ -8,7 +8,7 @@ import path from 'path';
 import os from 'os';
 import fs from 'fs-extra';
 import { existsSync } from 'fs';
-const mcpServerName = 'HubSpot';
+const mcpServerName = 'hubspot-cli-mcp';
 const claudeCode = 'claude';
 const windsurf = 'windsurf';
 const cursor = 'cursor';

package/lib/projectProfiles.d.ts

@@ -4,4 +4,4 @@ export declare function logProfileHeader(profileName: string): void;
 export declare function logProfileFooter(profile: HsProfileFile, includeVariables?: boolean): void;
 export declare function loadProfile(projectConfig: ProjectConfig | null, projectDir: string | null, profileName: string): HsProfileFile | undefined;
 export declare function exitIfUsingProfiles(projectConfig: ProjectConfig | null, projectDir: string | null): Promise<void>;
-export declare function loadAndValidateProfile(projectConfig: ProjectConfig | null, projectDir: string | null, argsProfile: string | undefined, useEnv?: boolean): Promise<number | undefined>;
+export declare function loadAndValidateProfile(projectConfig: ProjectConfig | null, projectDir: string | null, argsProfile: string | undefined): Promise<number | undefined>;

package/lib/projectProfiles.js

@@ -38,12 +38,7 @@ export function loadProfile(projectConfig, projectDir, profileName) {
             uiLogger.error(lib.projectProfiles.loadProfile.errors.missingAccountId(profileFilename));
             return;
         }
-        return {
-            ...profile,
-            accountId: process.env.HUBSPOT_ACCOUNT_ID
-                ? Number(process.env.HUBSPOT_ACCOUNT_ID)
-                : profile.accountId,
-        };
+        return profile;
     }
     catch (e) {
         uiLogger.error(lib.projectProfiles.loadProfile.errors.failedToLoadProfile(profileFilename));
@@ -59,7 +54,7 @@ export async function exitIfUsingProfiles(projectConfig, projectDir) {
         }
     }
 }
-export async function loadAndValidateProfile(projectConfig, projectDir, argsProfile, useEnv = false) {
+export async function loadAndValidateProfile(projectConfig, projectDir, argsProfile) {
     if (argsProfile) {
         logProfileHeader(argsProfile);
         const profile = loadProfile(projectConfig, projectDir, argsProfile);
@@ -68,9 +63,6 @@ export async function loadAndValidateProfile(projectConfig, projectDir, argsProf
             process.exit(EXIT_CODES.ERROR);
         }
         logProfileFooter(profile, true);
-        if (useEnv) {
-            return Number(process.env.HUBSPOT_ACCOUNT_ID);
-        }
         return profile.accountId;
     }
     else {

package/lib/projects/create/v3.js

@@ -9,7 +9,7 @@ import { getConfigForPlatformVersion } from './legacy.js';
 import { logError } from '../../errorHandlers/index.js';
 import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { hasFeature } from '../../hasFeature.js';
-import { AppEventsKey, PagesKey, } from '@hubspot/project-parsing-lib/src/lib/constants.js';
+import { AppEventsKey } from '@hubspot/project-parsing-lib/src/lib/constants.js';
 export async function createV3App(providedAuth, providedDistribution) {
     let authType;
     if (providedAuth &&
@@ -51,7 +51,6 @@ export async function createV3App(providedAuth, providedDistribution) {
 }
 const componentTypeToGateMap = {
     [AppEventsKey]: FEATURES.APP_EVENTS,
-    [PagesKey]: FEATURES.APPS_HOME,
 };
 export async function calculateComponentTemplateChoices(components, authType, distribution, accountId, projectMetadata) {
     const enabledComponents = [];
@@ -89,7 +88,7 @@ export async function calculateComponentTemplateChoices(components, authType, di
         }
         if (disabledReasons.length > 0) {
             disabledComponents.push({
-                name: `[${chalk.yellow('DISABLED')}] ${template.label} -`,
+                name: `[${chalk.yellow('DISABLED')}] ${template.label}`,
                 value: template,
                 disabled: disabledReasons.join(' '),
             });

package/lib/projects/localDev/helpers/project.d.ts

@@ -6,7 +6,7 @@ export declare function createNewProjectForLocalDev(projectConfig: ProjectConfig
 export declare function createInitialBuildForNewProject(projectConfig: ProjectConfig, projectDir: string, targetAccountId: number, sendIR?: boolean, profile?: string): Promise<Build>;
 export declare function compareLocalProjectToDeployed(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number | undefined, localProjectNodes: {
     [key: string]: IntermediateRepresentationNodeLocalDev;
-}, profile?: string): Promise<void>;
+}): Promise<void>;
 export declare function isDeployedProjectUpToDateWithLocal(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number, localProjectNodes: {
     [key: string]: IntermediateRepresentationNodeLocalDev;
-}, profile?: string): Promise<boolean>;
+}): Promise<boolean>;

package/lib/projects/localDev/helpers/project.js

@@ -123,7 +123,7 @@ export async function createInitialBuildForNewProject(projectConfig, projectDir,
     }
     return initialUploadResult.buildResult;
 }
-export async function compareLocalProjectToDeployed(projectConfig, accountId, deployedBuildId, localProjectNodes, profile) {
+export async function compareLocalProjectToDeployed(projectConfig, accountId, deployedBuildId, localProjectNodes) {
     uiLogger.log('');
     if (!deployedBuildId) {
         uiLogger.error(lib.localDevHelpers.project.compareLocalProjectToDeployed.noDeployedBuild(projectConfig.name, uiAccountDescription(accountId)));
@@ -132,7 +132,7 @@ export async function compareLocalProjectToDeployed(projectConfig, accountId, de
     SpinniesManager.add('compareLocalProjectToDeployed', {
         text: lib.localDevHelpers.project.compareLocalProjectToDeployed.checking,
     });
-    const isUpToDate = await isDeployedProjectUpToDateWithLocal(projectConfig, accountId, deployedBuildId, localProjectNodes, profile);
+    const isUpToDate = await isDeployedProjectUpToDateWithLocal(projectConfig, accountId, deployedBuildId, localProjectNodes);
     if (isUpToDate) {
         SpinniesManager.succeed('compareLocalProjectToDeployed', {
             text: lib.localDevHelpers.project.compareLocalProjectToDeployed.upToDate,
@@ -144,11 +144,12 @@ export async function compareLocalProjectToDeployed(projectConfig, accountId, de
                 .notUpToDate,
         });
         uiLogger.log('');
-        uiLogger.log(lib.localDevHelpers.project.compareLocalProjectToDeployed.notUpToDateExplanation(profile));
+        uiLogger.log(lib.localDevHelpers.project.compareLocalProjectToDeployed
+            .notUpToDateExplanation);
         process.exit(EXIT_CODES.SUCCESS);
     }
 }
-export async function isDeployedProjectUpToDateWithLocal(projectConfig, accountId, deployedBuildId, localProjectNodes, profile) {
+export async function isDeployedProjectUpToDateWithLocal(projectConfig, accountId, deployedBuildId, localProjectNodes) {
     let tempDir = null;
     try {
         tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'hubspot-project-compare-'));
@@ -160,7 +161,7 @@ export async function isDeployedProjectUpToDateWithLocal(projectConfig, accountI
             projectSourceDir: deployedProjectSourceDir,
             platformVersion: projectConfig.platformVersion,
             accountId: accountId,
-        }, { profile });
+        }, {});
         return isDeepEqual(localProjectNodes, deployedProjectNodes, ['localDev']);
     }
     finally {

package/lib/projects/structure.d.ts

@@ -1,5 +1,5 @@
 import { ComponentTypes, Component, GenericComponentConfig, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects.js';
-import { IntermediateRepresentationNode, IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types.js';
+import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types.js';
 import { AppIRNode } from '../../types/ProjectComponents.js';
 export declare const CONFIG_FILES: {
     [k in ComponentTypes]: string;
@@ -15,4 +15,4 @@ export declare function getProjectComponentTypes(components: Array<Component>):
 export declare function getComponentUid(component?: Component | null): string | null;
 export declare function componentIsApp(component?: Component | null): component is Component<PublicAppComponentConfig | PrivateAppComponentConfig>;
 export declare function componentIsPublicApp(component?: Component | null): component is Component<PublicAppComponentConfig>;
-export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev | IntermediateRepresentationNode): component is AppIRNode;
+export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev): component is AppIRNode;

package/lib/projects/upload.d.ts

@@ -1,5 +1,4 @@
 import { FileResult } from 'tmp';
-import { IntermediateRepresentation } from '@hubspot/project-parsing-lib';
 import { ProjectConfig } from '../../types/Projects.js';
 type ProjectUploadCallbackFunction<T> = (accountId: number, projectConfig: ProjectConfig, tempFile: FileResult, buildId: number) => Promise<T>;
 type ProjectUploadResult<T> = {
@@ -21,5 +20,5 @@ type HandleProjectUploadArg<T> = {
 export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig): void;
 export declare function validateNoHSMetaMismatch(srcDir: string, projectConfig: ProjectConfig): Promise<void>;
-export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<IntermediateRepresentation | undefined>;
+export declare function handleTranslate(projectDir: string, projectConfig: ProjectConfig, accountId: number, skipValidation: boolean, profile: string | undefined): Promise<unknown>;
 export {};

package/lib/projects/upload.js

@@ -133,5 +133,4 @@ export async function handleTranslate(projectDir, projectConfig, accountId, skip
         }
         throw e;
     }
-    return undefined;
 }

package/lib/ui/SpinniesManager.js

@@ -7,10 +7,8 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 **/
-import readline from 'readline';
 import chalk from 'chalk';
-import cliCursor from 'cli-cursor';
-import { breakText, cleanStream, colorOptions, getLinesLength, purgeSpinnerOptions, purgeSpinnersOptions, SPINNERS, terminalSupportsUnicode, writeStream, prefixOptions, } from './spinniesUtils.js';
+import { colorOptions, purgeSpinnerOptions, purgeSpinnersOptions, SPINNERS, terminalSupportsUnicode, } from './spinniesUtils.js';
 function safeColor(text, color) {
     const chalkFn = chalk[color];
     if (typeof chalkFn === 'function') {
@@ -36,14 +34,10 @@ class SpinniesManager {
             succeedColor: 'green',
             failColor: 'red',
             spinner: terminalSupportsUnicode() ? SPINNERS.dots : SPINNERS.dashes,
-            disableSpins: false,
+            disableSpins: true,
             ...purgeSpinnersOptions(options),
         };
-        this.spin =
-            !this.options.disableSpins &&
-                !process.env.CI &&
-                process.stderr &&
-                process.stderr.isTTY;
+        this.spin = false;
         if (!this.hasAnySpinners()) {
             this.resetState();
         }
@@ -141,22 +135,7 @@ class SpinniesManager {
         status = status || 'spinning';
         this.spinners[name] = { ...this.spinners[name], ...options, status };
     }
-    updateSpinnerState() {
-        if (this.spin) {
-            if (this.currentInterval) {
-                clearInterval(this.currentInterval);
-            }
-            this.currentInterval = this.loopStream();
-            if (!this.isCursorHidden) {
-                cliCursor.hide();
-            }
-            this.isCursorHidden = true;
-            this.checkIfActiveSpinners();
-        }
-        else {
-            this.setRawStreamOutput();
-        }
-    }
+    updateSpinnerState() { }
     loopStream() {
         const frames = this.options.spinner?.frames || SPINNERS.dots.frames;
         const interval = this.options.spinner?.interval || SPINNERS.dots.interval;
@@ -168,86 +147,10 @@ class SpinniesManager {
                     : ++this.currentFrameIndex;
         }, interval);
     }
-    setStreamOutput(frame = '') {
-        let output = '';
-        const linesLength = [];
-        const hasActiveSpinners = this.hasActiveSpinners();
-        Object.values(this.spinners).forEach(spinner => {
-            let { text } = spinner;
-            const { status, color, spinnerColor, succeedColor, failColor, indent = 0, succeedPrefix = prefixOptions(this.options).succeedPrefix, failPrefix = prefixOptions(this.options).failPrefix, } = spinner;
-            let line;
-            let prefixLength = indent;
-            text = text ?? '';
-            if (status === 'spinning') {
-                prefixLength += frame.length + 1;
-                text = breakText(text, prefixLength);
-                const colorizedFrame = safeColor(frame, spinnerColor);
-                const colorizedText = safeColor(text, color);
-                line = `${colorizedFrame} ${colorizedText}`;
-            }
-            else {
-                if (status === 'succeed') {
-                    prefixLength += succeedPrefix.length + 1;
-                    if (hasActiveSpinners) {
-                        text = breakText(text, prefixLength);
-                    }
-                    const colorizedText = safeColor(text, succeedColor);
-                    line = `${chalk.green(succeedPrefix)} ${colorizedText}`;
-                }
-                else if (status === 'fail') {
-                    prefixLength += failPrefix.length + 1;
-                    if (hasActiveSpinners) {
-                        text = breakText(text, prefixLength);
-                    }
-                    const colorizedText = safeColor(text, failColor);
-                    line = `${chalk.red(failPrefix)} ${colorizedText}`;
-                }
-                else {
-                    if (hasActiveSpinners) {
-                        text = breakText(text, prefixLength);
-                    }
-                    line = safeColor(text, color);
-                }
-            }
-            linesLength.push(...getLinesLength(text, prefixLength));
-            output += indent ? `${' '.repeat(indent)}${line}\n` : `${line}\n`;
-        });
-        if (!hasActiveSpinners) {
-            readline.clearScreenDown(this.stream);
-        }
-        writeStream(this.stream, output, linesLength);
-        if (hasActiveSpinners) {
-            cleanStream(this.stream, linesLength);
-        }
-        this.lineCount = linesLength.length;
-    }
-    setRawStreamOutput() {
-        Object.values(this.spinners).forEach(i => {
-            process.stderr.write(`- ${i.text}\n`);
-        });
-    }
-    checkIfActiveSpinners() {
-        if (!this.hasActiveSpinners()) {
-            if (this.spin) {
-                this.setStreamOutput();
-                readline.moveCursor(this.stream, 0, this.lineCount);
-                if (this.currentInterval) {
-                    clearInterval(this.currentInterval);
-                }
-                this.isCursorHidden = false;
-                cliCursor.show();
-            }
-            this.spinners = {};
-        }
-    }
-    bindSigint() {
-        process.removeAllListeners('SIGINT');
-        process.on('SIGINT', () => {
-            cliCursor.show();
-            readline.moveCursor(process.stderr, 0, this.lineCount);
-            process.exit(0);
-        });
-    }
+    setStreamOutput(frame = '') { }
+    setRawStreamOutput() { }
+    checkIfActiveSpinners() { }
+    bindSigint() { }
 }
 const toExport = new SpinniesManager();
 export default toExport;

package/mcp-server/tools/cms/HsCreateFunctionTool.js

@@ -31,7 +31,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'create-cms-function';
+const toolName = 'create-hubspot-cms-function';
 export class HsCreateFunctionTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

package/mcp-server/tools/cms/HsCreateModuleTool.js

@@ -47,7 +47,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'create-cms-module';
+const toolName = 'create-hubspot-cms-module';
 export class HsCreateModuleTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -23,7 +23,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'create-cms-template';
+const toolName = 'create-hubspot-cms-template';
 export class HsCreateTemplateTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -26,7 +26,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'get-cms-serverless-function-logs';
+const toolName = 'get-hubspot-cms-serverless-function-logs';
 export class HsFunctionLogsTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
@@ -69,7 +69,7 @@ export class HsFunctionLogsTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Get HubSpot CMS serverless function logs for an endpoint',
-            description: 'Retrieve logs for HubSpot CMS serverless functions. Use this tool to help debug issues with serverless functions by reading the production logs. Supports various options like latest, compact, and limiting results. Use after listing functions with list-cms-serverless-functions to get the endpoint path.',
+            description: 'Retrieve logs for HubSpot CMS serverless functions. Use this tool to help debug issues with serverless functions by reading the production logs. Supports various options like latest, compact, and limiting results. Use after listing functions with list-hubspot-cms-serverless-functions to get the endpoint path.',
             inputSchema,
         }, this.handler);
     }

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

@@ -18,7 +18,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'list-cms-serverless-functions';
+const toolName = 'list-hubspot-cms-serverless-functions';
 export class HsListFunctionsTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -18,7 +18,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'list-cms-remote-contents';
+const toolName = 'list-hubspot-cms-remote-contents';
 export class HsListTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -28,7 +28,7 @@ describe('HsCreateFunctionTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-cms-function', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-hubspot-cms-function', {
                 title: 'Create HubSpot CMS Serverless Function',
                 description: `Creates a new HubSpot CMS serverless function using the hs create function command. Functions can be created non-interactively by specifying functionsFolder, filename, and endpointPath. Supports all HTTP methods (${HTTP_METHODS.join(', ')}).`,
                 inputSchema: expect.any(Object),

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

@@ -27,7 +27,7 @@ describe('HsCreateModuleTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-cms-module', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-hubspot-cms-module', {
                 title: 'Create HubSpot CMS Module',
                 description: 'Creates a new HubSpot CMS module using the hs create module command. Modules can be created non-interactively by specifying moduleLabel and other module options. You can create either HubL or React modules by setting the reactType parameter.',
                 inputSchema: expect.any(Object),

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

@@ -28,7 +28,7 @@ describe('HsCreateTemplateTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-cms-template', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-hubspot-cms-template', {
                 title: 'Create HubSpot CMS Template',
                 description: `Creates a new HubSpot CMS template using the hs create template command. Templates can be created non-interactively by specifying templateType. Supports all template types including: ${TEMPLATE_TYPES.join(', ')}.`,
                 inputSchema: expect.any(Object),

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

@@ -27,9 +27,9 @@ describe('HsFunctionLogsTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-cms-serverless-function-logs', expect.objectContaining({
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-hubspot-cms-serverless-function-logs', expect.objectContaining({
                 title: 'Get HubSpot CMS serverless function logs for an endpoint',
-                description: 'Retrieve logs for HubSpot CMS serverless functions. Use this tool to help debug issues with serverless functions by reading the production logs. Supports various options like latest, compact, and limiting results. Use after listing functions with list-cms-serverless-functions to get the endpoint path.',
+                description: 'Retrieve logs for HubSpot CMS serverless functions. Use this tool to help debug issues with serverless functions by reading the production logs. Supports various options like latest, compact, and limiting results. Use after listing functions with list-hubspot-cms-serverless-functions to get the endpoint path.',
                 inputSchema: expect.any(Object),
             }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);

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

@@ -27,7 +27,7 @@ describe('HsListFunctionsTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-cms-serverless-functions', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-hubspot-cms-serverless-functions', {
                 title: 'List HubSpot CMS Serverless Functions',
                 description: 'Get a list of all serverless functions deployed in a HubSpot portal/account. Shows function routes, HTTP methods, secrets, and timestamps.',
                 inputSchema: expect.any(Object),

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

@@ -27,7 +27,7 @@ describe('HsListTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-cms-remote-contents', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-hubspot-cms-remote-contents', {
                 title: 'List HubSpot CMS Directory Contents',
                 description: 'List remote contents of a HubSpot CMS directory.',
                 inputSchema: expect.any(Object),

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

@@ -6,19 +6,19 @@ declare const inputSchemaZodObject: z.ZodObject<{
     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">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"app-event">, z.ZodLiteral<"scim">, z.ZodLiteral<"page">]>, "many">>;
+    features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"scim">]>, "many">>;
 }, "strip", z.ZodTypeAny, {
     absoluteProjectPath: string;
     addApp: boolean;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
-    features?: ("card" | "page" | "settings" | "app-event" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
+    features?: ("card" | "settings" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
 }, {
     absoluteProjectPath: string;
     addApp: boolean;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
-    features?: ("card" | "page" | "settings" | "app-event" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
+    features?: ("card" | "settings" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
 }>;
 export type AddFeatureInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class AddFeatureToProjectTool extends Tool<AddFeatureInputSchema> {

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

@@ -16,20 +16,20 @@ const inputSchema = {
         z.literal(APP_DISTRIBUTION_TYPES.MARKETPLACE),
         z.literal(APP_DISTRIBUTION_TYPES.PRIVATE),
     ]))
-        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your application on the HubSpot marketplace. '),
+        .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: z
         .optional(z.union([
         z.literal(APP_AUTH_TYPES.STATIC),
         z.literal(APP_AUTH_TYPES.OAUTH),
     ]))
-        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Static uses a static non changing authentication token, and is only available for private distribution. '),
+        .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,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'add-feature-to-project';
+const toolName = 'add-feature-to-hubspot-project';
 export class AddFeatureToProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -8,7 +8,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
     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">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"app-event">, z.ZodLiteral<"scim">, z.ZodLiteral<"page">]>, "many">>;
+    features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"scim">]>, "many">>;
 }, "strip", z.ZodTypeAny, {
     projectBase: "app" | "empty";
     absoluteCurrentWorkingDirectory: string;
@@ -16,7 +16,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
     name?: string | undefined;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
-    features?: ("card" | "page" | "settings" | "app-event" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
+    features?: ("card" | "settings" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
 }, {
     projectBase: "app" | "empty";
     absoluteCurrentWorkingDirectory: string;
@@ -24,7 +24,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
     name?: string | undefined;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
-    features?: ("card" | "page" | "settings" | "app-event" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
+    features?: ("card" | "settings" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
 }>;
 export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class CreateProjectTool extends Tool<CreateProjectInputSchema> {

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

@@ -10,11 +10,11 @@ const inputSchema = {
     absoluteCurrentWorkingDirectory,
     name: z
         .string()
-        .describe('If not specified by the user, DO NOT choose for them.  Changing this is potentially destructive.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: z
         .string()
-        .describe('DO NOT use the current directory unless the user has explicitly stated to do so. Relative path to the directory the project will be created in.'),
+        .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: z
         .union([z.literal(EMPTY_PROJECT), z.literal(PROJECT_WITH_APP)])
         .describe('Empty will create an empty project, and app will create a project with an app inside of it.'),
@@ -23,19 +23,19 @@ const inputSchema = {
         z.literal(APP_DISTRIBUTION_TYPES.MARKETPLACE),
         z.literal(APP_DISTRIBUTION_TYPES.PRIVATE),
     ]))
-        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your application on the HubSpot marketplace. '),
+        .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: z
         .optional(z.union([
         z.literal(APP_AUTH_TYPES.STATIC),
         z.literal(APP_AUTH_TYPES.OAUTH),
     ]))
-        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Static uses a static non changing authentication token, and is only available for private distribution. ')
+        .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,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'create-project';
+const toolName = 'create-hubspot-project';
 export class CreateProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -15,7 +15,7 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'deploy-project';
+const toolName = 'deploy-hubspot-project';
 export class DeployProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -12,7 +12,7 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'fetch-doc';
+const toolName = 'fetch-hubspot-doc';
 export class DocFetchTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
@@ -42,7 +42,7 @@ export class DocFetchTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Fetch HubSpot Developer Documentation (single file)',
-            description: 'Always use this immediately after `search-docs` and before creating a plan, writing code, or answering technical questions. This tool retrieves the full, authoritative content of a HubSpot Developer Documentation page from its URL, ensuring responses are accurate, up-to-date, and grounded in the official docs.',
+            description: 'Always use this immediately after `search-hubspot-docs` and before creating a plan, writing code, or answering technical questions. This tool retrieves the full, authoritative content of a HubSpot Developer Documentation page from its URL, ensuring responses are accurate, up-to-date, and grounded in the official docs.',
             inputSchema,
         }, this.handler);
     }

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

@@ -13,7 +13,7 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'search-docs';
+const toolName = 'search-hubspot-docs';
 export class DocsSearchTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
@@ -55,7 +55,7 @@ export class DocsSearchTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Search HubSpot Developer Documentation',
-            description: 'Use this first whenever you need details about HubSpot APIs, SDKs, integrations, or developer platform features. This searches the official HubSpot Developer Documentation and returns the most relevant pages, each with a URL for use in `fetch-doc`. Always follow this with a fetch to get the full, authoritative content before making plans or writing answers.',
+            description: 'Use this first whenever you need details about HubSpot APIs, SDKs, integrations, or developer platform features. This searches the official HubSpot Developer Documentation and returns the most relevant pages, each with a URL for use in `fetch-hubspot-doc`. Always follow this with a fetch to get the full, authoritative content before making plans or writing answers.',
             inputSchema,
         }, this.handler);
     }