@hubspot/cli 8.1.0 → 8.1.2-experimental.0

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

@@ -1,6 +1,5 @@
-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';
@@ -12,29 +11,25 @@ const inputSchema = {
     absoluteCurrentWorkingDirectory,
     appId: z
         .string()
-        .regex(/^\d+$/, 'App ID must be a numeric string')
-        .describe('The numeric app ID as a string (e.g., "3003909"). Use get-apps-info to find available app IDs.'),
+        .describe('The numeric app ID as a string (e.g., "3003909"). Must contain only digits. Use get-apps-info to find available app IDs.'),
     startDate: z
         .string()
-        .regex(/^\d{4}-\d{2}-\d{2}$/, 'Start date must be in YYYY-MM-DD format')
-        .optional()
-        .describe('Start date for the usage patterns query in ISO 8601 format (e.g., 2025-01-01).'),
+        .describe('Start date for the usage patterns query in YYYY-MM-DD format (e.g., 2025-01-01).')
+        .optional(),
     endDate: z
         .string()
-        .regex(/^\d{4}-\d{2}-\d{2}$/, 'End date must be in YYYY-MM-DD format')
-        .optional()
-        .describe('End date for the usage patterns query in ISO 8601 format (e.g., 2025-12-31).'),
+        .describe('End date for the usage patterns query in YYYY-MM-DD format (e.g., 2025-12-31).')
+        .optional(),
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
 const toolName = 'get-api-usage-patterns-by-app-id';
 export class GetApiUsagePatternsByAppIdTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
     async handler({ appId, startDate, endDate, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName);
         try {
             // Get account ID from CLI config
             const accountId = getConfigDefaultAccountIfExists()?.accountId;
@@ -55,6 +50,10 @@ export class GetApiUsagePatternsByAppIdTool 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());
@@ -71,6 +70,6 @@ export class GetApiUsagePatternsByAppIdTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, this.handler);
+        }, input => this.wrappedHandler(input));
     }
 }

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

@@ -1,12 +1,14 @@
-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;
 }, z.core.$strip>;
 export type GetApplicationInfoInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class GetApplicationInfoTool extends Tool<GetApplicationInfoInputSchema> {
-    constructor(mcpServer: McpServer);
+    constructor(mcpServer: McpServer, logger: McpLogger);
     handler({ absoluteCurrentWorkingDirectory, }: GetApplicationInfoInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }

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

@@ -1,6 +1,5 @@
-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';
@@ -13,12 +12,11 @@ const inputSchema = { absoluteCurrentWorkingDirectory };
 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);
         try {
             // Get account ID from CLI config
             const accountId = getConfigDefaultAccountIfExists()?.accountId;
@@ -35,6 +33,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 +53,6 @@ export class GetApplicationInfoTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, this.handler);
+        }, input => this.wrappedHandler(input));
     }
 }

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

@@ -1,20 +1,22 @@
-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;
     absoluteCurrentWorkingDirectory: z.ZodString;
     buildId: z.ZodNumber;
-    logLevel: z.ZodDefault<z.ZodOptional<z.ZodEnum<{
+    logLevel: z.ZodOptional<z.ZodEnum<{
         ERROR: "ERROR";
         WARN: "WARN";
         INFO: "INFO";
         ALL: "ALL";
-    }>>>;
+    }>>;
 }, 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,6 +1,5 @@
-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';
@@ -18,9 +17,8 @@ const inputSchema = {
         .describe('Build ID to fetch logs for. Use get-build-status to find recent build IDs.'),
     logLevel: z
         .enum(['ERROR', 'WARN', 'INFO', 'ALL'])
-        .optional()
-        .default('ALL')
-        .describe('Filter logs by level. ERROR: Show only errors, WARN: Show only warnings, INFO: Show only info, ALL: Show all logs.'),
+        .describe('Filter logs by level. ERROR: Show only errors, WARN: Show only warnings, INFO: Show only info, ALL: Show all logs. Defaults to ALL if not specified.')
+        .optional(),
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
@@ -60,12 +58,11 @@ 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);
         try {
             const accountId = getConfigDefaultAccountIfExists()?.accountId;
             if (!accountId) {
@@ -85,18 +82,22 @@ export class GetBuildLogsTool extends Tool {
             if (allLogs.length === 0) {
                 return formatTextContents(absoluteCurrentWorkingDirectory, `No logs found for build #${buildId} in project '${projectName}'.`);
             }
-            const filteredLogs = filterLogsByLevel(allLogs, logLevel);
+            const resolvedLogLevel = logLevel || 'ALL';
+            const filteredLogs = filterLogsByLevel(allLogs, resolvedLogLevel);
             let output;
             if (filteredLogs.length === 0) {
-                // No logs match filter, show all logs instead
-                output = `No ${logLevel} level logs found for build #${buildId} in '${projectName}'.\nShowing all logs instead:\n\n${formatLogs(allLogs)}`;
+                output = `No ${resolvedLogLevel} level logs found for build #${buildId} in '${projectName}'.\nShowing all logs instead:\n\n${formatLogs(allLogs)}`;
             }
             else {
-                output = `Logs for build #${buildId} in '${projectName}' (${logLevel} level):\n\n${formatLogs(filteredLogs)}`;
+                output = `Logs for build #${buildId} in '${projectName}' (${resolvedLogLevel} level):\n\n${formatLogs(filteredLogs)}`;
             }
             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();
@@ -113,13 +114,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 => this.wrappedHandler(input));
     }
 }

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

