@hubspot/cli 8.10.0 → 8.12.0-beta.0

package/mcp-server/tools/cms/HsFunctionLogsTool.js

@@ -1,6 +1,6 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { addFlag, runCommandInDir } from '../../utils/command.js';
+import { HubSpotCommand } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
 import { formatTextContents } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
@@ -31,27 +31,27 @@ export class HsFunctionLogsTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ endpoint, account, latest, compact, limit, absoluteCurrentWorkingDirectory, }) {
+    async handler({ endpoint, account, latest, compact, limit, absoluteCurrentWorkingDirectory, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         // Ensure endpoint doesn't start with '/'
         const normalizedEndpoint = endpoint.startsWith('/')
             ? endpoint.slice(1)
             : endpoint;
-        let command = `hs cms function logs ${normalizedEndpoint}`;
+        const command = new HubSpotCommand(`cms function logs ${normalizedEndpoint}`);
         if (latest) {
-            command = addFlag(command, 'latest', latest);
+            command.addFlag('latest', latest);
         }
         if (compact) {
-            command = addFlag(command, 'compact', compact);
+            command.addFlag('compact', compact);
         }
         if (limit) {
-            command = addFlag(command, 'limit', limit);
+            command.addFlag('limit', limit);
         }
         if (account) {
-            command = addFlag(command, 'account', account);
+            command.addFlag('account', account);
         }
         try {
-            const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
+            const { stdout, stderr } = await this.runCommand(absoluteCurrentWorkingDirectory, command, extra);
             return formatTextContents(stdout, stderr);
         }
         catch (error) {
@@ -71,6 +71,6 @@ export class HsFunctionLogsTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

package/mcp-server/tools/cms/HsListFunctionsTool.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<{
 export type HsListFunctionsInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class HsListFunctionsTool extends Tool<HsListFunctionsInputSchema> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ account, json, absoluteCurrentWorkingDirectory, }: HsListFunctionsInputSchema): Promise<TextContentResponse>;
+    handler({ account, json, absoluteCurrentWorkingDirectory, }: HsListFunctionsInputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

package/mcp-server/tools/cms/HsListFunctionsTool.js

@@ -1,6 +1,6 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
-import { addFlag, runCommandInDir } from '../../utils/command.js';
+import { HubSpotCommand } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
 import { formatTextContents } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
@@ -23,17 +23,17 @@ export class HsListFunctionsTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ account, json, absoluteCurrentWorkingDirectory, }) {
+    async handler({ account, json, absoluteCurrentWorkingDirectory, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = 'hs cms function list';
+        const command = new HubSpotCommand('cms function list');
         if (json) {
-            command += ' --json';
+            command.addFlag('json', true);
         }
         if (account) {
-            command = addFlag(command, 'account', account);
+            command.addFlag('account', account);
         }
         try {
-            const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
+            const { stdout, stderr } = await this.runCommand(absoluteCurrentWorkingDirectory, command, extra);
             return formatTextContents(stdout, stderr);
         }
         catch (error) {
@@ -60,6 +60,6 @@ export class HsListFunctionsTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

package/mcp-server/tools/cms/HsListTool.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<{
 export type HsListInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class HsListTool extends Tool<HsListInputSchema> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ path, account, absoluteCurrentWorkingDirectory, }: HsListInputSchema): Promise<TextContentResponse>;
+    handler({ path, account, absoluteCurrentWorkingDirectory }: HsListInputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

package/mcp-server/tools/cms/HsListTool.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 } from '../project/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';
@@ -24,17 +23,14 @@ export class HsListTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ path, account, absoluteCurrentWorkingDirectory, }) {
+    async handler({ path, account, absoluteCurrentWorkingDirectory }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = 'hs cms list';
-        if (path) {
-            command += ` ${path}`;
-        }
+        const command = new HubSpotCommand(path ? `cms list ${path}` : 'cms list');
         if (account) {
-            command = addFlag(command, 'account', account);
+            command.addFlag('account', account);
         }
         try {
-            const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
+            const { stdout, stderr } = await this.runCommand(absoluteCurrentWorkingDirectory, command, extra);
             return formatTextContents(stdout, stderr);
         }
         catch (error) {
@@ -61,6 +57,6 @@ export class HsListTool extends Tool {
                 readOnlyHint: true,
                 openWorldHint: true,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

package/mcp-server/tools/index.js

@@ -19,6 +19,7 @@ import { HsListFunctionsTool } from './cms/HsListFunctionsTool.js';
 import { HsFunctionLogsTool } from './cms/HsFunctionLogsTool.js';
 import { CreateTestAccountTool } from './project/CreateTestAccountTool.js';
 import { FindProjectsTool } from './project/FindProjectsTool.js';
+import { AuthAccountTool } from './project/AuthAccountTool.js';
 export function registerProjectTools(mcpServer, logger) {
     return [
         new UploadProjectTools(mcpServer, logger).register(),
@@ -36,6 +37,7 @@ export function registerProjectTools(mcpServer, logger) {
         new GetBuildLogsTool(mcpServer, logger).register(),
         new GetBuildStatusTool(mcpServer, logger).register(),
         new FindProjectsTool(mcpServer, logger).register(),
+        new AuthAccountTool(mcpServer, logger).register(),
     ];
 }
 export function registerCmsTools(mcpServer, logger) {

package/mcp-server/tools/project/AddFeatureToProjectTool.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';
@@ -32,7 +32,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 export type AddFeatureInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class AddFeatureToProjectTool extends Tool<AddFeatureInputSchema> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, distribution, auth, features, addApp, }: AddFeatureInputSchema): Promise<TextContentResponse>;
+    handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, distribution, auth, features, addApp, }: AddFeatureInputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,9 +1,8 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, } from '../../../lib/constants.js';
-import { addFlag } from '../../utils/command.js';
+import { HubSpotCommand } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, features, } from './constants.js';
-import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
@@ -32,19 +31,19 @@ export class AddFeatureToProjectTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, distribution, auth, features, addApp, }) {
+    async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, distribution, auth, features, addApp, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         try {
-            let command = `hs project add`;
+            const command = new HubSpotCommand('project add');
             const content = [];
             if (distribution) {
-                command = addFlag(command, 'distribution', distribution);
+                command.addFlag('distribution', distribution);
             }
             else if (addApp) {
                 content.push(formatTextContent(`Ask the user how they would you like to distribute the app. Options are ${APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${APP_DISTRIBUTION_TYPES.PRIVATE}`));
             }
             if (auth) {
-                command = addFlag(command, 'auth', auth);
+                command.addFlag('auth', auth);
             }
             else if (addApp) {
                 content.push(formatTextContent(`Ask the user which auth type they would like to use. Options are ${APP_AUTH_TYPES.STATIC} and ${APP_AUTH_TYPES.OAUTH}`));
@@ -55,8 +54,8 @@ export class AddFeatureToProjectTool extends Tool {
                 };
             }
             // If features isn't provided, pass an empty array to bypass the prompt
-            command = addFlag(command, 'features', features || []);
-            const { stdout, stderr } = await runCommandInDir(absoluteProjectPath, command);
+            command.addFlag('features', features || []);
+            const { stdout, stderr } = await this.runCommand(absoluteProjectPath, command, extra);
             return formatTextContents(stdout, stderr);
         }
         catch (error) {
@@ -79,6 +78,6 @@ export class AddFeatureToProjectTool extends Tool {
                 idempotentHint: false,
                 openWorldHint: false,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -0,0 +1,18 @@
+import { z } from 'zod';
+import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { McpLogger } from '../../utils/logger.js';
+import { Tool, ToolExtra } from '../../Tool.js';
+import { TextContentResponse } from '../../types.js';
+declare const inputSchemaZodObject: z.ZodObject<{
+    absoluteCurrentWorkingDirectory: z.ZodString;
+    accountId: z.ZodOptional<z.ZodNumber>;
+    name: z.ZodOptional<z.ZodString>;
+    setAsDefault: z.ZodOptional<z.ZodBoolean>;
+}, z.core.$strip>;
+export type AuthAccountInputSchema = z.infer<typeof inputSchemaZodObject>;
+export declare class AuthAccountTool extends Tool<AuthAccountInputSchema> {
+    constructor(mcpServer: McpServer, logger: McpLogger);
+    handler({ absoluteCurrentWorkingDirectory, accountId, name, setAsDefault, }: AuthAccountInputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
+    register(): RegisteredTool;
+}
+export {};

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

@@ -0,0 +1,78 @@
+import { z } from 'zod';
+import { Tool } from '../../Tool.js';
+import { formatTextContents } from '../../utils/content.js';
+import { HubSpotCommand } from '../../utils/command.js';
+import { setupHubSpotConfig } from '../../utils/config.js';
+import { absoluteCurrentWorkingDirectory } from './constants.js';
+import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
+const inputSchema = {
+    absoluteCurrentWorkingDirectory,
+    accountId: z
+        .number()
+        .optional()
+        .describe('The HubSpot portal ID to authenticate.'),
+    name: z
+        .string()
+        .optional()
+        .describe('A name to assign to this account in the HubSpot CLI config. Defaults to the portal name if not provided.'),
+    setAsDefault: z
+        .boolean()
+        .optional()
+        .describe('Set this account as the default for CLI operations. Defaults to true when not specified.'),
+};
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const inputSchemaZodObject = z.object({ ...inputSchema });
+const toolName = 'auth-account';
+export class AuthAccountTool extends Tool {
+    constructor(mcpServer, logger) {
+        super(mcpServer, logger, toolName);
+    }
+    async handler({ absoluteCurrentWorkingDirectory, accountId, name, setAsDefault, }, extra) {
+        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
+        const command = new HubSpotCommand('account auth');
+        if (name) {
+            command.addFlag('name', name);
+        }
+        else {
+            command.addFlag('use-default-name', 'true');
+        }
+        if (accountId !== undefined) {
+            command.addFlag('account', accountId);
+        }
+        command.addFlag('default', setAsDefault === false ? 'false' : 'true');
+        try {
+            const { stdout, stderr } = await this.runCommand(absoluteCurrentWorkingDirectory, command, extra);
+            return formatTextContents(stdout, stderr);
+        }
+        catch (error) {
+            this.logger.debug(toolName, {
+                message: 'Handler caught error running hs account auth',
+                error: error instanceof Error ? error.message : String(error),
+            });
+            return formatTextContents(getErrorMessage(error));
+        }
+    }
+    register() {
+        return this.mcpServer.registerTool(toolName, {
+            title: 'Authenticate a HubSpot Account',
+            description: 'Authenticates a HubSpot account with the CLI using `hs account auth`.\n\n' +
+                'WHEN TO USE:\n' +
+                '- The user wants to add or authenticate a HubSpot account\n' +
+                '- Any other tool reports that no account is configured\n' +
+                '- The user asks how to connect their HubSpot account to the CLI\n\n' +
+                'WORKFLOW:\n' +
+                '1. Call this tool — it opens a browser tab for the user to authorize\n' +
+                '2. The user clicks "Connect to CLI" in the browser\n' +
+                '3. Auth completes automatically via WebSocket\n' +
+                '4. Retry any operation that was blocked by missing auth\n\n' +
+                'setAsDefault defaults to true. Pass setAsDefault: false to keep an existing default account.',
+            inputSchema,
+            annotations: {
+                readOnlyHint: false,
+                destructiveHint: false,
+                idempotentHint: false,
+                openWorldHint: true,
+            },
+        }, (input, extra) => this.wrappedHandler(input, extra));
+    }
+}

package/mcp-server/tools/project/CreateProjectTool.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';
@@ -36,7 +36,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class CreateProjectTool extends Tool<CreateProjectInputSchema> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ name, destination, projectBase, distribution, auth, features, absoluteCurrentWorkingDirectory, }: CreateProjectInputSchema): Promise<TextContentResponse>;
+    handler({ name, destination, projectBase, distribution, auth, features, absoluteCurrentWorkingDirectory, }: CreateProjectInputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,9 +1,8 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, EMPTY_PROJECT, PROJECT_WITH_APP, } from '../../../lib/constants.js';
-import { addFlag } from '../../utils/command.js';
+import { HubSpotCommand } from '../../utils/command.js';
 import { absoluteCurrentWorkingDirectory, features } from './constants.js';
-import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
@@ -37,30 +36,32 @@ export class CreateProjectTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ name, destination, projectBase, distribution, auth, features, absoluteCurrentWorkingDirectory, }) {
+    async handler({ name, destination, projectBase, distribution, auth, features, absoluteCurrentWorkingDirectory, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        let command = addFlag('hs project create', 'platform-version', PLATFORM_VERSIONS.v2026_03);
+        const command = new HubSpotCommand('project create', [
+            { name: 'platform-version', value: PLATFORM_VERSIONS.v2026_03 },
+        ]);
         const content = [];
         if (name) {
-            command = addFlag(command, 'name', name);
+            command.addFlag('name', name);
         }
         else {
             content.push(formatTextContent(`Ask the user what they would like to name the project.`));
         }
         if (destination) {
-            command = addFlag(command, 'dest', destination);
+            command.addFlag('dest', destination);
         }
         if (projectBase) {
-            command = addFlag(command, 'project-base', projectBase);
+            command.addFlag('project-base', projectBase);
         }
         if (distribution) {
-            command = addFlag(command, 'distribution', distribution);
+            command.addFlag('distribution', distribution);
         }
         else if (projectBase === PROJECT_WITH_APP) {
             content.push(formatTextContent(`Ask the user how they would you like to distribute the app? Options are ${APP_DISTRIBUTION_TYPES.MARKETPLACE} and ${APP_DISTRIBUTION_TYPES.PRIVATE}`));
         }
         if (auth) {
-            command = addFlag(command, 'auth', auth);
+            command.addFlag('auth', auth);
         }
         else if (projectBase === PROJECT_WITH_APP) {
             content.push(formatTextContent(`Ask the user which auth type they would like to use? Options are ${APP_AUTH_TYPES.STATIC} and ${APP_AUTH_TYPES.OAUTH}`));
@@ -71,9 +72,9 @@ export class CreateProjectTool extends Tool {
             };
         }
         // Always pass features, even if it is an empty array to bypass the prompts
-        command = addFlag(command, 'features', features || []);
+        command.addFlag('features', features || []);
         try {
-            const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
+            const { stdout, stderr } = await this.runCommand(absoluteCurrentWorkingDirectory, command, extra);
             return formatTextContents(stdout, stderr);
         }
         catch (error) {
@@ -95,6 +96,6 @@ export class CreateProjectTool extends Tool {
                 idempotentHint: false,
                 openWorldHint: false,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

package/mcp-server/tools/project/CreateTestAccountTool.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 createTestAccountInputSchema: z.ZodObject<{
     absoluteCurrentWorkingDirectory: z.ZodString;
     configPath: z.ZodOptional<z.ZodString>;
@@ -47,7 +47,7 @@ declare const createTestAccountInputSchema: z.ZodObject<{
 export type CreateTestAccountInputSchema = z.infer<typeof createTestAccountInputSchema>;
 export declare class CreateTestAccountTool extends Tool<CreateTestAccountInputSchema> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ absoluteCurrentWorkingDirectory, name, description, marketingLevel, opsLevel, serviceLevel, salesLevel, contentLevel, commerceLevel, configPath, }: CreateTestAccountInputSchema): Promise<TextContentResponse>;
+    handler({ absoluteCurrentWorkingDirectory, name, description, marketingLevel, opsLevel, serviceLevel, salesLevel, contentLevel, commerceLevel, configPath, }: CreateTestAccountInputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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