@hubspot/cli 7.8.0-experimental.0 → 7.8.1-experimental.0

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

@@ -6,19 +6,19 @@ declare const inputSchemaZodObject: z.ZodObject<{
     addApp: z.ZodBoolean;
     distribution: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"marketplace">, z.ZodLiteral<"private">]>>;
     auth: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"oauth">]>>;
-    features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"scim">]>, "many">>;
+    features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"app-event">, z.ZodLiteral<"scim">, z.ZodLiteral<"page">]>, "many">>;
 }, "strip", z.ZodTypeAny, {
     absoluteProjectPath: string;
     addApp: boolean;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
-    features?: ("card" | "settings" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
+    features?: ("card" | "settings" | "page" | "app-event" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
 }, {
     absoluteProjectPath: string;
     addApp: boolean;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
-    features?: ("card" | "settings" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
+    features?: ("card" | "settings" | "page" | "app-event" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
 }>;
 export type AddFeatureInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class AddFeatureToProjectTool extends Tool<AddFeatureInputSchema> {

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

@@ -16,20 +16,20 @@ const inputSchema = {
         z.literal(APP_DISTRIBUTION_TYPES.MARKETPLACE),
         z.literal(APP_DISTRIBUTION_TYPES.PRIVATE),
     ]))
-        .describe('Private is used if you do not wish to distribute your application on the HubSpot marketplace. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.'),
+        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your application on the HubSpot marketplace. '),
     auth: z
         .optional(z.union([
         z.literal(APP_AUTH_TYPES.STATIC),
         z.literal(APP_AUTH_TYPES.OAUTH),
     ]))
-        .describe('Static uses a static non changing authentication token, and is only available for private distribution. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.'),
+        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Static uses a static non changing authentication token, and is only available for private distribution. '),
     features,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'add-feature-to-hubspot-project';
+const toolName = 'add-feature-to-project';
 export class AddFeatureToProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -8,7 +8,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
     projectBase: z.ZodUnion<[z.ZodLiteral<"empty">, z.ZodLiteral<"app">]>;
     distribution: z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"marketplace">, z.ZodLiteral<"private">]>>;
     auth: z.ZodOptional<z.ZodOptional<z.ZodUnion<[z.ZodLiteral<"static">, z.ZodLiteral<"oauth">]>>>;
-    features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"scim">]>, "many">>;
+    features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"app-event">, z.ZodLiteral<"scim">, z.ZodLiteral<"page">]>, "many">>;
 }, "strip", z.ZodTypeAny, {
     projectBase: "app" | "empty";
     absoluteCurrentWorkingDirectory: string;
@@ -16,7 +16,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
     name?: string | undefined;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
-    features?: ("card" | "settings" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
+    features?: ("card" | "settings" | "page" | "app-event" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
 }, {
     projectBase: "app" | "empty";
     absoluteCurrentWorkingDirectory: string;
@@ -24,7 +24,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
     name?: string | undefined;
     auth?: "oauth" | "static" | undefined;
     distribution?: "marketplace" | "private" | undefined;
-    features?: ("card" | "settings" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
+    features?: ("card" | "settings" | "page" | "app-event" | "workflow-action-tool" | "workflow-action" | "app-function" | "webhooks" | "app-object" | "scim")[] | undefined;
 }>;
 export type CreateProjectInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class CreateProjectTool extends Tool<CreateProjectInputSchema> {

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

@@ -10,11 +10,11 @@ const inputSchema = {
     absoluteCurrentWorkingDirectory,
     name: z
         .string()
-        .describe('The name of the project to be created.  This name is how your project will appear in HubSpot. If not specified by the user, do not choose for them.  Changing this is potentially destructive.')
+        .describe('If not specified by the user, DO NOT choose for them.  Changing this is potentially destructive.The name of the project to be created.  This name is how your project will appear in HubSpot. ')
         .optional(),
     destination: z
         .string()
-        .describe('Relative path to the directory the project will be created in. DO NOT use the current directory unless the user has explicitly stated to do so.'),
+        .describe('DO NOT use the current directory unless the user has explicitly stated to do so. Relative path to the directory the project will be created in.'),
     projectBase: z
         .union([z.literal(EMPTY_PROJECT), z.literal(PROJECT_WITH_APP)])
         .describe('Empty will create an empty project, and app will create a project with an app inside of it.'),
@@ -23,19 +23,19 @@ const inputSchema = {
         z.literal(APP_DISTRIBUTION_TYPES.MARKETPLACE),
         z.literal(APP_DISTRIBUTION_TYPES.PRIVATE),
     ]))
-        .describe('Private is used if you do not wish to distribute your application on the HubSpot marketplace. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.'),
+        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Private is used if you do not wish to distribute your application on the HubSpot marketplace. '),
     auth: z
         .optional(z.union([
         z.literal(APP_AUTH_TYPES.STATIC),
         z.literal(APP_AUTH_TYPES.OAUTH),
     ]))
-        .describe('Static uses a static non changing authentication token, and is only available for private distribution. If not specified by the user, do not choose for them.  This cannot be changed after a project is uploaded.')
+        .describe('If not specified by the user, DO NOT choose for them.  This cannot be changed after a project is uploaded. Static uses a static non changing authentication token, and is only available for private distribution. ')
         .optional(),
     features,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'create-hubspot-project';
+const toolName = 'create-project';
 export class CreateProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -15,7 +15,7 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'deploy-hubspot-project';
+const toolName = 'deploy-project';
 export class DeployProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -12,7 +12,7 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'fetch-hubspot-doc';
+const toolName = 'fetch-doc';
 export class DocFetchTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
@@ -42,7 +42,7 @@ export class DocFetchTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Fetch HubSpot Developer Documentation (single file)',
-            description: 'Always use this immediately after `search-hubspot-docs` and before creating a plan, writing code, or answering technical questions. This tool retrieves the full, authoritative content of a HubSpot Developer Documentation page from its URL, ensuring responses are accurate, up-to-date, and grounded in the official docs.',
+            description: 'Always use this immediately after `search-docs` and before creating a plan, writing code, or answering technical questions. This tool retrieves the full, authoritative content of a HubSpot Developer Documentation page from its URL, ensuring responses are accurate, up-to-date, and grounded in the official docs.',
             inputSchema,
         }, this.handler);
     }

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

