@hubspot/cli 8.2.0 → 8.2.1-experimental.0

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

@@ -1,29 +1,30 @@
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { http } from '@hubspot/local-dev-lib/http';
 import { formatTextContents } from '../../utils/content.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
-import { absoluteCurrentWorkingDirectory } from './constants.js';
+import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
-const inputSchema = { absoluteCurrentWorkingDirectory };
+const inputSchema = {
+    absoluteCurrentWorkingDirectory,
+    absoluteProjectPath: absoluteProjectPath.optional(),
+};
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
 const toolName = 'get-apps-info';
 export class GetApplicationInfoTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
-    async handler({ absoluteCurrentWorkingDirectory, }) {
-        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName);
+    async handler({ absoluteCurrentWorkingDirectory, absoluteProjectPath, }) {
+        setupHubSpotConfig(absoluteProjectPath ?? absoluteCurrentWorkingDirectory);
         try {
-            // Get account ID from CLI config
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
+            const { recommended } = await discoverAccountTargets();
+            const accountId = recommended?.accountId;
             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>\``;
+                const authErrorMessage = `No account ID found. Call the auth-account tool to authenticate a HubSpot account.`;
                 return formatTextContents(authErrorMessage);
             }
             const response = await http.get(accountId, {
@@ -35,6 +36,10 @@ export class GetApplicationInfoTool extends Tool {
             return formatTextContents(formattedResult);
         }
         catch (error) {
+            this.logger.debug(toolName, {
+                message: 'Handler caught error',
+                error: error instanceof Error ? error.message : String(error),
+            });
             if (isHubSpotHttpError(error)) {
                 // Handle HubSpot-specific HTTP errors
                 return formatTextContents(error.toString());
@@ -51,6 +56,6 @@ export class GetApplicationInfoTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, this.handler);
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -1,5 +1,7 @@
-import { TextContentResponse, Tool } from '../../types.js';
+import { TextContentResponse } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteProjectPath: z.ZodString;
@@ -14,7 +16,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 }, z.core.$strip>;
 export type GetBuildLogsInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class GetBuildLogsTool extends Tool<GetBuildLogsInputSchema> {
-    constructor(mcpServer: McpServer);
+    constructor(mcpServer: McpServer, logger: McpLogger);
     handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildId, logLevel, }: GetBuildLogsInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }

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

@@ -1,13 +1,12 @@
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { formatTextContents } from '../../utils/content.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { http } from '@hubspot/local-dev-lib/http';
 import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 const TOOL_NAME = 'get-build-logs';
 const PROJECTS_LOGS_API_PATH = 'dfs/logging/v1';
 const inputSchema = {
@@ -59,19 +58,22 @@ function formatLogs(logs) {
         .join('\n');
 }
 export class GetBuildLogsTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, TOOL_NAME);
     }
     async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildId, logLevel, }) {
-        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(TOOL_NAME);
+        setupHubSpotConfig(absoluteProjectPath);
         try {
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
-            if (!accountId) {
-                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Please run `hs account auth` to configure an account, or set a default account with `hs account use <account>`');
-            }
             const { projectConfig, projectDir } = await getProjectConfig(absoluteProjectPath);
             validateProjectConfig(projectConfig, projectDir);
+            const { recommended } = await discoverAccountTargets({
+                projectDir,
+                projectConfig,
+            });
+            const accountId = recommended?.accountId;
+            if (!accountId) {
+                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Call the auth-account tool to authenticate a HubSpot account.');
+            }
             const projectName = projectConfig.name;
             const response = await http.get(accountId, {
                 url: `${PROJECTS_LOGS_API_PATH}/logs/projects/${encodeURIComponent(projectName)}/builds/${buildId}`,
@@ -96,6 +98,10 @@ export class GetBuildLogsTool extends Tool {
             return formatTextContents(absoluteCurrentWorkingDirectory, output);
         }
         catch (error) {
+            this.logger.debug(TOOL_NAME, {
+                message: 'Handler caught error',
+                error: error instanceof Error ? error.message : String(error),
+            });
             let errorMessage;
             if (isHubSpotHttpError(error)) {
                 errorMessage = error.toString();
@@ -112,13 +118,13 @@ export class GetBuildLogsTool extends Tool {
     register() {
         return this.mcpServer.registerTool(TOOL_NAME, {
             title: 'Get HubSpot Project Build Logs',
-            description: 'Retrieves build logs for a specific HubSpot project build. Use this to debug build failures by viewing the full build pipeline output. This tool is for more comprehensive troubleshootings or addressing build WARNINGs, build errors should be troubleshooted with get-build-status tool first. Logs can be filtered by level (ERROR, WARN, INFO, or ALL). Use `hs project list-builds`  first to identify the build ID and error messages.',
+            description: 'Retrieves build logs for a specific HubSpot project build. Use this to debug build failures by viewing the full build pipeline output. This tool is for more comprehensive troubleshootings or addressing build WARNINGs, build errors should be troubleshooted with get-build-status tool first. Logs can be filtered by level (ERROR, WARN, INFO, or ALL). Use `hs project list-builds`  first to identify the build ID and error messages. If you do not know the project path, use the find-projects tool first to locate HubSpot projects in the workspace.',
             inputSchema,
             annotations: {
                 readOnlyHint: true,
                 openWorldHint: true,
                 idempotentHint: true,
             },
-        }, this.handler);
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -1,5 +1,7 @@
-import { TextContentResponse, Tool } from '../../types.js';
+import { TextContentResponse } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteProjectPath: z.ZodString;
@@ -9,7 +11,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 }, z.core.$strip>;
 export type GetBuildStatusInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class GetBuildStatusTool extends Tool<GetBuildStatusInputSchema> {
-    constructor(mcpServer: McpServer);
+    constructor(mcpServer: McpServer, logger: McpLogger);
     handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildId, limit, }: GetBuildStatusInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }

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

@@ -1,14 +1,13 @@
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { formatTextContents } from '../../utils/content.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { fetchProjectBuilds, getBuildStatus, } from '@hubspot/local-dev-lib/api/projects';
 import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
 import moment from 'moment';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 const TOOL_NAME = 'get-build-status';
 const inputSchema = {
     absoluteProjectPath,
@@ -104,19 +103,22 @@ function formatBuildDetails(build) {
     return lines.join('\n');
 }
 export class GetBuildStatusTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, TOOL_NAME);
     }
     async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildId, limit, }) {
-        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(TOOL_NAME);
+        setupHubSpotConfig(absoluteProjectPath);
         try {
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
-            if (!accountId) {
-                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Please run `hs account auth` to configure an account, or set a default account with `hs account use <account>`');
-            }
             const { projectConfig, projectDir } = await getProjectConfig(absoluteProjectPath);
             validateProjectConfig(projectConfig, projectDir);
+            const { recommended } = await discoverAccountTargets({
+                projectDir,
+                projectConfig,
+            });
+            const accountId = recommended?.accountId;
+            if (!accountId) {
+                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Call the auth-account tool to authenticate a HubSpot account.');
+            }
             const projectName = projectConfig.name;
             let output;
             if (buildId) {
@@ -137,6 +139,10 @@ export class GetBuildStatusTool extends Tool {
             return formatTextContents(absoluteCurrentWorkingDirectory, output);
         }
         catch (error) {
+            this.logger.debug(TOOL_NAME, {
+                message: 'Handler caught error',
+                error: error instanceof Error ? error.message : String(error),
+            });
             let errorMessage;
             if (isHubSpotHttpError(error)) {
                 errorMessage = error.toString();
@@ -153,13 +159,13 @@ export class GetBuildStatusTool extends Tool {
     register() {
         return this.mcpServer.registerTool(TOOL_NAME, {
             title: 'Get HubSpot Projects Build Status and Errors',
-            description: 'Retrieves build status and error messages for HubSpot projects. When buildId is omitted, shows recent builds with their status(default 3) - use this to find the latest builds when troubleshooting. When buildId is provided, shows detailed error information for that specific build. Displays buildErrorMessage and subbuild failures to help diagnose build issues.',
+            description: 'Retrieves build status and error messages for HubSpot projects. When buildId is omitted, shows recent builds with their status(default 3) - use this to find the latest builds when troubleshooting. When buildId is provided, shows detailed error information for that specific build. Displays buildErrorMessage and subbuild failures to help diagnose build issues. If you do not know the project path, use the find-projects tool first to locate HubSpot projects in the workspace.',
             inputSchema,
             annotations: {
                 readOnlyHint: true,
                 openWorldHint: true,
                 idempotentHint: true,
             },
-        }, this.handler);
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -1,15 +1,18 @@
-import { TextContentResponse, Tool } from '../../types.js';
+import { TextContentResponse } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: z.ZodString;
+    absoluteProjectPath: z.ZodOptional<z.ZodString>;
     platformVersion: z.ZodString;
     featureType: z.ZodString;
 }, z.core.$strip>;
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class GetConfigValuesTool extends Tool<InputSchemaType> {
-    constructor(mcpServer: McpServer);
-    handler({ platformVersion, featureType, absoluteCurrentWorkingDirectory, }: InputSchemaType): Promise<TextContentResponse>;
+    constructor(mcpServer: McpServer, logger: McpLogger);
+    handler({ platformVersion, featureType, absoluteCurrentWorkingDirectory, absoluteProjectPath, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,14 +1,15 @@
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { formatTextContents } from '../../utils/content.js';
-import { absoluteCurrentWorkingDirectory } from './constants.js';
+import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
 import { getIntermediateRepresentationSchema } from '@hubspot/project-parsing-lib/schema';
 import { mapToInternalType } from '@hubspot/project-parsing-lib/transform';
-import { isV2Project } from '../../../lib/projects/platformVersion.js';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
+    absoluteProjectPath: absoluteProjectPath.optional(),
     platformVersion: z
         .string()
         .describe('The platform version for the project. Located in the hsproject.json file.'),
@@ -22,18 +23,19 @@ const inputSchemaZodObject = z.object({
 });
 const toolName = 'get-feature-config-schema';
 export class GetConfigValuesTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
-    async handler({ platformVersion, featureType, absoluteCurrentWorkingDirectory, }) {
-        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
+    async handler({ platformVersion, featureType, absoluteCurrentWorkingDirectory, absoluteProjectPath, }) {
+        setupHubSpotConfig(absoluteProjectPath ?? absoluteCurrentWorkingDirectory);
         try {
-            if (!isV2Project(platformVersion)) {
+            if (isLegacyProject(platformVersion)) {
                 return formatTextContents(`Can only be used on projects with a minimum platformVersion of 2025.2`);
             }
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
+            const { recommended } = await discoverAccountTargets();
+            const accountId = recommended?.accountId;
             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>\``;
+                const authErrorMessage = `No account ID found. Call the auth-account tool to authenticate a HubSpot account.`;
                 return formatTextContents(authErrorMessage);
             }
             const schema = await getIntermediateRepresentationSchema({
@@ -46,7 +48,12 @@ export class GetConfigValuesTool extends Tool {
                 return formatTextContents(JSON.stringify({ config: schema[internalComponentType] }));
             }
         }
-        catch (error) { }
+        catch (error) {
+            this.logger.debug(toolName, {
+                message: 'Handler caught error',
+                error: error instanceof Error ? error.message : String(error),
+            });
+        }
         return formatTextContents(`Unable to locate JSON schema for type ${featureType}`);
     }
     register() {
@@ -60,6 +67,6 @@ export class GetConfigValuesTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: false,
             },
-        }, this.handler);
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -1,5 +1,7 @@
-import { TextContentResponse, Tool } from '../../types.js';
+import { TextContentResponse } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: z.ZodString;
@@ -12,7 +14,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 }, z.core.$strip>;
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class GuidedWalkthroughTool extends Tool<InputSchemaType> {
-    constructor(mcpServer: McpServer);
+    constructor(mcpServer: McpServer, logger: McpLogger);
     handler({ command, absoluteCurrentWorkingDirectory, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }

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

@@ -1,8 +1,7 @@
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 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';
 import { setupHubSpotConfig } from '../../utils/config.js';
 const nextCommands = {
@@ -24,12 +23,11 @@ const inputSchemaZodObject = z.object({
 });
 const toolName = 'guided-walkthrough-cli';
 export class GuidedWalkthroughTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
     async handler({ command, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        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]}` : ''}`);
@@ -45,6 +43,6 @@ export class GuidedWalkthroughTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: false,
             },
-        }, this.handler);
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -1,6 +1,8 @@
 import z from 'zod';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
-import { TextContentResponse, Tool } from '../../types.js';
+import { McpLogger } from '../../utils/logger.js';
+import { TextContentResponse } from '../../types.js';
+import { Tool, ToolExtra } from '../../Tool.js';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteProjectPath: z.ZodString;
     absoluteCurrentWorkingDirectory: z.ZodString;
@@ -9,8 +11,8 @@ declare const inputSchemaZodObject: z.ZodObject<{
 }, z.z.core.$strip>;
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class UploadProjectTools extends Tool<InputSchemaType> {
-    constructor(mcpServer: McpServer);
-    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }: InputSchemaType): Promise<TextContentResponse>;
+    constructor(mcpServer: McpServer, logger: McpLogger);
+    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }: InputSchemaType, extra?: ToolExtra): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -2,12 +2,10 @@ import path from 'path';
 import z from 'zod';
 import { getAllHsProfiles } from '@hubspot/project-parsing-lib/profiles';
 import { getProjectConfig } from '../../../lib/projects/config.js';
-import { Tool } from '../../types.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { Tool } from '../../Tool.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
 import { formatTextContent, formatTextContents } from '../../utils/content.js';
-import { trackToolUsage } from '../../utils/toolUsageTracking.js';
-import { addFlag } from '../../utils/command.js';
+import { HubSpotCommand } from '../../utils/command.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
     absoluteProjectPath,
@@ -17,7 +15,7 @@ const inputSchema = {
         .describe('A 1 sentence message that concisely describes the changes that are being uploaded.'),
     profile: z
         .optional(z.string())
-        .describe('CRITICAL: If the user has not explicitly specified a profile name, you MUST ask them which profile to use. NEVER automatically choose a profile based on files you see in the directory (e.g., seeing "hsprofile.prod.json" does NOT mean you should use "prod"). The profile to be used for the upload. All projects configured to use profiles must specify a profile when uploading. Profile files have the following format: "hsprofile.<profile>.json".'),
+        .describe('The profile to use for the upload. Only required for projects configured with profiles. If the project uses profiles and the user has not specified one, ask them rather than inferring from filenames in the directory. NEVER automatically choose a profile based on files you see. Profile files have the format: "hsprofile.<profile>.json".'),
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({
@@ -25,19 +23,20 @@ const inputSchemaZodObject = z.object({
 });
 const toolName = 'upload-project';
 export class UploadProjectTools extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
-    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName);
-        let command = addFlag('hs project upload', 'force-create', true);
+        const command = new HubSpotCommand('project upload', [
+            { name: 'force', value: true },
+        ]);
         const content = [];
         if (uploadMessage) {
-            command = addFlag(command, 'message', uploadMessage);
+            command.addFlag('message', uploadMessage);
         }
         if (profile) {
-            command = addFlag(command, 'profile', profile);
+            command.addFlag('profile', profile);
         }
         else {
             let hasProfiles = false;
@@ -49,6 +48,10 @@ export class UploadProjectTools extends Tool {
                 }
             }
             catch (e) {
+                this.logger.debug(toolName, {
+                    message: 'Handler caught error checking for profiles',
+                    error: e instanceof Error ? e.message : String(e),
+                });
                 // If any of these checks fail, the safest thing to do is to assume there are no profiles.
                 hasProfiles = false;
             }
@@ -61,7 +64,7 @@ export class UploadProjectTools extends Tool {
                 content,
             };
         }
-        const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, command);
+        const { stdout, stderr } = await this.runCommand(absoluteProjectPath, command, extra);
         const response = await formatTextContents(stdout, stderr);
         // Add reminder about cards needing to be added to views
         response.content.push(formatTextContent('\nIMPORTANT: If this project contains cards, remember that uploading does NOT make them live automatically. Cards must be manually added to a view in HubSpot to become visible to users.'));
@@ -70,7 +73,7 @@ export class UploadProjectTools extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Upload HubSpot Project',
-            description: 'DO NOT run this tool unless the user specifies they would like to upload the project, it is potentially destructive. Uploads the HubSpot project in current working directory.  If the project does not exist, it will be created. MUST be ran from within the project directory. IMPORTANT: Uploading a project does NOT automatically make cards live or visible to users. Cards must be manually added to a view in HubSpot after upload to become visible.',
+            description: 'DO NOT run this tool unless the user specifies they would like to upload the project, it is potentially destructive. Uploads the HubSpot project in current working directory.  If the project does not exist, it will be created. MUST be ran from within the project directory. IMPORTANT: Uploading a project does NOT automatically make cards live or visible to users. Cards must be manually added to a view in HubSpot after upload to become visible. If you do not know the project path, use the find-projects tool first to locate HubSpot projects in the workspace.',
             inputSchema,
             annotations: {
                 readOnlyHint: false,
@@ -78,6 +81,6 @@ export class UploadProjectTools extends Tool {
                 idempotentHint: true,
                 openWorldHint: true,
             },
-        }, this.handler);
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -1,5 +1,7 @@
-import { TextContentResponse, Tool } from '../../types.js';
+import { TextContentResponse } from '../../types.js';
+import { Tool, ToolExtra } from '../../Tool.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteProjectPath: z.ZodString;
@@ -7,8 +9,8 @@ declare const inputSchemaZodObject: z.ZodObject<{
 }, z.core.$strip>;
 export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class ValidateProjectTool extends Tool<CreateProjectInputSchema> {
-    constructor(mcpServer: McpServer);
-    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }: CreateProjectInputSchema): Promise<TextContentResponse>;
+    constructor(mcpServer: McpServer, logger: McpLogger);
+    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }: CreateProjectInputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,11 +1,10 @@
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents } from '../../utils/content.js';
-import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
+import { HubSpotCommand } from '../../utils/command.js';
 const inputSchema = {
     absoluteProjectPath,
     absoluteCurrentWorkingDirectory,
@@ -14,29 +13,33 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({ ...inputSchema });
 const toolName = 'validate-project';
 export class ValidateProjectTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
-    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName);
         try {
-            const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, 'hs project validate');
+            const command = new HubSpotCommand('project validate');
+            const { stdout, stderr } = await this.runCommand(absoluteProjectPath, command, extra);
             return formatTextContents(stdout, stderr);
         }
         catch (error) {
+            this.logger.debug(toolName, {
+                message: 'Handler caught error',
+                error: error instanceof Error ? error.message : String(error),
+            });
             return formatTextContents(getErrorMessage(error));
         }
     }
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Validate HubSpot Project',
-            description: 'Validates the HubSpot project and its configuration files.  This tool does not need to be ran before uploading the project',
+            description: 'Validates the HubSpot project and its configuration files.  This tool does not need to be ran before uploading the project. If you do not know the project path, use the find-projects tool first to locate HubSpot projects in the workspace.',
             inputSchema,
             annotations: {
                 readOnlyHint: true,
                 openWorldHint: false,
             },
-        }, this.handler);
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -6,12 +6,14 @@ export declare const features: z.ZodOptional<z.ZodArray<z.ZodEnum<{
     settings: "settings";
     "app-event": "app-event";
     "workflow-action-tool": "workflow-action-tool";
+    "crm-bulk-action": "crm-bulk-action";
     page: "page";
     webhooks: "webhooks";
-    "workflow-action": "workflow-action";
     "app-function": "app-function";
     "app-object": "app-object";
     scim: "scim";
+    "workflow-action": "workflow-action";
+    "app-function-endpoint": "app-function-endpoint";
 }>>>;
 export declare const docsSearchQuery: z.ZodString;
 export declare const docUrl: z.ZodString;

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

