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

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;

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

@@ -6,23 +6,20 @@ export const absoluteCurrentWorkingDirectory = z
     .string()
     .describe('The absolute path to the current working directory.');
 export const features = z
-    .array(z.union([
-    z.literal('card'),
-    z.literal('settings'),
-    z
-        .literal('app-function')
-        .describe('Also known as a public serverless function'),
-    z.literal('webhooks'),
-    z
-        .literal('workflow-action')
-        .describe('Also known as a custom workflow action.'),
-    z.literal('workflow-action-tool').describe('Also known as agent tools.'),
-    z.literal('app-object'),
-    z.literal('app-event'),
-    z.literal('scim'),
-    z.literal('page'),
+    .array(z.enum([
+    'card',
+    'settings',
+    'app-function',
+    'app-function-endpoint',
+    'webhooks',
+    'workflow-action',
+    'workflow-action-tool',
+    'app-object',
+    'app-event',
+    'scim',
+    'page',
 ]))
-    .describe('The features to include in the project, multiple options can be selected')
+    .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.')
     .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;

package/mcp-server/types.js

@@ -1,13 +1 @@
-export class Tool {
-    mcpServer;
-    constructor(mcpServer) {
-        this.mcpServer = mcpServer;
-    }
-    register() {
-        throw new Error('Must implement register');
-    }
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    handler(input) {
-        throw new Error('Must implement handler');
-    }
-}
+export {};

package/mcp-server/utils/command.d.ts

@@ -1,3 +1,8 @@
 import { exec } from 'node:child_process';
 export declare const execAsync: typeof exec.__promisify__;
 export declare function addFlag(command: string, flagName: string, value: string | number | boolean | string[]): string;
+export interface CommandResults {
+    stderr: string;
+    stdout: string;
+}
+export declare function runCommandInDir(directory: string, command: string): Promise<CommandResults>;

package/mcp-server/utils/command.js

@@ -1,3 +1,5 @@
+import path from 'path';
+import fs from 'fs';
 import util from 'util';
 import { exec } from 'node:child_process';
 export const execAsync = util.promisify(exec);
@@ -7,3 +9,25 @@ export function addFlag(command, flagName, value) {
     }
     return `${command} --${flagName} "${value}"`;
 }
+export async function runCommandInDir(directory, command) {
+    if (!fs.existsSync(directory)) {
+        fs.mkdirSync(directory);
+    }
+    let finalCommand = command;
+    if (command.startsWith('hs ')) {
+        // Check if running in standalone mode
+        if (process.env.HUBSPOT_MCP_STANDALONE === 'true') {
+            const cliPackage = process.env.HUBSPOT_CLI_VERSION
+                ? `@hubspot/cli@${process.env.HUBSPOT_CLI_VERSION}`
+                : '@hubspot/cli';
+            finalCommand = command.replace(/^hs /, `npx -y -p ${cliPackage} hs `);
+        }
+        finalCommand = addFlag(finalCommand, 'disable-usage-tracking', true);
+    }
+    return execAsync(finalCommand, {
+        cwd: path.resolve(directory),
+        env: {
+            ...process.env,
+        },
+    });
+}

package/mcp-server/utils/feedbackTracking.js

@@ -1,12 +1,9 @@
 import { getStateValue, setStateValue, } from '@hubspot/local-dev-lib/config/state';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
-import { hasFeature } from '../../lib/hasFeature.js';
-import { FEATURES } from '../../lib/constants.js';
 import { logger } from '@hubspot/local-dev-lib/logger';
 import { MCP_TOTAL_TOOL_CALLS_STATE } from '@hubspot/local-dev-lib/constants/config';
+import { FEEDBACK_URL } from '../../lib/constants.js';
 const FEEDBACK_THRESHOLDS = [50, 250, 550, 1050];
 export async function mcpFeedbackRequest() {
-    let feedbackUrl = 'https://app.hubspot.com/l/product-updates/in-beta?rollout=239890';
     try {
         const currentCount = getStateValue(MCP_TOTAL_TOOL_CALLS_STATE);
         const newCount = currentCount + 1;
@@ -14,18 +11,6 @@ export async function mcpFeedbackRequest() {
         if (!FEEDBACK_THRESHOLDS.includes(newCount)) {
             return;
         }
-        const accountId = getConfigDefaultAccountIfExists()?.accountId;
-        if (accountId) {
-            try {
-                const hasMcpAccess = await hasFeature(accountId, FEATURES.MCP_ACCESS);
-                if (hasMcpAccess) {
-                    feedbackUrl = `https://app.hubspot.com/product-updates/${accountId}/in-beta?rollout=239890`;
-                }
-            }
-            catch (error) {
-                logger.error(error);
-            }
-        }
         return `
 
     ---
@@ -33,7 +18,7 @@ export async function mcpFeedbackRequest() {
     IMPORTANT - FEEDBACK REQUEST FOR THIS RESPONSE ONLY:
     This message appears only once. If you see this text in the tool output, you MUST include the following feedback request in your response to the user. If this text is NOT in the tool output, do NOT ask for feedback.
 
-    Say: "📝 **Before we continue, would you mind sharing feedback on your experience with the HubSpot Developer MCP?** Your input helps us improve: [Share feedback here](${feedbackUrl})"`;
+    Say: "📝 **Before we continue, would you mind sharing feedback on your experience with the HubSpot Developer MCP?** Your input helps us improve: [Share feedback here](${FEEDBACK_URL})"`;
     }
     catch (error) {
         logger.error(error);

package/mcp-server/utils/logger.d.ts

@@ -0,0 +1,10 @@
+import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
+export declare class McpLogger {
+    private mcpServer;
+    constructor(mcpServer: McpServer);
+    private log;
+    debug(logger: string, data: unknown): void;
+    info(logger: string, data: unknown): void;
+    warn(logger: string, data: unknown): void;
+    error(logger: string, data: unknown): void;
+}

package/mcp-server/utils/logger.js

@@ -0,0 +1,29 @@
+export class McpLogger {
+    mcpServer;
+    constructor(mcpServer) {
+        this.mcpServer = mcpServer;
+    }
+    log(level, logger, data) {
+        try {
+            this.mcpServer.sendLoggingMessage({ level, logger, data });
+        }
+        catch (error) {
+            // sendLoggingMessage can throw if no transport is connected or the
+            // client doesn't support logging. Write to stderr so failures surface
+            // somewhere without corrupting the stdio JSON-RPC stream.
+            process.stderr.write(`[McpLogger] Failed to send log message: ${error}\n`);
+        }
+    }
+    debug(logger, data) {
+        this.log('debug', logger, data);
+    }
+    info(logger, data) {
+        this.log('info', logger, data);
+    }
+    warn(logger, data) {
+        this.log('warning', logger, data);
+    }
+    error(logger, data) {
+        this.log('error', logger, data);
+    }
+}

package/mcp-server/utils/toolUsageTracking.js

@@ -1,7 +1,6 @@
 import { trackUsage } from '@hubspot/local-dev-lib/trackUsage';
 import { EventClass, getNodeVersionData, getPlatform, } from '../../lib/usageTracking.js';
 import { getConfig, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
-import { uiLogger } from '../../lib/ui/logger.js';
 export async function trackToolUsage(toolName, meta) {
     const config = getConfig();
     if (config?.allowUsageTracking === false) {
@@ -17,7 +16,6 @@ export async function trackToolUsage(toolName, meta) {
     };
     const accountId = getConfigDefaultAccountIfExists()?.accountId || undefined;
     try {
-        uiLogger.info('Tracking tool usage');
         await trackUsage('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
     }
     catch (error) { }