@hubspot/cli 7.9.0-beta.0 → 7.9.0-beta.2

package/lib/projects/create/v2.js

@@ -1,8 +1,6 @@
-import { Separator } from '@inquirer/prompts';
 import { marketplaceDistribution, oAuth, privateDistribution, staticAuth, EMPTY_PROJECT, PROJECT_WITH_APP, FEATURES, } from '../../constants.js';
 import { commands, lib } from '../../../lang/en.js';
 import { listPrompt } from '../../prompts/promptUtils.js';
-import chalk from 'chalk';
 import { isV2Project } from '../platformVersion.js';
 import path from 'path';
 import { getConfigForPlatformVersion } from './legacy.js';
@@ -75,25 +73,27 @@ export async function calculateComponentTemplateChoices(components, authType, di
         if (Array.isArray(supportedAuthTypes) &&
             authType &&
             !supportedAuthTypes.includes(authType.toLowerCase())) {
-            disabledReasons.push(commands.project.add.error.authTypeNotAllowed(authType));
+            const supportedAuthTypesString = supportedAuthTypes.join(', ');
+            disabledReasons.push(commands.project.add.error.authTypeNotAllowed(supportedAuthTypesString));
         }
         if (Array.isArray(supportedDistributions) &&
             distribution &&
             !supportedDistributions.includes(distribution.toLowerCase())) {
-            disabledReasons.push(commands.project.add.error.distributionNotAllowed(distribution));
+            const supportedDistributionsString = supportedDistributions.join(', ');
+            disabledReasons.push(commands.project.add.error.distributionNotAllowed(supportedDistributionsString));
         }
         const templateGate = componentTypeToGateMap[template.cliSelector || template.type];
         if (templateGate) {
             const isUngated = await hasFeature(accountId, templateGate);
             if (!isUngated) {
-                disabledReasons.unshift(commands.project.add.error.portalDoesNotHaveAccessToThisFeature(accountId));
+                disabledReasons.unshift(commands.project.add.error.portalDoesNotHaveAccessToThisFeature());
             }
         }
         if (disabledReasons.length > 0) {
             disabledComponents.push({
-                name: `[${chalk.yellow('DISABLED')}] ${template.label} -`,
+                name: `${template.label} [${template.cliSelector || template.type}]`,
                 value: template,
-                disabled: disabledReasons.join(' '),
+                disabled: `– ${disabledReasons.join(' ')}`,
             });
         }
         else {
@@ -104,12 +104,7 @@ export async function calculateComponentTemplateChoices(components, authType, di
         }
     }
     return disabledComponents.length
-        ? [
-            ...enabledComponents,
-            new Separator(),
-            ...disabledComponents,
-            new Separator(),
-        ]
+        ? [...enabledComponents, ...disabledComponents]
         : [...enabledComponents];
 }
 export async function v2ComponentFlow(platformVersion, projectBase, providedAuth, providedDistribution, accountId) {

package/lib/projects/localDev/AppDevModeInterface.d.ts

@@ -26,6 +26,7 @@ declare class AppDevModeInterface {
     private autoInstallStaticAuthApp;
     private installAppOrOpenInstallUrl;
     private checkTestAccountAppInstallation;
+    private validateOauthAppRedirectUrl;
     private resolveAppInstallPromise;
     private handleAppInstallSuccessDevServerMessage;
     private handleAppInstallInitiatedDevServerMessage;

package/lib/projects/localDev/AppDevModeInterface.js

@@ -13,6 +13,7 @@ import { uiLogger } from '../../ui/logger.js';
 import { getOauthAppInstallUrl, getStaticAuthAppInstallUrl, } from '../../app/urls.js';
 import { isDeveloperTestAccount, isSandbox } from '../../accountTypes.js';
 import SpinniesManager from '../../ui/SpinniesManager.js';
+import { isServerRunningAtUrl } from '../../http.js';
 class AppDevModeInterface {
     localDevState;
     localDevLogger;
@@ -214,6 +215,18 @@ class AppDevModeInterface {
         }
         return { needsInstall: !isInstalledWithScopeGroups, isReinstall };
     }
+    async validateOauthAppRedirectUrl() {
+        const redirectUrl = this.appNode?.config.auth.redirectUrls[0];
+        if (!redirectUrl) {
+            return;
+        }
+        const serverIsRunningAtRedirectUrl = await isServerRunningAtUrl(redirectUrl);
+        if (!serverIsRunningAtRedirectUrl) {
+            uiLogger.log('');
+            uiLogger.error(lib.AppDevModeInterface.oauthAppRedirectUrlError(redirectUrl));
+            process.exit(EXIT_CODES.ERROR);
+        }
+    }
     resolveAppInstallPromise() {
         if (this.appInstallResolve) {
             this.appInstallResolve();
@@ -284,6 +297,9 @@ class AppDevModeInterface {
                         failColor: 'white',
                     });
                 }
+                if (this.isOAuthApp()) {
+                    await this.validateOauthAppRedirectUrl();
+                }
                 this.localDevState.addListener('devServerMessage', this.onDevServerMessage);
                 await this.installAppOrOpenInstallUrl(isReinstall || false);
             }

package/lib/projects/localDev/LocalDevLogger.js

@@ -1,7 +1,7 @@
 import { getAccountId, hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
 import { getConfigDefaultAccount } from '@hubspot/local-dev-lib/config';
 import { uiLogger } from '../../ui/logger.js';
-import { uiBetaTag, uiLine, uiAccountDescription, uiCommandReference, } from '../../ui/index.js';
+import { uiLine, uiAccountDescription, uiCommandReference, } from '../../ui/index.js';
 import { lib } from '../../../lang/en.js';
 import SpinniesManager from '../../ui/SpinniesManager.js';
 import { logError } from '../../errorHandlers/index.js';
@@ -75,7 +75,7 @@ class LocalDevLogger {
         if (!this.state.debug) {
             console.clear();
         }
-        uiBetaTag(lib.LocalDevManager.betaMessage);
+        uiLogger.log(lib.LocalDevManager.headerMessage);
         uiLogger.log(lib.LocalDevManager.learnMoreLocalDevServer);
         uiLogger.log('');
         uiLogger.log(lib.LocalDevManager.running(this.state.projectConfig.name, uiAccountDescription(this.state.targetProjectAccountId)));

package/lib/projects/localDev/LocalDevManager_DEPRECATED.js

@@ -11,7 +11,7 @@ import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { getAccountHomeUrl } from '../urls.js';
 import { componentIsApp, componentIsPublicApp, CONFIG_FILES, getAppCardConfigs, getComponentUid, } from '../structure.js';
 import { ComponentTypes, } from '../../../types/Projects.js';
-import { UI_COLORS, uiCommandReference, uiAccountDescription, uiBetaTag, uiLink, uiLine, } from '../../ui/index.js';
+import { UI_COLORS, uiCommandReference, uiAccountDescription, uiLink, uiLine, } from '../../ui/index.js';
 import { logError } from '../../errorHandlers/index.js';
 import { installAppBrowserPrompt } from '../../prompts/installAppPrompt.js';
 import { confirmPrompt } from '../../prompts/promptUtils.js';
@@ -131,8 +131,8 @@ class LocalDevManager {
         else if (!this.debug) {
             console.clear();
         }
-        uiBetaTag(lib.LocalDevManager.betaMessage);
-        uiLogger.log(uiLink(lib.LocalDevManager.learnMoreLocalDevServer, 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'));
+        uiLogger.log(lib.LocalDevManager.headerMessage);
+        uiLogger.log(uiLink(lib.LocalDevManager.learnMoreLocalDevServer, 'https://developers.hubspot.com/docs/developer-tooling/local-development/hubspot-cli/project-commands'));
         uiLogger.log('');
         uiLogger.log(chalk.hex(UI_COLORS.SORBET)(lib.LocalDevManager.running(this.projectConfig.name, uiAccountDescription(this.targetAccountId))));
         uiLogger.log(lib.LocalDevManager.viewProjectLink(this.projectConfig.name, this.targetProjectAccountId));

package/lib/projects/localDev/LocalDevWebsocketServer.js

@@ -6,7 +6,7 @@ import { LOCAL_DEV_UI_MESSAGE_SEND_TYPES, LOCAL_DEV_SERVER_MESSAGE_TYPES, CONFIG
 import { lib } from '../../../lang/en.js';
 import { removeAnsiCodes } from '../../ui/removeAnsiCodes.js';
 import { isDeployWebsocketMessage, isViewedWelcomeScreenWebsocketMessage, isUploadWebsocketMessage, isAppInstallFailureWebsocketMessage, isAppInstallSuccessWebsocketMessage, isAppInstallInitiatedWebsocketMessage, } from './localDevWebsocketServerUtils.js';
-import pkg from '../../../package.json' with { type: 'json' };
+import { pkg } from '../../jsonLoader.js';
 const LOCAL_DEV_WEBSOCKET_SERVER_VERSION = 2;
 const LOG_PREFIX = '[LocalDevWebsocketServer]';
 const DOMAINS = ['hubspot.com', 'hubspotqa.com'];

package/lib/prompts/promptUtils.d.ts

@@ -6,6 +6,14 @@ export declare const PROMPT_THEME: {
         idle: string;
     };
 };
+export declare const CHECKBOX_PROMPT_THEME: {
+    prefix: {
+        idle: string;
+    };
+    style: {
+        disabledChoice: (text: string) => string;
+    };
+};
 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

@@ -5,6 +5,12 @@ import { lib } from '../../lang/en.js';
 import { uiLogger } from '../ui/logger.js';
 export const Separator = new _Separator();
 export const PROMPT_THEME = { prefix: { idle: chalk.green('?') } };
+export const CHECKBOX_PROMPT_THEME = {
+    prefix: { idle: chalk.green('?') },
+    style: {
+        disabledChoice: (text) => chalk.dim(` ◯ ${text}`),
+    },
+};
 function isUserCancellationError(error) {
     return error instanceof Error && error.name === 'ExitPromptError';
 }
@@ -147,7 +153,7 @@ function handleCheckboxPrompt(config) {
         pageSize: config.pageSize,
         validate: config.validate,
         loop: config.loop,
-        theme: PROMPT_THEME,
+        theme: CHECKBOX_PROMPT_THEME,
         shortcuts: {
             invert: null,
         },

package/lib/prompts/selectProjectTemplatePrompt.js

@@ -1,6 +1,7 @@
 import { Separator } from '@inquirer/prompts';
 import { promptUser } from './promptUtils.js';
 import { lib } from '../../lang/en.js';
+import { uiLogger } from '../ui/logger.js';
 function findTemplateByNameOrLabel(projectTemplates, templateNameOrLabel) {
     return projectTemplates.find(t => t.name === templateNameOrLabel || t.label === templateNameOrLabel);
 }
@@ -55,6 +56,9 @@ export async function selectProjectTemplatePrompt(promptOptions, projectTemplate
             pageSize: componentTemplates?.length,
         },
     ]);
+    if (result.componentTemplates?.length === 0) {
+        uiLogger.log(lib.projects.add.nothingAdded);
+    }
     if (!result.componentTemplates) {
         result.componentTemplates = selectedComponents;
     }

package/lib/sandboxSync.js

@@ -85,7 +85,7 @@ export async function syncSandbox(accountConfig, parentAccountConfig, env, syncT
         else if (isSpecifiedError(err, {
             statusCode: 404,
         })) {
-            uiCommandDisabledBanner('hs sandbox sync', 'https://app.hubspot.com/l/docs/guides/crm/project-cli-commands#developer-projects-cli-commands-beta');
+            uiCommandDisabledBanner('hs sandbox sync', 'https://developers.hubspot.com/docs/developer-tooling/local-development/hubspot-cli/project-commands');
         }
         else {
             logError(err, new ApiErrorContext({

package/lib/usageTracking.js

@@ -2,9 +2,9 @@ import { trackUsage } from '@hubspot/local-dev-lib/trackUsage';
 import { isTrackingAllowed, getAccountConfig, } from '@hubspot/local-dev-lib/config';
 import { API_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
 import { uiLogger } from './ui/logger.js';
-import packageJson from '../package.json' with { type: 'json' };
-const version = packageJson.version;
+import { pkg } from './jsonLoader.js';
 import { debugError } from './errorHandlers/index.js';
+const version = pkg.version;
 export const EventClass = {
     USAGE: 'USAGE',
     INTERACTION: 'INTERACTION',

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

@@ -80,10 +80,10 @@ export class HsCreateFunctionTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(stdout, stderr);
+            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
-            return formatTextContents(error instanceof Error ? error.message : `${error}`);
+            return formatTextContents(absoluteCurrentWorkingDirectory, error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

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

@@ -102,10 +102,10 @@ export class HsCreateModuleTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(stdout, stderr);
+            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
-            return formatTextContents(error instanceof Error ? error.message : `${error}`);
+            return formatTextContents(absoluteCurrentWorkingDirectory, error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

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

@@ -59,10 +59,10 @@ export class HsCreateTemplateTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(stdout, stderr);
+            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
-            return formatTextContents(error instanceof Error ? error.message : `${error}`);
+            return formatTextContents(absoluteCurrentWorkingDirectory, error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {

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

@@ -52,18 +52,11 @@ export class HsFunctionLogsTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(stdout, stderr);
+            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: `Error executing hs logs command: ${errorMessage}`,
-                    },
-                ],
-            };
+            return formatTextContents(absoluteCurrentWorkingDirectory, `Error executing hs logs command: ${errorMessage}`);
         }
     }
     register() {

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

@@ -34,7 +34,7 @@ export class HsListFunctionsTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(stdout, stderr);
+            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);

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

@@ -34,7 +34,7 @@ export class HsListTool extends Tool {
         }
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(stdout, stderr);
+            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : String(error);

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

@@ -2,13 +2,15 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsCreateFunctionTool } from '../HsCreateFunctionTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
-import { HTTP_METHODS } from '../../../../types/Cms.js';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking', () => ({
     trackToolUsage: vi.fn(),
 }));
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('HsCreateFunctionTool', () => {
@@ -23,16 +25,17 @@ describe('HsCreateFunctionTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new HsCreateFunctionTool(mockMcpServer);
     });
     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-cms-function', expect.objectContaining({
                 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(', ')}).`,
+                description: expect.stringContaining('Creates a new HubSpot CMS serverless function'),
                 inputSchema: expect.any(Object),
-            }, expect.any(Function));
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });

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

@@ -2,12 +2,15 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsCreateModuleTool } from '../HsCreateModuleTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking', () => ({
     trackToolUsage: vi.fn(),
 }));
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('HsCreateModuleTool', () => {
@@ -22,16 +25,17 @@ describe('HsCreateModuleTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new HsCreateModuleTool(mockMcpServer);
     });
     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-cms-module', expect.objectContaining({
                 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.',
+                description: expect.stringContaining('Creates a new HubSpot CMS module'),
                 inputSchema: expect.any(Object),
-            }, expect.any(Function));
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });

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

@@ -2,13 +2,15 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsCreateTemplateTool } from '../HsCreateTemplateTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
-import { TEMPLATE_TYPES } from '../../../../types/Cms.js';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking', () => ({
     trackToolUsage: vi.fn(),
 }));
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('HsCreateTemplateTool', () => {
@@ -23,16 +25,17 @@ describe('HsCreateTemplateTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new HsCreateTemplateTool(mockMcpServer);
     });
     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-cms-template', expect.objectContaining({
                 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(', ')}.`,
+                description: expect.stringContaining('Creates a new HubSpot CMS template'),
                 inputSchema: expect.any(Object),
-            }, expect.any(Function));
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });

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

@@ -2,12 +2,15 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsFunctionLogsTool } from '../HsFunctionLogsTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking', () => ({
     trackToolUsage: vi.fn(),
 }));
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('HsFunctionLogsTool', () => {
@@ -22,6 +25,7 @@ describe('HsFunctionLogsTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new HsFunctionLogsTool(mockMcpServer);
     });
     describe('register', () => {
@@ -29,7 +33,7 @@ describe('HsFunctionLogsTool', () => {
             const result = tool.register();
             expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-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: expect.stringContaining('Retrieve logs for HubSpot CMS serverless functions'),
                 inputSchema: expect.any(Object),
             }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);

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

@@ -2,12 +2,15 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsListFunctionsTool } from '../HsListFunctionsTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking', () => ({
     trackToolUsage: vi.fn(),
 }));
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('HsListFunctionsTool', () => {
@@ -22,16 +25,18 @@ describe('HsListFunctionsTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new HsListFunctionsTool(mockMcpServer);
     });
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-cms-serverless-functions', {
+            // First assertion - verify original description
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-cms-serverless-functions', expect.objectContaining({
                 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.',
+                description: expect.stringContaining('Get a list of all serverless functions deployed in a HubSpot portal/account'),
                 inputSchema: expect.any(Object),
-            }, expect.any(Function));
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });

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

