@hubspot/cli 7.9.0-beta.1 → 7.9.0

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

@@ -2,22 +2,25 @@ import { TextContentResponse, Tool } from '../../types.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
+    absoluteCurrentWorkingDirectory: z.ZodString;
     appId: z.ZodString;
     startDate: z.ZodOptional<z.ZodString>;
     endDate: z.ZodOptional<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     appId: string;
+    absoluteCurrentWorkingDirectory: string;
     startDate?: string | undefined;
     endDate?: string | undefined;
 }, {
     appId: string;
+    absoluteCurrentWorkingDirectory: string;
     startDate?: string | undefined;
     endDate?: string | undefined;
 }>;
 export type GetApiUsagePatternsByAppIdInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class GetApiUsagePatternsByAppIdTool extends Tool<GetApiUsagePatternsByAppIdInputSchema> {
     constructor(mcpServer: McpServer);
-    handler({ appId, startDate, endDate, }: GetApiUsagePatternsByAppIdInputSchema): Promise<TextContentResponse>;
+    handler({ absoluteCurrentWorkingDirectory, appId, startDate, endDate, }: GetApiUsagePatternsByAppIdInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -5,7 +5,9 @@ import { http } from '@hubspot/local-dev-lib/http';
 import { formatTextContents } from '../../utils/content.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { getAccountId } from '@hubspot/local-dev-lib/config';
+import { absoluteCurrentWorkingDirectory } from './constants.js';
 const inputSchema = {
+    absoluteCurrentWorkingDirectory,
     appId: z
         .string()
         .regex(/^\d+$/, 'App ID must be a numeric string')
@@ -28,14 +30,14 @@ export class GetApiUsagePatternsByAppIdTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ appId, startDate, endDate, }) {
+    async handler({ absoluteCurrentWorkingDirectory, appId, startDate, endDate, }) {
         await trackToolUsage(toolName);
         try {
             // Get account ID from CLI config
             const accountId = getAccountId();
             if (!accountId) {
                 const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
-                return formatTextContents(authErrorMessage);
+                return formatTextContents(absoluteCurrentWorkingDirectory, authErrorMessage);
             }
             const response = await http.get(accountId, {
                 url: `app/feature/utilization/public/v3/insights/app/${appId}/usage-patterns`,
@@ -47,15 +49,15 @@ export class GetApiUsagePatternsByAppIdTool extends Tool {
             // Format the response for display
             const { data } = response;
             const formattedResult = JSON.stringify(data, null, 2);
-            return formatTextContents(formattedResult);
+            return formatTextContents(absoluteCurrentWorkingDirectory, formattedResult);
         }
         catch (error) {
             if (isHubSpotHttpError(error)) {
                 // Handle HubSpot-specific HTTP errors
-                return formatTextContents(error.toString());
+                return formatTextContents(absoluteCurrentWorkingDirectory, error.toString());
             }
             const errorMessage = `${error instanceof Error ? error.message : String(error)}`;
-            return formatTextContents(errorMessage);
+            return formatTextContents(absoluteCurrentWorkingDirectory, errorMessage);
         }
     }
     register() {

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

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

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

@@ -5,7 +5,8 @@ import { http } from '@hubspot/local-dev-lib/http';
 import { formatTextContents } from '../../utils/content.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { getAccountId } from '@hubspot/local-dev-lib/config';
-const inputSchema = {};
+import { absoluteCurrentWorkingDirectory } from './constants.js';
+const inputSchema = { absoluteCurrentWorkingDirectory };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
 const toolName = 'get-applications-info';
@@ -13,14 +14,14 @@ export class GetApplicationInfoTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({}) {
+    async handler({ absoluteCurrentWorkingDirectory, }) {
         await trackToolUsage(toolName);
         try {
             // Get account ID from CLI config
             const accountId = getAccountId();
             if (!accountId) {
                 const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
-                return formatTextContents(authErrorMessage);
+                return formatTextContents(absoluteCurrentWorkingDirectory, authErrorMessage);
             }
             const response = await http.get(accountId, {
                 url: `app/feature/utilization/public/v3/insights/apps`,
@@ -28,15 +29,15 @@ export class GetApplicationInfoTool extends Tool {
             // Format the response for display
             const { data } = response;
             const formattedResult = JSON.stringify(data, null, 2);
-            return formatTextContents(formattedResult);
+            return formatTextContents(absoluteCurrentWorkingDirectory, formattedResult);
         }
         catch (error) {
             if (isHubSpotHttpError(error)) {
                 // Handle HubSpot-specific HTTP errors
-                return formatTextContents(error.toString());
+                return formatTextContents(absoluteCurrentWorkingDirectory, error.toString());
             }
             const errorMessage = `${error instanceof Error ? error.message : String(error)}`;
-            return formatTextContents(errorMessage);
+            return formatTextContents(absoluteCurrentWorkingDirectory, errorMessage);
         }
     }
     register() {

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

@@ -26,12 +26,12 @@ export class GetConfigValuesTool extends Tool {
     async handler({ absoluteCurrentWorkingDirectory, platformVersion, featureType, }) {
         try {
             if (!isV2Project(platformVersion)) {
-                return formatTextContents(`Can only be used on projects with a minimum platformVersion of 2025.2`);
+                return formatTextContents(absoluteCurrentWorkingDirectory, `Can only be used on projects with a minimum platformVersion of 2025.2`);
             }
             const accountId = getAccountIdFromCliConfig(absoluteCurrentWorkingDirectory);
             if (!accountId) {
                 const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
-                return formatTextContents(authErrorMessage);
+                return formatTextContents(absoluteCurrentWorkingDirectory, authErrorMessage);
             }
             const schema = await getIntermediateRepresentationSchema({
                 platformVersion,
@@ -40,11 +40,11 @@ export class GetConfigValuesTool extends Tool {
             });
             const internalComponentType = mapToInternalType(featureType);
             if (schema[internalComponentType]) {
-                return formatTextContents(JSON.stringify({ config: schema[internalComponentType] }));
+                return formatTextContents(absoluteCurrentWorkingDirectory, JSON.stringify({ config: schema[internalComponentType] }));
             }
         }
         catch (error) { }
-        return formatTextContents(`Unable to locate JSON schema for type ${featureType}`);
+        return formatTextContents(absoluteCurrentWorkingDirectory, `Unable to locate JSON schema for type ${featureType}`);
     }
     register() {
         return this.mcpServer.registerTool(toolName, {

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

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

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

@@ -3,6 +3,7 @@ import { z } from 'zod';
 import { execAsync } from '../../utils/command.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
+import { absoluteCurrentWorkingDirectory } from './constants.js';
 const nextCommands = {
     'hs init': 'hs auth',
     'hs auth': 'hs project create',
@@ -10,6 +11,7 @@ const nextCommands = {
     'hs project upload': 'hs project dev',
 };
 const inputSchema = {
+    absoluteCurrentWorkingDirectory,
     command: z
         .union([
         z.literal('hs init'),
@@ -29,29 +31,19 @@ export class GuidedWalkthroughTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ command }) {
+    async handler({ absoluteCurrentWorkingDirectory, command, }) {
         await trackToolUsage(toolName);
         if (command) {
             const { stdout } = await execAsync(`${command} --help`);
-            return 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 formatTextContents(absoluteCurrentWorkingDirectory, `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 formatTextContents('Is there another command you would like to learn more about?');
+        return formatTextContents(absoluteCurrentWorkingDirectory, 'Is there another command you would like to learn more about?');
     }
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Guided walkthrough of the CLI',
             description: 'Give the user a guided walkthrough of the HubSpot CLI.',
-            inputSchema: {
-                command: z
-                    .union([
-                    z.literal('hs init'),
-                    z.literal('hs auth'),
-                    z.literal('hs project create'),
-                    z.literal('hs project upload'),
-                ])
-                    .describe('The command to learn more about.  Start with `hs init`')
-                    .optional(),
-            },
+            inputSchema,
         }, this.handler);
     }
 }

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

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

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

@@ -1,11 +1,12 @@
 import { Tool } from '../../types.js';
 import { runCommandInDir } from '../../utils/project.js';
-import { absoluteProjectPath } from './constants.js';
+import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
 import z from 'zod';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 const inputSchema = {
     absoluteProjectPath,
+    absoluteCurrentWorkingDirectory,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({
@@ -16,10 +17,10 @@ export class UploadProjectTools extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ absoluteProjectPath, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }) {
         await trackToolUsage(toolName);
         const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, `hs project upload --force-create`);
-        return formatTextContents(stdout, stderr);
+        return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
     }
     register() {
         return this.mcpServer.registerTool(toolName, {

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

@@ -3,15 +3,18 @@ import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteProjectPath: z.ZodString;
+    absoluteCurrentWorkingDirectory: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     absoluteProjectPath: string;
+    absoluteCurrentWorkingDirectory: string;
 }, {
     absoluteProjectPath: string;
+    absoluteCurrentWorkingDirectory: string;
 }>;
 export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class ValidateProjectTool extends Tool<CreateProjectInputSchema> {
     constructor(mcpServer: McpServer);
-    handler({ absoluteProjectPath, }: CreateProjectInputSchema): Promise<TextContentResponse>;
+    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }: CreateProjectInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,11 +1,12 @@
 import { Tool } from '../../types.js';
 import { z } from 'zod';
-import { absoluteProjectPath } from './constants.js';
+import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
 import { runCommandInDir } from '../../utils/project.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 const inputSchema = {
     absoluteProjectPath,
+    absoluteCurrentWorkingDirectory,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
@@ -14,14 +15,14 @@ export class ValidateProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ absoluteProjectPath, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }) {
         await trackToolUsage(toolName);
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, 'hs project validate');
-            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/project/__tests__/AddFeatureToProjectTool.test.js

@@ -2,11 +2,14 @@ import { AddFeatureToProjectTool, } from '../AddFeatureToProjectTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, } from '../../../../lib/constants.js';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../../lib/constants');
 vi.mock('../../../utils/toolUsageTracking');
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('mcp-server/tools/project/AddFeatureToProject', () => {
@@ -21,6 +24,7 @@ describe('mcp-server/tools/project/AddFeatureToProject', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new AddFeatureToProjectTool(mockMcpServer);
         // Mock addFlag to simulate command building
         mockAddFlag.mockImplementation((command, flag, value) => `${command} --${flag} "${value}"`);
@@ -32,12 +36,13 @@ describe('mcp-server/tools/project/AddFeatureToProject', () => {
                 title: 'Add feature to HubSpot Project',
                 description: expect.stringContaining('Adds a feature to an existing HubSpot project'),
                 inputSchema: expect.any(Object),
-            }), tool.handler);
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });
     describe('handler', () => {
         const baseInput = {
+            absoluteCurrentWorkingDirectory: '/test/dir',
             absoluteProjectPath: '/test/project',
             addApp: false,
         };

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

@@ -2,12 +2,15 @@ import { CreateProjectTool, } from '../CreateProjectTool.js';
 import { runCommandInDir } from '../../../utils/project.js';
 import { addFlag } from '../../../utils/command.js';
 import { APP_DISTRIBUTION_TYPES, EMPTY_PROJECT, PROJECT_WITH_APP, } from '../../../../lib/constants.js';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/project');
 vi.mock('../../../utils/command');
 vi.mock('../../../../lib/constants');
 vi.mock('../../../../lib/projects/create/v2');
 vi.mock('../../../utils/toolUsageTracking');
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('mcp-server/tools/project/CreateProjectTool', () => {
@@ -22,6 +25,7 @@ describe('mcp-server/tools/project/CreateProjectTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new CreateProjectTool(mockMcpServer);
         // Mock addFlag to simulate command building
         mockAddFlag.mockImplementation((command, flag, value) => `${command} --${flag} "${value}"`);
@@ -29,11 +33,11 @@ describe('mcp-server/tools/project/CreateProjectTool', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-project', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-project', expect.objectContaining({
                 title: 'Create HubSpot Project',
-                description: 'Creates a HubSpot project with the provided name and outputs it in the provided destination',
+                description: expect.stringContaining('Creates a HubSpot project with the provided name'),
                 inputSchema: expect.any(Object),
-            }, tool.handler);
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });

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

@@ -1,10 +1,13 @@
 import { DeployProjectTool } from '../DeployProjectTool.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');
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockRunCommandInDir = runCommandInDir;
 const mockAddFlag = addFlag;
 describe('mcp-server/tools/project/DeployProject', () => {
@@ -19,6 +22,7 @@ describe('mcp-server/tools/project/DeployProject', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new DeployProjectTool(mockMcpServer);
         // Mock addFlag to simulate command building
         mockAddFlag.mockImplementation((command, flag, value) => `${command} --${flag} "${value}"`);
@@ -26,16 +30,17 @@ describe('mcp-server/tools/project/DeployProject', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('deploy-project', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('deploy-project', expect.objectContaining({
                 title: 'Deploy a build of HubSpot Project',
                 description: expect.stringContaining('Takes a build number and a project name and deploys that build of the project'),
                 inputSchema: expect.any(Object),
-            }, tool.handler);
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });
     describe('handler', () => {
         const baseInput = {
+            absoluteCurrentWorkingDirectory: '/test/dir',
             absoluteProjectPath: '/test/project',
         };
         it('should deploy project with specified build number', async () => {

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

@@ -1,10 +1,13 @@
 import { DocFetchTool } from '../DocFetchTool.js';
 import { http } from '@hubspot/local-dev-lib/http/unauthed';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('@hubspot/local-dev-lib/http/unauthed');
 vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('../../utils/toolUsageTracking');
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockHttp = http;
 const mockIsHubSpotHttpError = vi.mocked(isHubSpotHttpError);
 describe('mcp-server/tools/project/DocFetchTool', () => {
@@ -19,21 +22,23 @@ describe('mcp-server/tools/project/DocFetchTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new DocFetchTool(mockMcpServer);
     });
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('fetch-doc', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('fetch-doc', expect.objectContaining({
                 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: expect.stringContaining('Always use this immediately after `search-docs`'),
                 inputSchema: expect.any(Object),
-            }, tool.handler);
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });
     describe('handler', () => {
         const mockInput = {
+            absoluteCurrentWorkingDirectory: '/test/dir',
             docUrl: 'https://example.com/docs/test-doc',
         };
         it('should successfully fetch and return markdown content', async () => {

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

@@ -2,11 +2,14 @@ import { DocsSearchTool } from '../DocsSearchTool.js';
 import { http } from '@hubspot/local-dev-lib/http';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { getAccountIdFromCliConfig } from '../../../utils/cliConfig.js';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('@hubspot/local-dev-lib/http');
 vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('../../../utils/cliConfig.js');
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockHttp = http;
 const mockGetAccountIdFromCliConfig = getAccountIdFromCliConfig;
 const mockIsHubSpotHttpError = vi.mocked(isHubSpotHttpError);
@@ -22,16 +25,17 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new DocsSearchTool(mockMcpServer);
     });
     describe('register', () => {
-        it('should register tool with correct parameters', () => {
+        it('should register tool with correct parameters and enhanced description', () => {
             const result = tool.register();
             expect(mockMcpServer.registerTool).toHaveBeenCalledWith('search-docs', {
                 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.',
                 inputSchema: expect.any(Object),
-            }, tool.handler);
+            }, expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });

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

@@ -3,11 +3,14 @@ import { z } from 'zod';
 import { getAccountId } from '@hubspot/local-dev-lib/config';
 import { http } from '@hubspot/local-dev-lib/http';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../../utils/toolUsageTracking');
 vi.mock('@hubspot/local-dev-lib/http');
 vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockGetAccountId = getAccountId;
 const mockHttp = http;
 const mockIsHubSpotHttpError = isHubSpotHttpError;
@@ -23,14 +26,15 @@ describe('mcp-server/tools/project/GetApiUsagePatternsByAppIdTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new GetApiUsagePatternsByAppIdTool(mockMcpServer);
     });
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-api-usage-patterns-by-app-id', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-api-usage-patterns-by-app-id', expect.objectContaining({
                 title: 'Get API Usage Patterns by App ID',
-                description: 'Retrieves detailed API usage pattern analytics for a specific HubSpot application. Requires an appId (string) to identify the target application. Optionally accepts startDate and endDate parameters in YYYY-MM-DD format to filter results within a specific time range. Returns patternSummaries object containing usage statistics including portalPercentage (percentage of portals using this pattern) and numOfPortals (total count of portals) for different usage patterns. This data helps analyze how the application is being used across different HubSpot portals and can inform optimization decisions.',
+                description: expect.stringContaining('Retrieves detailed API usage pattern analytics for a specific HubSpot application'),
                 inputSchema: expect.objectContaining({
                     appId: expect.objectContaining({
                         describe: expect.any(Function),
@@ -42,7 +46,7 @@ describe('mcp-server/tools/project/GetApiUsagePatternsByAppIdTool', () => {
                         optional: expect.any(Function),
                     }),
                 }),
-            }, tool.handler);
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });
@@ -79,6 +83,7 @@ describe('mcp-server/tools/project/GetApiUsagePatternsByAppIdTool', () => {
     });
     describe('handler', () => {
         const input = {
+            absoluteCurrentWorkingDirectory: '/test/dir',
             appId: '12345',
             startDate: '2025-01-01',
             endDate: '2025-12-31',

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

@@ -2,11 +2,14 @@ import { GetApplicationInfoTool } from '../GetApplicationInfoTool.js';
 import { getAccountId } from '@hubspot/local-dev-lib/config';
 import { http } from '@hubspot/local-dev-lib/http';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
+import { mcpFeedbackRequest } from '../../../utils/feedbackTracking.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('../../utils/toolUsageTracking');
 vi.mock('@hubspot/local-dev-lib/http');
 vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../../utils/feedbackTracking');
+const mockMcpFeedbackRequest = mcpFeedbackRequest;
 const mockGetAccountId = getAccountId;
 const mockHttp = http;
 const mockIsHubSpotHttpError = isHubSpotHttpError;
@@ -22,21 +25,22 @@ describe('mcp-server/tools/project/GetApplicationInfoTool', () => {
         };
         mockRegisteredTool = {};
         mockMcpServer.registerTool.mockReturnValue(mockRegisteredTool);
+        mockMcpFeedbackRequest.mockResolvedValue('');
         tool = new GetApplicationInfoTool(mockMcpServer);
     });
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-applications-info', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-applications-info', expect.objectContaining({
                 title: 'Get Applications Information',
-                description: 'Retrieves a list of all HubSpot applications available in the current account. Returns an array of applications, where each application contains an appId (numeric identifier) and appName (string). This information is useful for identifying available applications before using other tools that require specific application IDs, such as getting API usage patterns. No input parameters are required - this tool fetches all applications from the HubSpot Insights API.',
-                inputSchema: {},
-            }, tool.handler);
+                description: expect.stringContaining('Retrieves a list of all HubSpot applications available in the current account'),
+                inputSchema: expect.any(Object),
+            }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);
         });
     });
     describe('handler', () => {
-        const input = {};
+        const input = { absoluteCurrentWorkingDirectory: '/test/dir' };
         beforeEach(() => {
             mockGetAccountId.mockReturnValue(123456789);
             mockIsHubSpotHttpError.mockReturnValue(false);