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

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';
@@ -24,6 +24,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
         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";
@@ -36,7 +37,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

@@ -4,8 +4,8 @@ import { Tool } from '../../Tool.js';
 import { formatTextContents } from '../../utils/content.js';
 import { absoluteCurrentWorkingDirectory, docsSearchQuery, } from './constants.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
 const docsSearchLimit = z
     .number()
@@ -33,12 +33,13 @@ export class DocsSearchTool extends Tool {
     }
     async handler({ docsSearchQuery, docsSearchLimit, absoluteCurrentWorkingDirectory, }) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
-        const accountId = getConfigDefaultAccountIfExists()?.accountId;
-        if (!accountId) {
-            const authErrorMessage = `No account ID found. Please run \`hs account auth\` to configure an account, or set a default account with \`hs account use <account>\``;
-            return formatTextContents(authErrorMessage);
-        }
         try {
+            const { recommended } = await discoverAccountTargets();
+            const accountId = recommended?.accountId;
+            if (!accountId) {
+                const authErrorMessage = `No account ID found. Call the auth-account tool to authenticate a HubSpot account.`;
+                return formatTextContents(authErrorMessage);
+            }
             const response = await http.post(accountId, {
                 url: 'dev/docs/llms/v1/docs-search',
                 data: {
@@ -87,6 +88,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.d.ts

@@ -5,6 +5,7 @@ import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: z.ZodString;
+    absoluteProjectPath: z.ZodOptional<z.ZodString>;
     appId: z.ZodString;
     startDate: z.ZodOptional<z.ZodString>;
     endDate: z.ZodOptional<z.ZodString>;
@@ -12,7 +13,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 export type GetApiUsagePatternsByAppIdInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class GetApiUsagePatternsByAppIdTool extends Tool<GetApiUsagePatternsByAppIdInputSchema> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ appId, startDate, endDate, absoluteCurrentWorkingDirectory, }: GetApiUsagePatternsByAppIdInputSchema): Promise<TextContentResponse>;
+    handler({ appId, startDate, endDate, absoluteCurrentWorkingDirectory, absoluteProjectPath, }: GetApiUsagePatternsByAppIdInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -3,12 +3,13 @@ import { z } from 'zod';
 import { http } from '@hubspot/local-dev-lib/http';
 import { formatTextContents } from '../../utils/content.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
-import { absoluteCurrentWorkingDirectory } from './constants.js';
+import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
 const inputSchema = {
     absoluteCurrentWorkingDirectory,
+    absoluteProjectPath: absoluteProjectPath.optional(),
     appId: z
         .string()
         .describe('The numeric app ID as a string (e.g., "3003909"). Must contain only digits. Use get-apps-info to find available app IDs.'),
@@ -28,13 +29,13 @@ export class GetApiUsagePatternsByAppIdTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ appId, startDate, endDate, absoluteCurrentWorkingDirectory, }) {
-        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
+    async handler({ appId, startDate, endDate, absoluteCurrentWorkingDirectory, absoluteProjectPath, }) {
+        setupHubSpotConfig(absoluteProjectPath ?? absoluteCurrentWorkingDirectory);
         try {
-            // Get account ID from CLI config
-            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 response = await http.get(accountId, {
@@ -70,6 +71,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.d.ts

@@ -5,11 +5,12 @@ import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: z.ZodString;
+    absoluteProjectPath: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export type GetApplicationInfoInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class GetApplicationInfoTool extends Tool<GetApplicationInfoInputSchema> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ absoluteCurrentWorkingDirectory, }: GetApplicationInfoInputSchema): Promise<TextContentResponse>;
+    handler({ absoluteCurrentWorkingDirectory, absoluteProjectPath, }: GetApplicationInfoInputSchema): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -3,11 +3,14 @@ import { z } from 'zod';
 import { http } from '@hubspot/local-dev-lib/http';
 import { formatTextContents } from '../../utils/content.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
-import { absoluteCurrentWorkingDirectory } from './constants.js';
+import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
-const inputSchema = { absoluteCurrentWorkingDirectory };
+const inputSchema = {
+    absoluteCurrentWorkingDirectory,
+    absoluteProjectPath: absoluteProjectPath.optional(),
+};
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
 const toolName = 'get-apps-info';
@@ -15,13 +18,13 @@ export class GetApplicationInfoTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ absoluteCurrentWorkingDirectory, }) {
-        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
+    async handler({ absoluteCurrentWorkingDirectory, absoluteProjectPath, }) {
+        setupHubSpotConfig(absoluteProjectPath ?? absoluteCurrentWorkingDirectory);
         try {
-            // Get account ID from CLI config
-            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 response = await http.get(accountId, {
@@ -53,6 +56,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

@@ -5,8 +5,8 @@ import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
 import { http } from '@hubspot/local-dev-lib/http';
 import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 const TOOL_NAME = 'get-build-logs';
 const PROJECTS_LOGS_API_PATH = 'dfs/logging/v1';
 const inputSchema = {
@@ -62,14 +62,18 @@ export class GetBuildLogsTool extends Tool {
         super(mcpServer, logger, TOOL_NAME);
     }
     async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildId, logLevel, }) {
-        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
+        setupHubSpotConfig(absoluteProjectPath);
         try {
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
-            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>`');
-            }
             const { projectConfig, projectDir } = await getProjectConfig(absoluteProjectPath);
             validateProjectConfig(projectConfig, projectDir);
+            const { recommended } = await discoverAccountTargets({
+                projectDir,
+                projectConfig,
+            });
+            const accountId = recommended?.accountId;
+            if (!accountId) {
+                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Call the auth-account tool to authenticate a HubSpot account.');
+            }
             const projectName = projectConfig.name;
             const response = await http.get(accountId, {
                 url: `${PROJECTS_LOGS_API_PATH}/logs/projects/${encodeURIComponent(projectName)}/builds/${buildId}`,
@@ -121,6 +125,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

@@ -6,8 +6,8 @@ import { fetchProjectBuilds, getBuildStatus, } from '@hubspot/local-dev-lib/api/
 import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
 import moment from 'moment';
 import { absoluteCurrentWorkingDirectory, absoluteProjectPath, } from './constants.js';
-import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
 import { setupHubSpotConfig } from '../../utils/config.js';
+import { discoverAccountTargets } from '../../../lib/accountTargetDiscovery.js';
 const TOOL_NAME = 'get-build-status';
 const inputSchema = {
     absoluteProjectPath,
@@ -107,14 +107,18 @@ export class GetBuildStatusTool extends Tool {
         super(mcpServer, logger, TOOL_NAME);
     }
     async handler({ absoluteProjectPath, absoluteCurrentWorkingDirectory, buildId, limit, }) {
-        setupHubSpotConfig(absoluteCurrentWorkingDirectory);
+        setupHubSpotConfig(absoluteProjectPath);
         try {
-            const accountId = getConfigDefaultAccountIfExists()?.accountId;
-            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>`');
-            }
             const { projectConfig, projectDir } = await getProjectConfig(absoluteProjectPath);
             validateProjectConfig(projectConfig, projectDir);
+            const { recommended } = await discoverAccountTargets({
+                projectDir,
+                projectConfig,
+            });
+            const accountId = recommended?.accountId;
+            if (!accountId) {
+                return formatTextContents(absoluteCurrentWorkingDirectory, 'No account ID found. Call the auth-account tool to authenticate a HubSpot account.');
+            }
             const projectName = projectConfig.name;
             let output;
             if (buildId) {
@@ -162,6 +166,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.d.ts

@@ -5,13 +5,14 @@ import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
     absoluteCurrentWorkingDirectory: z.ZodString;
+    absoluteProjectPath: z.ZodOptional<z.ZodString>;
     platformVersion: z.ZodString;
     featureType: z.ZodString;
 }, z.core.$strip>;
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class GetConfigValuesTool extends Tool<InputSchemaType> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ platformVersion, featureType, absoluteCurrentWorkingDirectory, }: InputSchemaType): Promise<TextContentResponse>;
+    handler({ platformVersion, featureType, absoluteCurrentWorkingDirectory, absoluteProjectPath, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};