@hubspot/cli 8.1.0-beta.0 → 8.1.0-experimental.0

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

@@ -1,11 +1,10 @@
 import { z } from 'zod';
 import fs from 'fs';
-import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { addFlag } from '../../utils/command.js';
-import { runCommandInDir } from '../../utils/project.js';
+import { runCommandInDir } from '../../utils/command.js';
 import { ACCOUNT_LEVELS, ACCOUNT_LEVEL_CHOICES, } from '../../../lib/constants.js';
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { absoluteCurrentWorkingDirectory } from './constants.js';
 import { getConfigAccountByName } from '@hubspot/local-dev-lib/config';
 import { setupHubSpotConfig } from '../../utils/config.js';
@@ -58,7 +57,7 @@ const inputSchema = {
     contentLevel: z
         .enum(ACCOUNT_LEVEL_CHOICES)
         .optional()
-        .describe(`CMS Hub tier level. Options: ${ACCOUNT_LEVEL_CHOICES.join(', ')}. Defaults to ENTERPRISE if not specified.`),
+        .describe(`Content Hub tier level. Options: ${ACCOUNT_LEVEL_CHOICES.join(', ')}. Defaults to ENTERPRISE if not specified.`),
     commerceLevel: z
         .enum(ACCOUNT_LEVEL_CHOICES_WITHOUT_STARTER)
         .optional()
@@ -68,12 +67,11 @@ const inputSchema = {
 const createTestAccountInputSchema = z.object({ ...inputSchema });
 const toolName = 'create-test-account';
 export class CreateTestAccountTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
     async handler({ absoluteCurrentWorkingDirectory, name, description, marketingLevel, opsLevel, serviceLevel, salesLevel, contentLevel, commerceLevel, configPath, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName);
         let command = 'hs test-account create';
         const content = [];
         // Use config file if provided (LLM should check for config first)
@@ -84,6 +82,10 @@ export class CreateTestAccountTool extends Tool {
                 configJson = JSON.parse(config);
             }
             catch (error) {
+                this.logger.debug(toolName, {
+                    message: 'Handler caught error reading config file',
+                    error: error instanceof Error ? error.message : String(error),
+                });
                 return {
                     content: [
                         formatTextContent(`Failed to read or parse config file at "${configPath}": ${getErrorMessage(error)}. Please ensure the file exists and contains valid JSON.`),
@@ -97,7 +99,10 @@ export class CreateTestAccountTool extends Tool {
                     }
                 }
                 catch (error) {
-                    // nothing to do here
+                    this.logger.debug(toolName, {
+                        message: 'Handler caught error checking account by config name',
+                        error: error instanceof Error ? error.message : String(error),
+                    });
                 }
             }
             command = addFlag(command, 'config-path', configPath);
@@ -110,7 +115,10 @@ export class CreateTestAccountTool extends Tool {
                 }
             }
             catch (e) {
-                // nothing to do here
+                this.logger.debug(toolName, {
+                    message: 'Handler caught error checking account by name',
+                    error: e instanceof Error ? e.message : String(e),
+                });
             }
             command = addFlag(command, 'name', name);
             command = addFlag(command, 'description', description || name);
@@ -135,6 +143,10 @@ export class CreateTestAccountTool extends Tool {
             return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
+            this.logger.debug(toolName, {
+                message: 'Handler caught error',
+                error: error instanceof Error ? error.message : String(error),
+            });
             return formatTextContents(absoluteCurrentWorkingDirectory, getErrorMessage(error));
         }
     }
@@ -165,6 +177,6 @@ export class CreateTestAccountTool extends Tool {
                 idempotentHint: false,
                 openWorldHint: true,
             },
-        }, this.handler);
+        }, input => this.wrappedHandler(input));
     }
 }

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

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

@@ -1,10 +1,9 @@
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { addFlag } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { runCommandInDir } from '../../utils/project.js';
+import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
-import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
     absoluteProjectPath,
@@ -19,12 +18,11 @@ const inputSchemaZodObject = z.object({
 });
 const toolName = 'deploy-project';
 export class DeployProjectTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
     async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildNumber, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName);
         let command = `hs project deploy`;
         const content = [];
         if (!buildNumber) {
@@ -45,7 +43,7 @@ export class DeployProjectTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Deploy a build of HubSpot Project',
-            description: 'Takes a build number and a project name and deploys that build of the project. DO NOT run this tool unless the user specifies they would like to deploy the project.',
+            description: 'Takes a build number and a project name and deploys that build of the project. DO NOT run this tool unless the user specifies they would like to deploy 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: false,
@@ -53,6 +51,6 @@ export class DeployProjectTool extends Tool {
                 idempotentHint: true,
                 openWorldHint: true,
             },
-        }, this.handler);
+        }, input => this.wrappedHandler(input));
     }
 }

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

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

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

