@hubspot/cli 8.10.0 → 8.11.0-beta.0

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

@@ -1,8 +1,7 @@
 import { z } from 'zod';
 import fs from 'fs';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
-import { addFlag } from '../../utils/command.js';
-import { runCommandInDir } from '../../utils/command.js';
+import { HubSpotCommand } from '../../utils/command.js';
 import { ACCOUNT_LEVELS, ACCOUNT_LEVEL_CHOICES, } from '../../../lib/constants.js';
 import { Tool } from '../../Tool.js';
 import { absoluteCurrentWorkingDirectory } from './constants.js';
@@ -70,9 +69,9 @@ export class CreateTestAccountTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ absoluteCurrentWorkingDirectory, name, description, marketingLevel, opsLevel, serviceLevel, salesLevel, contentLevel, commerceLevel, configPath, }) {
+    async handler({ absoluteCurrentWorkingDirectory, name, description, marketingLevel, opsLevel, serviceLevel, salesLevel, contentLevel, commerceLevel, configPath, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = 'hs test-account create';
+        const command = new HubSpotCommand('test-account create');
         const content = [];
         // Use config file if provided (LLM should check for config first)
         if (configPath) {
@@ -105,7 +104,7 @@ export class CreateTestAccountTool extends Tool {
                     });
                 }
             }
-            command = addFlag(command, 'config-path', configPath);
+            command.addFlag('config-path', configPath);
         }
         // Use flags if name is provided (when no config used)
         else if (name) {
@@ -120,14 +119,14 @@ export class CreateTestAccountTool extends Tool {
                     error: e instanceof Error ? e.message : String(e),
                 });
             }