@@ -1,15 +1,17 @@
-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;
     absoluteCurrentWorkingDirectory: z.ZodString;
     buildId: z.ZodOptional<z.ZodNumber>;
-    limit: z.ZodDefault<z.ZodOptional<z.ZodNumber>>;
+    limit: z.ZodOptional<z.ZodNumber>;
 }, 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,6 +1,5 @@
-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';
@@ -19,9 +18,8 @@ const inputSchema = {
         .describe('Optional: Specific build ID to inspect. If omitted, shows recent builds to help identify the latest build.'),
     limit: z
         .number()
-        .optional()
-        .default(3)
-        .describe('Number of recent builds to fetch when buildId is not specified.'),
+        .describe('Number of recent builds to fetch when buildId is not specified. Defaults to 3 if not specified.')
+        .optional(),
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
@@ -105,12 +103,11 @@ 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);
         try {
             const accountId = getConfigDefaultAccountIfExists()?.accountId;
             if (!accountId) {
@@ -127,7 +124,7 @@ export class GetBuildStatusTool extends Tool {
             }
             else {
                 const response = await fetchProjectBuilds(accountId, projectName, {
-                    limit,
+                    limit: limit || 3,
                 });
                 const { results } = response.data;
                 if (!results || results.length === 0) {
@@ -138,6 +135,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();
@@ -154,13 +155,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 => this.wrappedHandler(input));
     }
 }

package/mcp-server/tools/project/GetConfigValuesTool.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;
@@ -8,7 +10,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 }, z.core.$strip>;
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class GetConfigValuesTool extends Tool<InputSchemaType> {
-    constructor(mcpServer: McpServer);
+    constructor(mcpServer: McpServer, logger: McpLogger);
     handler({ platformVersion, featureType, absoluteCurrentWorkingDirectory, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }

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

@@ -1,10 +1,10 @@
-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 { getIntermediateRepresentationSchema } from '@hubspot/project-parsing-lib/schema';
 import { mapToInternalType } from '@hubspot/project-parsing-lib/transform';
-import { isV2Project } from '../../../lib/projects/platformVersion.js';
+import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
@@ -22,13 +22,13 @@ 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);
         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;
@@ -46,7 +46,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 +65,6 @@ export class GetConfigValuesTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: false,
             },
-        }, this.handler);
+        }, input => this.wrappedHandler(input));
     }
 }

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

@@ -1,13 +1,20 @@
-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;
-    command: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<"hs init">, z.ZodLiteral<"hs auth">, z.ZodLiteral<"hs project create">, z.ZodLiteral<"hs project upload">]>>;
+    command: z.ZodOptional<z.ZodEnum<{
+        "hs auth": "hs auth";
+        "hs project create": "hs project create";
+        "hs project upload": "hs project upload";
+        "hs init": "hs init";
+    }>>;
 }, 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 = {
@@ -14,12 +13,7 @@ const nextCommands = {
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
     command: z
-        .union([
-        z.literal('hs init'),
-        z.literal('hs auth'),
-        z.literal('hs project create'),
-        z.literal('hs project upload'),
-    ])
+        .enum(['hs init', 'hs auth', 'hs project create', 'hs project upload'])
         .describe('The command to learn more about.  Start with `hs init`')
         .optional(),
 };
@@ -29,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]}` : ''}`);
@@ -50,6 +43,6 @@ export class GuidedWalkthroughTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: false,
             },
-        }, this.handler);
+        }, input => this.wrappedHandler(input));
     }
 }

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 } from '../../Tool.js';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteProjectPath: z.ZodString;
     absoluteCurrentWorkingDirectory: z.ZodString;
@@ -9,7 +11,7 @@ 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);
+    constructor(mcpServer: McpServer, logger: McpLogger);
     handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }

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

@@ -2,11 +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/project.js';
+import { Tool } from '../../Tool.js';
+import { runCommandInDir } from '../../utils/command.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 { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
@@ -17,7 +16,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,12 +24,11 @@ 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, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName);
         let command = addFlag('hs project upload', 'force-create', true);
         const content = [];
         if (uploadMessage) {
@@ -49,6 +47,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;
             }
@@ -70,7 +72,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 +80,6 @@ export class UploadProjectTools extends Tool {
                 idempotentHint: true,
                 openWorldHint: true,
             },
-        }, this.handler);
+        }, input => this.wrappedHandler(input));
     }
 }

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 } 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,7 +9,7 @@ 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);
+    constructor(mcpServer: McpServer, logger: McpLogger);
     handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }: CreateProjectInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }

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

@@ -1,9 +1,8 @@
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { runCommandInDir } from '../../utils/project.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';
 const inputSchema = {
@@ -14,29 +13,32 @@ 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, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName);
         try {
             const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, 'hs project validate');
             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 => this.wrappedHandler(input));
     }
 }

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

@@ -1,6 +1,18 @@
 import z from 'zod';
 export declare const absoluteProjectPath: z.ZodString;
 export declare const absoluteCurrentWorkingDirectory: z.ZodString;
-export declare const features: z.ZodOptional<z.ZodArray<z.ZodUnion<readonly [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">]>>>;
+export declare const features: z.ZodOptional<z.ZodArray<z.ZodEnum<{
+    card: "card";
+    settings: "settings";
+    "app-event": "app-event";
+    "workflow-action-tool": "workflow-action-tool";
+    page: "page";
+    webhooks: "webhooks";
+    "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;