@@ -1,7 +1,6 @@
 import z from 'zod';
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { formatTextContents } from '../../utils/content.js';
-import { trackToolUsage } from '../../utils/toolUsageTracking.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';
@@ -17,12 +16,11 @@ const inputSchemaZodObject = z.object({
 });
 const toolName = 'fetch-doc';
 export class DocFetchTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
     async handler({ docUrl, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName);
         try {
             // Append .md extension to the URL
             const markdownUrl = `${docUrl}.md`;
@@ -36,6 +34,10 @@ export class DocFetchTool extends Tool {
             return formatTextContents(content);
         }
         catch (error) {
+            this.logger.debug(toolName, {
+                message: 'Handler caught error',
+                error: error instanceof Error ? error.message : String(error),
+            });
             if (isHubSpotHttpError(error)) {
                 return formatTextContents(error.toString());
             }
@@ -52,6 +54,6 @@ export class DocFetchTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, this.handler);
+        }, input => this.wrappedHandler(input));
     }
 }

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

@@ -1,9 +1,12 @@
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpLogger } from '../../utils/logger.js';
 import z from 'zod';
-import { TextContentResponse, Tool } from '../../types.js';
+import { TextContentResponse } from '../../types.js';
+import { Tool } from '../../Tool.js';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: z.ZodString;
     docsSearchQuery: z.ZodString;