-            command = addFlag(command, 'name', name);
-            command = addFlag(command, 'description', description || name);
-            command = addFlag(command, 'marketing-level', marketingLevel || 'ENTERPRISE');
-            command = addFlag(command, 'ops-level', opsLevel || 'ENTERPRISE');
-            command = addFlag(command, 'service-level', serviceLevel || 'ENTERPRISE');
-            command = addFlag(command, 'sales-level', salesLevel || 'ENTERPRISE');
-            command = addFlag(command, 'content-level', contentLevel || 'ENTERPRISE');
-            command = addFlag(command, 'commerce-level', commerceLevel || 'ENTERPRISE');
+            command.addFlag('name', name);
+            command.addFlag('description', description || name);
+            command.addFlag('marketing-level', marketingLevel || 'ENTERPRISE');
+            command.addFlag('ops-level', opsLevel || 'ENTERPRISE');
+            command.addFlag('service-level', serviceLevel || 'ENTERPRISE');
+            command.addFlag('sales-level', salesLevel || 'ENTERPRISE');
+            command.addFlag('content-level', contentLevel || 'ENTERPRISE');
+            command.addFlag('commerce-level', commerceLevel || 'ENTERPRISE');
         }
         else {
             content.push(formatTextContent(`Ask the user for the account config JSON path or the name of the test account to create.`));
@@ -139,7 +138,7 @@ export class CreateTestAccountTool extends Tool {
         }
         // No flags or config - command will prompt user interactively
         try {
-            const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
+            const { stdout, stderr } = await this.runCommand(absoluteCurrentWorkingDirectory, command, extra);
             return formatTextContents(absoluteCurrentWorkingDirectory, stdout, stderr);
         }
         catch (error) {
@@ -177,6 +176,6 @@ export class CreateTestAccountTool extends Tool {
                 idempotentHint: false,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

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

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

@@ -1,8 +1,7 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { addFlag } from '../../utils/command.js';
+import { HubSpotCommand } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
@@ -21,23 +20,24 @@ export class DeployProjectTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildNumber, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildNumber, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = `hs project deploy`;
         const content = [];
         if (!buildNumber) {
-            const { stdout } = await runCommandInDir(absoluteProjectPath, `hs project list-builds --limit 100`);
+            const { stdout } = await this.runCommand(absoluteProjectPath, new HubSpotCommand('project list-builds', [
+                { name: 'limit', value: 100 },
+            ]), extra);
             content.push(formatTextContent(`Ask the user which build number they would like to deploy?  Build information: ${stdout}`));
         }
-        else {
-            command = addFlag(command, 'build', buildNumber);
-        }
         if (content.length) {
             return {
                 content,
             };
         }
-        const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, command);
+        const command = new HubSpotCommand('project deploy', [
+            { name: 'build', value: buildNumber },
+        ]);
+        const { stdout, stderr } = await this.runCommand(absoluteProjectPath, command, extra);
         return formatTextContents(stdout, stderr);
     }
     register() {
@@ -51,6 +51,6 @@ export class DeployProjectTool extends Tool {
                 idempotentHint: true,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -54,6 +54,6 @@ export class DocFetchTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -33,9 +33,15 @@ export class DocsSearchTool extends Tool {
     }
     async handler({ docsSearchQuery, docsSearchLimit, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        const accountId = getConfigDefaultAccountIfExists()?.accountId;
+        let accountId;
+        try {
+            accountId = getConfigDefaultAccountIfExists()?.accountId;
+        }
+        catch {
+            // Config file does not exist
+        }
         if (!accountId) {
-            const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
+            const authErrorMessage = `No account ID found. Call the auth-account tool to authenticate a HubSpot account.`;
             return formatTextContents(authErrorMessage);
         }
         try {
@@ -87,6 +93,6 @@ export class DocsSearchTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -55,6 +55,6 @@ export class FindProjectsTool extends Tool {
                 openWorldHint: false,
                 idempotentHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -31,10 +31,15 @@ export class GetApiUsagePatternsByAppIdTool extends Tool {
     async handler({ appId, startDate, endDate, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         try {
-            // Get account ID from CLI config
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
+            let accountId;
+            try {
+                accountId = getConfigDefaultAccountIfExists()?.accountId;
+            }
+            catch {
+                // Config file does not exist
+            }
             if (!accountId) {
-                const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
+                const authErrorMessage = `No account ID found. Call the auth-account tool to authenticate a HubSpot account.`;
                 return formatTextContents(authErrorMessage);
             }
             const response = await http.get(accountId, {
@@ -70,6 +75,6 @@ export class GetApiUsagePatternsByAppIdTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -18,10 +18,15 @@ export class GetApplicationInfoTool extends Tool {
     async handler({ absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         try {
-            // Get account ID from CLI config
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
+            let accountId;
+            try {
+                accountId = getConfigDefaultAccountIfExists()?.accountId;
+            }
+            catch {
+                // Config file does not exist
+            }
             if (!accountId) {
-                const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
+                const authErrorMessage = `No account ID found. Call the auth-account tool to authenticate a HubSpot account.`;
                 return formatTextContents(authErrorMessage);
             }
             const response = await http.get(accountId, {
@@ -53,6 +58,6 @@ export class GetApplicationInfoTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -64,9 +64,15 @@ export class GetBuildLogsTool extends Tool {
     async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildId, logLevel, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         try {
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
+            let accountId;
+            try {
+                accountId = getConfigDefaultAccountIfExists()?.accountId;
+            }
+            catch {
+                // Config file does not exist
+            }
             if (!accountId) {
-                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Please run `hs account auth` to configure an account, or set a default account with `hs account use <account>`');
+                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Call the auth-account tool to authenticate a HubSpot account.');
             }
             const { projectConfig, projectDir } = await getProjectConfig(absoluteProjectPath);
             validateProjectConfig(projectConfig, projectDir);
@@ -121,6 +127,6 @@ export class GetBuildLogsTool extends Tool {
                 openWorldHint: true,
                 idempotentHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -109,9 +109,15 @@ export class GetBuildStatusTool extends Tool {
     async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildId, limit, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         try {
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
+            let accountId;
+            try {
+                accountId = getConfigDefaultAccountIfExists()?.accountId;
+            }
+            catch {
+                // Config file does not exist
+            }
             if (!accountId) {
-                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Please run `hs account auth` to configure an account, or set a default account with `hs account use <account>`');
+                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Call the auth-account tool to authenticate a HubSpot account.');
             }
             const { projectConfig, projectDir } = await getProjectConfig(absoluteProjectPath);
             validateProjectConfig(projectConfig, projectDir);
@@ -162,6 +168,6 @@ export class GetBuildStatusTool extends Tool {
                 openWorldHint: true,
                 idempotentHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -31,9 +31,15 @@ export class GetConfigValuesTool extends Tool {
             if (isLegacyProject(platformVersion)) {
                 return formatTextContents(`Can only be used on projects with a minimum platformVersion of 2025.2`);
             }
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
+            let accountId;
+            try {
+                accountId = getConfigDefaultAccountIfExists()?.accountId;
+            }
+            catch {
+                // Config file does not exist
+            }
             if (!accountId) {
-                const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
+                const authErrorMessage = `No account ID found. Call the auth-account tool to authenticate a HubSpot account.`;
                 return formatTextContents(authErrorMessage);
             }
             const schema = await getIntermediateRepresentationSchema({
@@ -65,6 +71,6 @@ export class GetConfigValuesTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: false,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -43,6 +43,6 @@ export class GuidedWalkthroughTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: false,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

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

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

@@ -3,10 +3,9 @@ import z from 'zod';
 import { getAllHsProfiles } from '@hubspot/project-parsing-lib/profiles';
 import { getProjectConfig } from '../../../lib/projects/config.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 { addFlag } from '../../utils/command.js';
+import { HubSpotCommand } from '../../utils/command.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 const inputSchema = {
     absoluteProjectPath,
@@ -27,15 +26,17 @@ export class UploadProjectTools extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, profile, uploadMessage, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = addFlag('hs project upload', 'force', true);
+        const command = new HubSpotCommand('project upload', [
+            { name: 'force', value: true },
+        ]);
         const content = [];
         if (uploadMessage) {
-            command = addFlag(command, 'message', uploadMessage);
+            command.addFlag('message', uploadMessage);
         }
         if (profile) {
-            command = addFlag(command, 'profile', profile);
+            command.addFlag('profile', profile);
         }
         else {
             let hasProfiles = false;
@@ -63,7 +64,7 @@ export class UploadProjectTools extends Tool {
                 content,
             };
         }
-        const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, command);
+        const { stdout, stderr } = await this.runCommand(absoluteProjectPath, command, extra);
         const response = await formatTextContents(stdout, stderr);
         // Add reminder about cards needing to be added to views
         response.content.push(formatTextContent('\nIMPORTANT: If this project contains cards, remember that uploading does NOT make them live automatically. Cards must be manually added to a view in HubSpot to become visible to users.'));
@@ -80,6 +81,6 @@ export class UploadProjectTools extends Tool {
                 idempotentHint: true,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

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

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

@@ -1,10 +1,10 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
+import { HubSpotCommand } from '../../utils/command.js';
 const inputSchema = {
     absoluteProjectPath,
     absoluteCurrentWorkingDirectory,
@@ -16,10 +16,11 @@ export class ValidateProjectTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         try {
-            const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, 'hs project validate');
+            const command = new HubSpotCommand('project validate');
+            const { stdout, stderr } = await this.runCommand(absoluteProjectPath, command, extra);
             return formatTextContents(stdout, stderr);
         }
         catch (error) {
@@ -39,6 +40,6 @@ export class ValidateProjectTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: false,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -1,8 +1,31 @@
 import { exec } from 'node:child_process';
+export interface Command {
+    executable: string;
+    args: string[];
+}
+export type FlagValue = string | number | boolean | string[];
+export interface Flag {
+    name: string;
+    value: FlagValue;
+}
+export declare class HubSpotCommand implements Command {
+    readonly executable = "hs";
+    private readonly subcommandArgs;
+    private readonly positionalArgs;
+    private readonly flags;
+    constructor(subcommand: string, flags?: Flag[]);
+    addArg(value: string): this;
+    addFlag(name: string, value: FlagValue): this;
+    get args(): string[];
+}
+export declare class NpxHubSpotCommand implements Command {
+    readonly executable = "npx";
+    readonly args: string[];
+    constructor(command: Command, cliPackage?: string);
+}
 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>;
+export declare function runCommandInDir(directory: string, command: Command, onData?: (chunk: string, source: 'stdout' | 'stderr') => void): Promise<CommandResults>;

package/mcp-server/utils/command.js

@@ -1,35 +1,85 @@
 import path from 'path';
 import fs from 'fs';
 import util from 'util';
-import { exec } from 'node:child_process';
-export const execAsync = util.promisify(exec);
-export function addFlag(command, flagName, value) {
-    if (Array.isArray(value)) {
-        return `${command} --${flagName} ${value.map(item => `"${item}"`).join(' ')}`;
+import { exec, spawn } from 'node:child_process';
+export class HubSpotCommand {
+    executable = 'hs';
+    subcommandArgs;
+    positionalArgs;
+    flags;
+    constructor(subcommand, flags = []) {
+        this.subcommandArgs = subcommand.trim().split(/\s+/);
+        this.positionalArgs = [];
+        this.flags = [...flags];
+    }
+    addArg(value) {
+        this.positionalArgs.push(value);
+        return this;
+    }
+    addFlag(name, value) {
+        this.flags.push({ name, value });
+        return this;
+    }
+    get args() {
+        return [
+            ...this.subcommandArgs,
+            ...this.positionalArgs,
+            ...this.flags.flatMap(({ name, value }) => Array.isArray(value)
+                ? [`--${name}`, ...value.map(String)]
+                : [`--${name}`, String(value)]),
+        ];
     }
-    return `${command} --${flagName} "${value}"`;
 }
-export async function runCommandInDir(directory, command) {
+export class NpxHubSpotCommand {
+    executable = 'npx';
+    args;
+    constructor(command, cliPackage = '@hubspot/cli') {
+        this.args = ['-y', '-p', cliPackage, 'hs', ...command.args];
+    }
+}
+export const execAsync = util.promisify(exec);
+export async function runCommandInDir(directory, command, onData) {
     if (!fs.existsSync(directory)) {
         fs.mkdirSync(directory);
     }
     let finalCommand = command;
-    if (command.startsWith('hs ')) {
-        // Check if running in standalone mode
+    if (command instanceof HubSpotCommand) {
+        command.addFlag('disable-usage-tracking', 'true');
         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 = new NpxHubSpotCommand(command, cliPackage);
         }
-        finalCommand = addFlag(finalCommand, 'disable-usage-tracking', true);
     }
     const resolvedDir = path.resolve(directory);
-    return execAsync(finalCommand, {
-        cwd: resolvedDir,
-        env: {
-            ...process.env,
-            INIT_CWD: resolvedDir,
-        },
+    return new Promise((resolve, reject) => {
+        const stdoutChunks = [];
+        const stderrChunks = [];
+        const child = spawn(finalCommand.executable, finalCommand.args, {
+            cwd: resolvedDir,
+            env: { ...process.env, INIT_CWD: resolvedDir },
+        });
+        child.stdout.on('data', (chunk) => {
+            const text = chunk.toString();
+            stdoutChunks.push(text);
+            onData?.(text, 'stdout');
+        });
+        child.stderr.on('data', (chunk) => {
+            const text = chunk.toString();
+            stderrChunks.push(text);
+            onData?.(text, 'stderr');
+        });
+        child.on('error', reject);
+        child.on('close', code => {
+            const stdout = stdoutChunks.join('');
+            const stderr = stderrChunks.join('');
+            if (code !== 0) {
+                reject(Object.assign(new Error(`Command failed: ${finalCommand.executable} ${finalCommand.args.join(' ')}\n${stderr}`), { code, stdout, stderr }));
+            }
+            else {
+                resolve({ stdout, stderr });
+            }
+        });
     });
 }

package/mcp-server/utils/toolUsageTracking.js

@@ -2,7 +2,14 @@ import { EventClass, getExecutionEnvironmentMeta, } from '../../lib/usageTrackin
 import { getConfig, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { sendUsageEvent } from '../../lib/api/usageTracking.js';
 export async function trackToolUsage(toolName, meta) {
-    const config = getConfig();
+    let config;
+    try {
+        config = getConfig();
+    }
+    catch {
+        // No config file exists yet; skip tracking
+        return;
+    }
     if (config?.allowUsageTracking === false) {
         return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.10.0",
+    "version": "8.11.0-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -10,7 +10,7 @@
         "!**/__tests__/**"
     ],
     "dependencies": {
-        "@hubspot/local-dev-lib": "5.9.0",
+        "@hubspot/local-dev-lib": "5.10.0",
         "@hubspot/project-parsing-lib": "0.19.1",
         "@hubspot/serverless-dev-runtime": "7.0.7",
         "@hubspot/ui-extensions-dev-server": "2.0.10",
@@ -60,7 +60,7 @@
         "@typescript-eslint/eslint-plugin": "^8.30.1",
         "@typescript-eslint/parser": "^8.11.0",
         "@vitest/coverage-v8": "^2.1.9",
-        "axios": "1.15.2",
+        "axios": "1.16.0",
         "eslint": "^8.56.0",
         "eslint-plugin-import": "^2.31.0",
         "husky": "^4.3.8",