@hubspot/cli 8.2.0-experimental.2 → 8.2.1-experimental.0

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

@@ -1,14 +1,15 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { formatTextContents } from '../../utils/content.js';
-import { absoluteCurrentWorkingDirectory } from './constants.js';
+import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
 import { getIntermediateRepresentationSchema } from '@hubspot/project-parsing-lib/schema';
 import { mapToInternalType } from '@hubspot/project-parsing-lib/transform';
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
+    absoluteProjectPath: absoluteProjectPath.optional(),
     platformVersion: z
         .string()
         .describe('The platform version for the project. Located in the hsproject.json file.'),
@@ -25,15 +26,16 @@ export class GetConfigValuesTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ platformVersion, featureType, absoluteCurrentWorkingDirectory, }) {
-        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
+    async handler({ platformVersion, featureType, absoluteCurrentWorkingDirectory, absoluteProjectPath, }) {
+        setupHubSpotConfig(absoluteProjectPath ?? absoluteCurrentWorkingDirectory);
         try {
             if (isLegacyProject(platformVersion)) {
                 return formatTextContents(`Can only be used on projects with a minimum platformVersion of 2025.2`);
             }
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
+            const { recommended } = await discoverAccountTargets();
+            const accountId = recommended?.accountId;
             if (!accountId) {
-                const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
+                const authErrorMessage = `No account ID found. Call the auth-account tool to authenticate a HubSpot account.`;
                 return formatTextContents(authErrorMessage);
             }
             const schema = await getIntermediateRepresentationSchema({
@@ -65,6 +67,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-create', true);
+        const command = new HubSpotCommand('project upload', [
+            { name: 'force', value: true },
+        ]);
         const content = [];
         if (uploadMessage) {
-            command = addFlag(command, 'message', uploadMessage);
+            command.addFlag('message', uploadMessage);
         }
         if (profile) {
-            command = addFlag(command, 'profile', profile);
+            command.addFlag('profile', profile);
         }
         else {
             let hasProfiles = false;
@@ -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/tools/project/constants.d.ts

@@ -6,6 +6,7 @@ export declare const features: z.ZodOptional<z.ZodArray<z.ZodEnum<{
     settings: "settings";
     "app-event": "app-event";
     "workflow-action-tool": "workflow-action-tool";
+    "crm-bulk-action": "crm-bulk-action";
     page: "page";
     webhooks: "webhooks";
     "app-function": "app-function";

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

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

package/mcp-server/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/config.js

@@ -8,4 +8,9 @@ export function setupHubSpotConfig(absoluteCurrentWorkingDirectory) {
     if (configPath) {
         process.env.HUBSPOT_CONFIG_PATH = configPath;
     }
+    else {
+        // Clear any value set by a previous tool call so this call doesn't
+        // inherit a stale config path from a different project.
+        delete process.env.HUBSPOT_CONFIG_PATH;
+    }
 }

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

@@ -1,10 +1,13 @@
 import { McpServer } from '@modelcontextprotocol/sdk/server/mcp.js';
 export declare class McpLogger {
     private mcpServer;
+    private invocationStorage;
     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;
+    runWithBuffer<T>(fn: () => Promise<T>): Promise<T>;
+    flushLogsToFile(filenamePrefix: string): string | null;
 }

package/mcp-server/utils/logger.js

@@ -1,10 +1,22 @@
+import os from 'os';
+import path from 'path';
+import { AsyncLocalStorage } from 'node:async_hooks';
+import { LogBuffer } from '@hubspot/local-dev-lib/LogBuffer';
+import { MAX_LOG_FILES } from '../../lib/constants.js';
+const MCP_LOG_DIR = path.join(os.homedir(), '.hscli', 'logs', 'tools');
 export class McpLogger {
     mcpServer;
+    invocationStorage = new AsyncLocalStorage();
     constructor(mcpServer) {
         this.mcpServer = mcpServer;
     }
     log(level, logger, data) {
         try {
+            const buffer = this.invocationStorage.getStore();
+            if (buffer) {
+                const serialized = typeof data === 'string' ? data : JSON.stringify(data);
+                buffer.record(level, [logger, serialized]);
+            }
             this.mcpServer.sendLoggingMessage({ level, logger, data });
         }
         catch (error) {
@@ -26,4 +38,22 @@ export class McpLogger {
     error(logger, data) {
         this.log('error', logger, data);
     }
+    // Runs fn in a fresh per-invocation log buffer context. All log calls made
+    // within fn (including nested async callbacks like progress chunks) record
+    // into this buffer rather than a shared one, so concurrent tool calls never
+    // intermix their logs.
+    runWithBuffer(fn) {
+        return this.invocationStorage.run(new LogBuffer(), fn);
+    }
+    flushLogsToFile(filenamePrefix) {
+        const buffer = this.invocationStorage.getStore();
+        if (!buffer) {
+            return null;
+        }
+        return buffer.writeToFile({
+            dir: MCP_LOG_DIR,
+            filenamePrefix,
+            maxFiles: MAX_LOG_FILES,
+        });
+    }
 }

package/mcp-server/utils/toolUsageTracking.js

@@ -1,8 +1,16 @@
 import { EventClass, getExecutionEnvironmentMeta, } from '../../lib/usageTracking.js';
-import { getConfig, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
+import { getConfig } from '@hubspot/local-dev-lib/config';
+import { discoverAccountTargets } from '../../lib/accountTargetDiscovery.js';
 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;
     }
@@ -13,7 +21,14 @@ export async function trackToolUsage(toolName, meta) {
         ...getExecutionEnvironmentMeta(),
         ...meta,
     };
-    const accountId = getConfigDefaultAccountIfExists()?.accountId || undefined;
+    let accountId;
+    try {
+        const { recommended } = await discoverAccountTargets();
+        accountId = recommended?.accountId;
+    }
+    catch {
+        // Account discovery failed; continue without account ID
+    }
     try {
         await sendUsageEvent({
             eventName: 'cli-interaction',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.2.0-experimental.2",
+    "version": "8.2.1-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -10,10 +10,10 @@
         "!**/__tests__/**"
     ],
     "dependencies": {
-        "@hubspot/local-dev-lib": "5.9.0",
-        "@hubspot/project-parsing-lib": "0.18.0",
+        "@hubspot/local-dev-lib": "5.10.2",
+        "@hubspot/project-parsing-lib": "0.4.0-experimental.0",
         "@hubspot/serverless-dev-runtime": "7.0.7",
-        "@hubspot/ui-extensions-dev-server": "2.0.10",
+        "@hubspot/ui-extensions-dev-server": "2.1.2",
         "@inquirer/prompts": "7.1.0",
         "@modelcontextprotocol/sdk": "1.29.0",
         "archiver": "7.0.1",
@@ -33,16 +33,18 @@
         "open": "7.4.2",
         "p-queue": "8.1.0",
         "react": "19.2.3",
+        "semver": "7.6.3",
         "strip-ansi": "7.1.0",
         "table": "6.9.0",
         "tmp": "0.2.4",
         "update-notifier": "7.3.1",
         "ws": "8.20.0",
         "yargs": "17.7.2",
-        "yargs-parser": "21.1.1"
+        "yargs-parser": "21.1.1",
+        "zod": "^4.4.3"
     },
     "devDependencies": {
-        "@hubspot/npm-scripts": "0.2.2",
+        "@hubspot/npm-scripts": "^0.3.3",
         "@types/archiver": "^6.0.3",
         "@types/cli-progress": "^3.11.6",
         "@types/express": "^5.0.0",
@@ -59,7 +61,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.18.1",
         "eslint": "^8.56.0",
         "eslint-plugin-import": "^2.31.0",
         "husky": "^4.3.8",
@@ -67,7 +69,6 @@
         "madge": "^8.0.0",
         "mock-stdin": "^1.0.0",
         "prettier": "^3.4.2",
-        "semver": "^7.6.3",
         "ts-node": "^10.9.2",
         "tsx": "^4.20.3",
         "typescript": "^5.6.2",
@@ -123,6 +124,7 @@
         "registry": "https://registry.npmjs.org/"
     },
     "resolutions": {
-        "eslint-visitor-keys": "4.2.0"
+        "eslint-visitor-keys": "4.2.0",
+        "@eslint-community/eslint-utils": "4.9.0"
     }
 }

package/types/Yargs.d.ts

@@ -38,9 +38,11 @@ export type OverwriteArgs = Options & {
 export type StringArgType = Options & {
     type: 'string';
 };
-export type JSONOutputArgs = Options & {
+export type JSONOutputArgs<J extends Record<string, unknown> = Record<string, unknown>> = Options & {
     json?: boolean;
+    jsonSchema?: boolean;
     formatOutputAsJson?: boolean;
+    addJsonOutput: (data: Partial<J>) => void;
 };
 export type ProjectDevArgs = CommonArgs & ConfigArgs & EnvironmentArgs & {
     profile?: string;

package/commands/project/dev/deprecatedFlow.d.ts

@@ -1,11 +0,0 @@
-import { ArgumentsCamelCase } from 'yargs';
-import { ProjectConfig } from '../../../types/Projects.js';
-import { ProjectDevArgs } from '../../../types/Yargs.js';
-type DeprecatedProjectDevFlowArgs = {
-    args: ArgumentsCamelCase<ProjectDevArgs>;
-    accountId: number;
-    projectConfig: ProjectConfig;
-    projectDir: string;
-};
-export declare function deprecatedProjectDevFlow({ args, accountId, projectConfig, projectDir, }: DeprecatedProjectDevFlowArgs): Promise<void>;
-export {};