@hubspot/cli 7.9.0-beta.1 → 7.9.0-experimental.0

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() {

package/mcp-server/tools/project/DeployProjectTool.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;
     buildNumber: z.ZodOptional<z.ZodNumber>;
 }, "strip", z.ZodTypeAny, {
     absoluteProjectPath: string;
+    absoluteCurrentWorkingDirectory: string;
     buildNumber?: number | undefined;
 }, {
     absoluteProjectPath: string;
+    absoluteCurrentWorkingDirectory: string;
     buildNumber?: number | undefined;
 }>;
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class DeployProjectTool extends Tool<InputSchemaType> {
     constructor(mcpServer: McpServer);
-    handler({ absoluteProjectPath, buildNumber, }: InputSchemaType): Promise<TextContentResponse>;
+    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildNumber, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,12 +1,13 @@
 import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { addFlag } from '../../utils/command.js';
-import { absoluteProjectPath } from './constants.js';
+import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } 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,
     buildNumber: z
         .optional(z.number())
         .describe('The build number to be deployed.  This can be found in the project details page using `hs project open`.  If no build number is specified, the most recent build is deployed'),
@@ -20,7 +21,7 @@ export class DeployProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ absoluteProjectPath, buildNumber, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildNumber, }) {
         await trackToolUsage(toolName);
         let command = `hs project deploy`;
         const content = [];
@@ -37,7 +38,7 @@ export class DeployProjectTool extends Tool {
             };
         }
         const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, command);
-        return formatTextContents(stdout, stderr);
+        return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
     }
     register() {
         return this.mcpServer.registerTool(toolName, {

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

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

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

@@ -2,11 +2,12 @@ import z from 'zod';
 import { Tool } from '../../types.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
-import { docUrl } from './constants.js';
+import { absoluteCurrentWorkingDirectory, docUrl } from './constants.js';
 import { http } from '@hubspot/local-dev-lib/http/unauthed';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 const inputSchema = {
     docUrl,
+    absoluteCurrentWorkingDirectory,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({
@@ -17,7 +18,7 @@ export class DocFetchTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ docUrl }) {
+    async handler({ docUrl, absoluteCurrentWorkingDirectory, }) {
         await trackToolUsage(toolName);
         try {
             // Append .md extension to the URL
@@ -27,16 +28,16 @@ export class DocFetchTool extends Tool {
             });
             const content = response.data;
             if (!content || content.trim().length === 0) {
-                return formatTextContents('Document is empty or contains no content.');
+                return formatTextContents(absoluteCurrentWorkingDirectory, 'Document is empty or contains no content.');
             }
-            return formatTextContents(content);
+            return formatTextContents(absoluteCurrentWorkingDirectory, content);
         }
         catch (error) {
             if (isHubSpotHttpError(error)) {
-                return formatTextContents(error.toString());
+                return formatTextContents(absoluteCurrentWorkingDirectory, error.toString());
             }
             const errorMessage = `Error fetching documentation: ${error instanceof Error ? error.message : String(error)}`;
-            return formatTextContents(errorMessage);
+            return formatTextContents(absoluteCurrentWorkingDirectory, errorMessage);
         }
     }
     register() {

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

@@ -24,7 +24,7 @@ export class DocsSearchTool extends Tool {
         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);
         }
         try {
             const response = await http.post(accountId, {
@@ -35,21 +35,21 @@ export class DocsSearchTool extends Tool {
             });
             const results = response.data.results;
             if (!results || results.length === 0) {
-                return formatTextContents('No documentation found for your query.');
+                return formatTextContents(absoluteCurrentWorkingDirectory, 'No documentation found for your query.');
             }
             const formattedResults = results
                 .map(result => `**${result.title}**\n${result.description}\nURL: ${result.url}\nScore: ${result.score}\n\n${result.content}\n---\n`)
                 .join('\n');
             const successMessage = `Found ${results.length} documentation results:\n\n${formattedResults}`;
-            return formatTextContents(successMessage);
+            return formatTextContents(absoluteCurrentWorkingDirectory, successMessage);
         }
         catch (error) {
             if (isHubSpotHttpError(error)) {
                 // Handle different status codes
-                return formatTextContents(error.toString());
+                return formatTextContents(absoluteCurrentWorkingDirectory, error.toString());
             }
             const errorMessage = `Error searching documentation: ${error instanceof Error ? error.message : String(error)}`;
-            return formatTextContents(errorMessage);
+            return formatTextContents(absoluteCurrentWorkingDirectory, errorMessage);
         }
     }
     register() {

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 {};