@@ -2,10 +2,13 @@ import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.
 import z from 'zod';
 import { TextContentResponse, Tool } from '../../types.js';
 declare const inputSchemaZodObject: z.ZodObject<{
+    absoluteCurrentWorkingDirectory: z.ZodString;
     docsSearchQuery: z.ZodString;
 }, "strip", z.ZodTypeAny, {
+    absoluteCurrentWorkingDirectory: string;
     docsSearchQuery: string;
 }, {
+    absoluteCurrentWorkingDirectory: string;
     docsSearchQuery: string;
 }>;
 export interface DocsSearchResponse {
@@ -20,7 +23,7 @@ export interface DocsSearchResponse {
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class DocsSearchTool extends Tool<InputSchemaType> {
     constructor(mcpServer: McpServer);
-    handler({ docsSearchQuery, }: InputSchemaType): Promise<TextContentResponse>;
+    handler({ absoluteCurrentWorkingDirectory, docsSearchQuery, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -3,25 +3,25 @@ import z from 'zod';
 import { Tool } from '../../types.js';
 import { formatTextContents } from '../../utils/content.js';
 import { trackToolUsage } from '../../utils/toolUsageTracking.js';
-import { docsSearchQuery } from './constants.js';
-import { getAccountId, getConfigPath, loadConfig, } from '@hubspot/local-dev-lib/config';
+import { absoluteCurrentWorkingDirectory, docsSearchQuery, } from './constants.js';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
+import { getAccountIdFromCliConfig } from '../../utils/cliConfig.js';
 const inputSchema = {
+    absoluteCurrentWorkingDirectory,
     docsSearchQuery,
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'search-hubspot-docs';
+const toolName = 'search-docs';
 export class DocsSearchTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ docsSearchQuery, }) {
+    async handler({ absoluteCurrentWorkingDirectory, docsSearchQuery, }) {
         await trackToolUsage(toolName, { mode: docsSearchQuery });
-        loadConfig(getConfigPath());
-        const accountId = getAccountId();
+        const accountId = getAccountIdFromCliConfig(absoluteCurrentWorkingDirectory);
         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);
@@ -55,7 +55,7 @@ export class DocsSearchTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Search HubSpot Developer Documentation',
-            description: 'Use this first whenever you need details about HubSpot APIs, SDKs, integrations, or developer platform features. This searches the official HubSpot Developer Documentation and returns the most relevant pages, each with a URL for use in `fetch-hubspot-doc`. Always follow this with a fetch to get the full, authoritative content before making plans or writing answers.',
+            description: 'Use this first whenever you need details about HubSpot APIs, SDKs, integrations, or developer platform features. This searches the official HubSpot Developer Documentation and returns the most relevant pages, each with a URL for use in `fetch-doc`. Always follow this with a fetch to get the full, authoritative content before making plans or writing answers.',
             inputSchema,
         }, this.handler);
     }

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

@@ -2,19 +2,22 @@ import { TextContentResponse, Tool } from '../../types.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { z } from 'zod';
 declare const inputSchemaZodObject: z.ZodObject<{
+    absoluteCurrentWorkingDirectory: z.ZodString;
     platformVersion: z.ZodString;
     featureType: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     platformVersion: string;
+    absoluteCurrentWorkingDirectory: string;
     featureType: string;
 }, {
     platformVersion: string;
+    absoluteCurrentWorkingDirectory: string;
     featureType: string;
 }>;
 type InputSchemaType = z.infer<typeof inputSchemaZodObject>;
 export declare class GetConfigValuesTool extends Tool<InputSchemaType> {
     constructor(mcpServer: McpServer);
-    handler({ platformVersion, featureType, }: InputSchemaType): Promise<TextContentResponse>;
+    handler({ absoluteCurrentWorkingDirectory, platformVersion, featureType, }: InputSchemaType): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,10 +1,12 @@
 import { Tool } from '../../types.js';
 import { z } from 'zod';
 import { formatTextContents } from '../../utils/content.js';
+import { absoluteCurrentWorkingDirectory } from './constants.js';
 import { getIntermediateRepresentationSchema, mapToInternalType, } from '@hubspot/project-parsing-lib';
-import { getAccountId, getConfigPath, loadConfig, } from '@hubspot/local-dev-lib/config';
 import { useV3Api } from '../../../lib/projects/platformVersion.js';
+import { getAccountIdFromCliConfig } from '../../utils/cliConfig.js';
 const inputSchema = {
+    absoluteCurrentWorkingDirectory,
     platformVersion: z
         .string()
         .describe('The platform version for the project. Located in the hsproject.json file.'),
@@ -16,21 +18,25 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'get-hubspot-feature-config-schema';
+const toolName = 'get-feature-config-schema';
 export class GetConfigValuesTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
     }
-    async handler({ platformVersion, featureType, }) {
+    async handler({ absoluteCurrentWorkingDirectory, platformVersion, featureType, }) {
         try {
             if (!useV3Api(platformVersion)) {
                 return formatTextContents(`Can only be used on projects with a minimum platformVersion of 2025.2`);
             }
-            loadConfig(getConfigPath());
+            const accountId = getAccountIdFromCliConfig(absoluteCurrentWorkingDirectory);
+            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);
+            }
             const schema = await getIntermediateRepresentationSchema({
                 platformVersion,
                 projectSourceDir: '',
-                accountId: getAccountId(),
+                accountId,
             });
             const internalComponentType = mapToInternalType(featureType);
             if (schema[internalComponentType]) {

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

@@ -24,7 +24,7 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'guided-walkthrough-hubspot-cli';
+const toolName = 'guided-walkthrough-cli';
 export class GuidedWalkthroughTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -11,7 +11,7 @@ const inputSchema = {
 const inputSchemaZodObject = z.object({
     ...inputSchema,
 });
-const toolName = 'upload-hubspot-project';
+const toolName = 'upload-project';
 export class UploadProjectTools extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
@@ -24,7 +24,7 @@ export class UploadProjectTools extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Upload HubSpot Project',
-            description: 'Uploads the HubSpot project in current working directory.  If the project does not exist, it will be created. MUST be ran from within the project directory. DO NOT run this tool unless the user specifies they would like to upload the project, it is potentially destructive',
+            description: 'DO NOT run this tool unless the user specifies they would like to upload the project, it is potentially destructive. Uploads the HubSpot project in current working directory.  If the project does not exist, it will be created. MUST be ran from within the project directory.',
             inputSchema,
         }, this.handler);
     }

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

@@ -9,7 +9,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'validate-hubspot-project';
+const toolName = 'validate-project';
 export class ValidateProjectTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -28,7 +28,7 @@ describe('mcp-server/tools/project/AddFeatureToProject', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('add-feature-to-hubspot-project', expect.objectContaining({
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('add-feature-to-project', expect.objectContaining({
                 title: 'Add feature to HubSpot Project',
                 description: expect.stringContaining('Adds a feature to an existing HubSpot project'),
                 inputSchema: expect.any(Object),

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

@@ -29,7 +29,7 @@ describe('mcp-server/tools/project/CreateProjectTool', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-hubspot-project', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-project', {
                 title: 'Create HubSpot Project',
                 description: 'Creates a HubSpot project with the provided name and outputs it in the provided destination',
                 inputSchema: expect.any(Object),

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

@@ -26,7 +26,7 @@ describe('mcp-server/tools/project/DeployProject', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('deploy-hubspot-project', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('deploy-project', {
                 title: 'Deploy a build of HubSpot Project',
                 description: expect.stringContaining('Takes a build number and a project name and deploys that build of the project'),
                 inputSchema: expect.any(Object),

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

@@ -24,9 +24,9 @@ describe('mcp-server/tools/project/DocFetchTool', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('fetch-hubspot-doc', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('fetch-doc', {
                 title: 'Fetch HubSpot Developer Documentation (single file)',
-                description: 'Always use this immediately after `search-hubspot-docs` and before creating a plan, writing code, or answering technical questions. This tool retrieves the full, authoritative content of a HubSpot Developer Documentation page from its URL, ensuring responses are accurate, up-to-date, and grounded in the official docs.',
+                description: 'Always use this immediately after `search-docs` and before creating a plan, writing code, or answering technical questions. This tool retrieves the full, authoritative content of a HubSpot Developer Documentation page from its URL, ensuring responses are accurate, up-to-date, and grounded in the official docs.',
                 inputSchema: expect.any(Object),
             }, tool.handler);
             expect(result).toBe(mockRegisteredTool);

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

@@ -1,14 +1,14 @@
 import { DocsSearchTool } from '../DocsSearchTool.js';
 import { http } from '@hubspot/local-dev-lib/http';
-import { getAccountId } from '@hubspot/local-dev-lib/config';
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
+import { getAccountIdFromCliConfig } from '../../../utils/cliConfig.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('@hubspot/local-dev-lib/http');
-vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('@hubspot/local-dev-lib/errors/index');
 vi.mock('../../../utils/toolUsageTracking');
+vi.mock('../../../utils/cliConfig.js');
 const mockHttp = http;
-const mockGetAccountId = getAccountId;
+const mockGetAccountIdFromCliConfig = getAccountIdFromCliConfig;
 const mockIsHubSpotHttpError = vi.mocked(isHubSpotHttpError);
 describe('mcp-server/tools/project/DocsSearchTool', () => {
     let mockMcpServer;
@@ -27,9 +27,9 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('search-hubspot-docs', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('search-docs', {
                 title: 'Search HubSpot Developer Documentation',
-                description: 'Use this first whenever you need details about HubSpot APIs, SDKs, integrations, or developer platform features. This searches the official HubSpot Developer Documentation and returns the most relevant pages, each with a URL for use in `fetch-hubspot-doc`. Always follow this with a fetch to get the full, authoritative content before making plans or writing answers.',
+                description: 'Use this first whenever you need details about HubSpot APIs, SDKs, integrations, or developer platform features. This searches the official HubSpot Developer Documentation and returns the most relevant pages, each with a URL for use in `fetch-doc`. Always follow this with a fetch to get the full, authoritative content before making plans or writing answers.',
                 inputSchema: expect.any(Object),
             }, tool.handler);
             expect(result).toBe(mockRegisteredTool);
@@ -38,9 +38,10 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
     describe('handler', () => {
         const mockInput = {
             docsSearchQuery: 'test query',
+            absoluteCurrentWorkingDirectory: '/foo',
         };
         it('should return auth error message when no account ID is found', async () => {
-            mockGetAccountId.mockReturnValue(null);
+            mockGetAccountIdFromCliConfig.mockReturnValue(null);
             const result = await tool.handler(mockInput);
             expect(result).toEqual({
                 content: [
@@ -52,7 +53,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should return successful results when docs are found', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockResponse = {
                 results: [
                     {
@@ -76,6 +77,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
                 data: mockResponse,
             });
             const result = await tool.handler(mockInput);
+            expect(mockGetAccountIdFromCliConfig).toHaveBeenCalledWith('/foo');
             expect(mockHttp.post).toHaveBeenCalledWith(12345, {
                 url: 'dev/docs/llms/v1/docs-search',
                 data: {
@@ -103,7 +105,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             expect(resultText).toContain('Test content 2');
         });
         it('should return no results message when no documentation is found', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockResponse = {
                 results: [],
             };
@@ -122,7 +124,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should return no results message when results is null', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockResponse = {
                 results: null,
             };
@@ -141,7 +143,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should handle HubSpot HTTP errors', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockError = {
                 toString: () => 'HubSpot API Error: 404 Not Found',
             };
@@ -158,7 +160,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should handle generic errors', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             const mockError = new Error('Network error');
             mockHttp.post.mockRejectedValue(mockError);
             mockIsHubSpotHttpError.mockReturnValue(false);
@@ -173,7 +175,7 @@ describe('mcp-server/tools/project/DocsSearchTool', () => {
             });
         });
         it('should handle non-Error rejections', async () => {
-            mockGetAccountId.mockReturnValue(12345);
+            mockGetAccountIdFromCliConfig.mockReturnValue(12345);
             mockHttp.post.mockRejectedValue('String error');
             mockIsHubSpotHttpError.mockReturnValue(false);
             const result = await tool.handler(mockInput);

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

@@ -1,13 +1,13 @@
 import { GetConfigValuesTool } from '../GetConfigValuesTool.js';
 import { getIntermediateRepresentationSchema, mapToInternalType, } from '@hubspot/project-parsing-lib';
-import { getAccountId } from '@hubspot/local-dev-lib/config';
+import { getAccountIdFromCliConfig } from '../../../utils/cliConfig.js';
 vi.mock('@modelcontextprotocol/sdk/server/mcp.js');
 vi.mock('@hubspot/project-parsing-lib');
-vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('../../../utils/cliConfig.js');
 vi.mock('../../../utils/toolUsageTracking');
 const mockGetIntermediateRepresentationSchema = getIntermediateRepresentationSchema;
 const mockMapToInternalType = mapToInternalType;
-const mockGetAccountId = getAccountId;
+const mockGetAccountIdFromCliConfig = getAccountIdFromCliConfig;
 describe('mcp-server/tools/project/GetConfigValuesTool', () => {
     let mockMcpServer;
     let tool;
@@ -25,7 +25,7 @@ describe('mcp-server/tools/project/GetConfigValuesTool', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-hubspot-feature-config-schema', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-feature-config-schema', {
                 title: 'Fetch the JSON Schema for component',
                 description: expect.stringContaining('Fetches and returns the JSON schema for the provided feature'),
                 inputSchema: expect.objectContaining({
@@ -44,9 +44,10 @@ describe('mcp-server/tools/project/GetConfigValuesTool', () => {
         const input = {
             platformVersion: '2025.2',
             featureType: 'card',
+            absoluteCurrentWorkingDirectory: '/foo',
         };
         beforeEach(() => {
-            mockGetAccountId.mockReturnValue(123456789);
+            mockGetAccountIdFromCliConfig.mockReturnValue(123456789);
         });
         it('should return config schema when component type exists', async () => {
             const mockSchema = {
@@ -61,6 +62,7 @@ describe('mcp-server/tools/project/GetConfigValuesTool', () => {
             mockGetIntermediateRepresentationSchema.mockResolvedValue(mockSchema);
             mockMapToInternalType.mockReturnValue('internal-card-type');
             const result = await tool.handler(input);
+            expect(mockGetAccountIdFromCliConfig).toHaveBeenCalledWith('/foo');
             expect(mockGetIntermediateRepresentationSchema).toHaveBeenCalledWith({
                 platformVersion: '2025.2',
                 projectSourceDir: '',
@@ -133,14 +135,13 @@ describe('mcp-server/tools/project/GetConfigValuesTool', () => {
             });
         });
         it('should handle null account id', async () => {
-            mockGetAccountId.mockReturnValue(null);
-            mockGetIntermediateRepresentationSchema.mockRejectedValue(new Error('No account ID'));
+            mockGetAccountIdFromCliConfig.mockReturnValue(null);
             const result = await tool.handler(input);
             expect(result).toEqual({
                 content: [
                     {
                         type: 'text',
-                        text: 'Unable to locate JSON schema for type card',
+                        text: 'No account ID found. Please run `hs account auth` to configure an account, or set a default account with `hs account use <account>`',
                     },
                 ],
             });

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

@@ -21,7 +21,7 @@ describe('mcp-server/tools/project/GuidedWalkthroughTool', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('guided-walkthrough-hubspot-cli', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('guided-walkthrough-cli', {
                 title: 'Guided walkthrough of the CLI',
                 description: 'Give the user a guided walkthrough of the HubSpot CLI.',
                 inputSchema: expect.any(Object),

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

@@ -21,7 +21,7 @@ describe('mcp-server/tools/project/UploadProjectTools', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('upload-hubspot-project', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('upload-project', {
                 title: 'Upload HubSpot Project',
                 description: expect.stringContaining('Uploads the HubSpot project in current working directory.'),
                 inputSchema: expect.any(Object),

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

@@ -21,7 +21,7 @@ describe('mcp-server/tools/project/ValidateProjectTool', () => {
     describe('register', () => {
         it('should register tool with correct parameters', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('validate-hubspot-project', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('validate-project', {
                 title: expect.stringContaining('Validate HubSpot Project'),
                 description: expect.stringContaining('Validates the HubSpot project and its configuration files.'),
                 inputSchema: expect.any(Object),

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

@@ -1,6 +1,6 @@
 import z from 'zod';
 export declare const absoluteProjectPath: z.ZodString;
 export declare const absoluteCurrentWorkingDirectory: z.ZodString;
-export declare const features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"scim">]>, "many">>;
+export declare const features: z.ZodOptional<z.ZodArray<z.ZodUnion<[z.ZodLiteral<"card">, z.ZodLiteral<"settings">, z.ZodLiteral<"app-function">, z.ZodLiteral<"webhooks">, z.ZodLiteral<"workflow-action">, z.ZodLiteral<"workflow-action-tool">, z.ZodLiteral<"app-object">, z.ZodLiteral<"app-event">, z.ZodLiteral<"scim">, z.ZodLiteral<"page">]>, "many">>;
 export declare const docsSearchQuery: z.ZodString;
 export declare const docUrl: z.ZodString;

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

@@ -9,12 +9,18 @@ export const features = z
     .array(z.union([
     z.literal('card'),
     z.literal('settings'),
-    z.literal('app-function'),
+    z
+        .literal('app-function')
+        .describe('Also known as a public serverless function'),
     z.literal('webhooks'),
-    z.literal('workflow-action'),
-    z.literal('workflow-action-tool'),
+    z
+        .literal('workflow-action')
+        .describe('Also known as a custom workflow action.'),
+    z.literal('workflow-action-tool').describe('Also known as agent tools.'),
     z.literal('app-object'),
+    z.literal('app-event'),
     z.literal('scim'),
+    z.literal('page'),
 ]))
     .describe('The features to include in the project, multiple options can be selected')
     .optional();

package/mcp-server/utils/__tests__/cliConfig.test.d.ts

@@ -0,0 +1 @@
+export {};