+    docsSearchLimit: z.ZodDefault<z.ZodNumber>;
 }, z.z.core.$strip>;
 export interface DocsSearchResponse {
     results: {
@@ -16,8 +19,11 @@ export interface DocsSearchResponse {
 }
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class DocsSearchTool extends Tool<InputSchemaType> {
-    constructor(mcpServer: McpServer);
-    handler({ docsSearchQuery, absoluteCurrentWorkingDirectory, }: InputSchemaType): Promise<TextContentResponse>;
+    constructor(mcpServer: McpServer, logger: McpLogger);
+    protected getTrackingMeta({ docsSearchQuery, }: InputSchemaType): {
+        [key: string]: string;
+    } | undefined;
+    handler({ docsSearchQuery, docsSearchLimit, absoluteCurrentWorkingDirectory, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,16 +1,23 @@
 import { http } from '@hubspot/local-dev-lib/http';
 import z from 'zod';
-import { Tool } from '../../types.js';
+import { Tool } from '../../Tool.js';
 import { formatTextContents } from '../../utils/content.js';
-import { trackToolUsage } from '../../utils/toolUsageTracking.js';
 import { absoluteCurrentWorkingDirectory, docsSearchQuery, } from './constants.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
+const docsSearchLimit = z
+    .number()
+    .int()
+    .min(1)
+    .max(20)
+    .default(5)
+    .describe('Maximum number of results to return.');
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
     docsSearchQuery,
+    docsSearchLimit,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({
@@ -18,12 +25,14 @@ const inputSchemaZodObject = z.object({
 });
 const toolName = 'search-docs';
 export class DocsSearchTool extends Tool {
-    constructor(mcpServer) {
-        super(mcpServer);
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
     }
-    async handler({ docsSearchQuery, absoluteCurrentWorkingDirectory, }) {
+    getTrackingMeta({ docsSearchQuery, }) {
+        return { mode: docsSearchQuery };
+    }
+    async handler({ docsSearchQuery, docsSearchLimit, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        await trackToolUsage(toolName, { mode: docsSearchQuery });
         const accountId = getConfigDefaultAccountIfExists()?.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>\``;
@@ -40,13 +49,27 @@ export class DocsSearchTool extends Tool {
             if (!results || results.length === 0) {
                 return formatTextContents('No documentation found for your query.');
             }
-            const formattedResults = results
+            // The docs-search API returns duplicate URLs; dedupe to avoid wasting the result limit on repeats
+            const seen = new Set();
+            const dedupedResults = results.filter(result => {
+                if (seen.has(result.url)) {
+                    return false;
+                }
+                seen.add(result.url);
+                return true;
+            });
+            const limitedResults = dedupedResults.slice(0, docsSearchLimit);
+            const formattedResults = limitedResults
                 .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}`;
+            const successMessage = `Found ${dedupedResults.length} results, showing top ${limitedResults.length}:\n\n${formattedResults}`;
             return formatTextContents(successMessage);
         }
         catch (error) {
+            this.logger.debug(toolName, {
+                message: 'Handler caught error',
+                error: error instanceof Error ? error.message : String(error),
+            });
             if (isHubSpotHttpError(error)) {
                 // Handle different status codes
                 return formatTextContents(error.toString());
@@ -64,6 +87,6 @@ export class DocsSearchTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, this.handler);
+        }, input => this.wrappedHandler(input));
     }
 }

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

@@ -0,0 +1,15 @@
+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<{
+    absoluteDirectory: z.ZodString;
+}, z.core.$strip>;
+export type FindProjectsInputSchema = z.infer<typeof inputSchemaZodObject>;
+export declare class FindProjectsTool extends Tool<FindProjectsInputSchema> {
+    constructor(mcpServer: McpServer, logger: McpLogger);
+    handler({ absoluteDirectory, }: FindProjectsInputSchema): Promise<TextContentResponse>;
+    register(): RegisteredTool;
+}
+export {};

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

@@ -0,0 +1,60 @@
+import { Tool } from '../../Tool.js';
+import { z } from 'zod';
+import { formatTextContents } from '../../utils/content.js';
+import { walk } from '@hubspot/local-dev-lib/fs';
+import path from 'path';
+import { PROJECT_CONFIG_FILE } from '../../../lib/constants.js';
+const TOOL_NAME = 'find-projects';
+const IGNORE_DIRS = ['node_modules', '.git', '.vite'];
+const inputSchema = {
+    absoluteDirectory: z
+        .string()
+        .describe('The absolute path to the directory to search for HubSpot projects in.'),
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const inputSchemaZodObject = z.object({ ...inputSchema });
+export class FindProjectsTool extends Tool {
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, TOOL_NAME);
+    }
+    async handler({ absoluteDirectory, }) {
+        try {
+            const allFiles = await walk(absoluteDirectory, IGNORE_DIRS);
+            const projectFiles = allFiles.filter(file => path.basename(file) === PROJECT_CONFIG_FILE);
+            if (projectFiles.length === 0) {
+                return formatTextContents(`No ${PROJECT_CONFIG_FILE} files found under ${absoluteDirectory}.`);
+            }
+            const projectDirs = projectFiles.map(file => path.dirname(file));
+            const output = [
+                `Found ${projectFiles.length} project(s):`,
+                '',
+                ...projectDirs.map(dir => `  ${dir}`),
+            ].join('\n');
+            return formatTextContents(output);
+        }
+        catch (error) {
+            this.logger.debug(TOOL_NAME, {
+                message: 'Handler caught error',
+                error: error instanceof Error ? error.message : String(error),
+            });
+            const cause = error instanceof Error ? error.cause : undefined;
+            const causeMessage = cause instanceof Error ? `: ${cause.message}` : '';
+            const errorMessage = error instanceof Error
+                ? error.message || `FileSystemError${causeMessage}`
+                : String(error);
+            return formatTextContents(`Error searching for projects: ${errorMessage}`);
+        }
+    }
+    register() {
+        return this.mcpServer.registerTool(TOOL_NAME, {
+            title: 'Find HubSpot Projects',
+            description: 'Use this tool to locate HubSpot projects. Traverses child directories of the given directory to find hsproject.json files, returning the paths of all discovered HubSpot projects.',
+            inputSchema,
+            annotations: {
+                readOnlyHint: true,
+                openWorldHint: false,
+                idempotentHint: true,
+            },
+        }, input => this.wrappedHandler(input));
+    }
+}

package/mcp-server/tools/project/GetApiUsagePatternsByAppIdTool.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;
@@ -9,7 +11,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 }, z.core.$strip>;
 export type GetApiUsagePatternsByAppIdInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class GetApiUsagePatternsByAppIdTool extends Tool<GetApiUsagePatternsByAppIdInputSchema> {
-    constructor(mcpServer: McpServer);
+    constructor(mcpServer: McpServer, logger: McpLogger);
     handler({ appId, startDate, endDate, absoluteCurrentWorkingDirectory, }: GetApiUsagePatternsByAppIdInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }

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