@@ -10,6 +10,7 @@ export const features = z
     'card',
     'settings',
     'app-function',
+    'app-function-endpoint',
     'webhooks',
     'workflow-action',
     'workflow-action-tool',
@@ -17,8 +18,9 @@ export const features = z
     'app-event',
     'scim',
     'page',
+    'crm-bulk-action',
 ]))
-    .describe('The features to include in the project, multiple options can be selected. "app-function" is also known as a public serverless function. "workflow-action" is also known as a custom workflow action. "workflow-action-tool" is also known as agent tools.')
+    .describe('The features to include in the project, multiple options can be selected. "app-function" is also known as a private serverless function. "app-function-endpoint" is a serverless functions that is publicly accessible via endpoint. "workflow-action" is also known as a custom workflow action. "workflow-action-tool" is also known as agent tools. "crm-bulk-action" is an app actions extension that lets users act on multiple CRM records at once.')
     .optional();
 export const docsSearchQuery = z
     .string()

package/mcp-server/types.d.ts

@@ -1,10 +1,3 @@
-import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
-export declare class Tool<InputSchema, ResponseType = TextContentResponse> {
-    protected mcpServer: McpServer;
-    constructor(mcpServer: McpServer);
-    register(): RegisteredTool;
-    handler(input: InputSchema): ResponseType | Promise<ResponseType>;
-}
 export type TextContent = {
     type: 'text';
     text: string;