@@ -2,12 +2,15 @@ import { describe, it, expect, vi, beforeEach } from 'vitest';
 import { HsListTool } from '../HsListTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../utils/toolUsageTracking', () => ({
     trackToolUsage: vi.fn(),
 }));
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('HsListTool', () => {
@@ -22,16 +25,18 @@ describe('HsListTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new HsListTool(mockMcpServer);
     });
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-cms-remote-contents', {
+            // First assertion - verify original description
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-cms-remote-contents', expect.objectContaining({
                 title: 'List HubSpot CMS Directory Contents',
-                description: 'List remote contents of a HubSpot CMS directory.',
+                description: expect.stringContaining('List remote contents of a HubSpot CMS directory'),
                 inputSchema: expect.any(Object),
-            }, expect.any(Function));
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });

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

@@ -3,18 +3,21 @@ import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteProjectPath: z.ZodString;
+    absoluteCurrentWorkingDirectory: 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">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"app-event">, z.ZodLiteral<"scim">, z.ZodLiteral<"page">]>, "many">>;
 }, "strip", z.ZodTypeAny, {
     absoluteProjectPath: string;
+    absoluteCurrentWorkingDirectory: string;
     addApp: boolean;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
     features?: ("card" | "settings" | "page" | "app-event" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
 }, {
     absoluteProjectPath: string;
+    absoluteCurrentWorkingDirectory: string;
     addApp: boolean;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
@@ -23,7 +26,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 export type AddFeatureInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class AddFeatureToProjectTool extends Tool<AddFeatureInputSchema> {
     constructor(mcpServer: McpServer);
-    handler({ absoluteProjectPath, distribution, auth, features, addApp, }: AddFeatureInputSchema): Promise<TextContentResponse>;
+    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, distribution, auth, features, addApp, }: AddFeatureInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -2,12 +2,13 @@ import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, } from '../../../lib/constants.js';
 import { addFlag } from '../../utils/command.js';
-import { absoluteProjectPath, features } from './constants.js';
+import { absoluteCurrentWorkingDirectory, absoluteProjectPath, features, } from './constants.js';
 import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 const inputSchema = {
     absoluteProjectPath,
+    absoluteCurrentWorkingDirectory,
     addApp: z
         .boolean()
         .describe('Should an app be added?  If there is no app in the project, an app must be added to add a feature'),
@@ -34,7 +35,7 @@ export class AddFeatureToProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ absoluteProjectPath, distribution, auth, features, addApp, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, distribution, auth, features, addApp, }) {
         try {
             await trackToolUsage(toolName);
             let command = `hs project add`;
@@ -59,16 +60,16 @@ export class AddFeatureToProjectTool extends Tool {
             // If features isn't provided, pass an empty array to bypass the prompt
             command = addFlag(command, 'features', features || []);
             const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, command);
-            return formatTextContents(stdout, stderr);
+            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
-            return formatTextContents(error instanceof Error ? error.message : `${error}`);
+            return formatTextContents(absoluteCurrentWorkingDirectory, error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Add feature to HubSpot Project',
-            description: `Adds a feature to an existing HubSpot project. 
+            description: `Adds a feature to an existing HubSpot project.
           Only works for projects with platformVersion '2025.2' and beyond`,
             inputSchema,
         }, this.handler);

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

@@ -77,10 +77,10 @@ export class CreateProjectTool extends Tool {
         command = addFlag(command, 'features', features || []);
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
-            return formatTextContents(stdout, stderr);
+            return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
-            return formatTextContents(error instanceof Error ? error.message : `${error}`);
+            return formatTextContents(absoluteCurrentWorkingDirectory, error instanceof Error ? error.message : `${error}`);
         }
     }
     register() {