@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/lib/validation.js

@@ -1,6 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../lib/ui/logger.js';
 import { CMS_PUBLISH_MODE } from '@hubspot/local-dev-lib/constants/files';
 import { API_KEY_AUTH_METHOD, OAUTH_AUTH_METHOD, PERSONAL_ACCESS_KEY_AUTH_METHOD, } from '@hubspot/local-dev-lib/constants/auth';
 import { commaSeparatedValues } from '@hubspot/local-dev-lib/text';
@@ -10,43 +10,43 @@ import { accessTokenForPersonalAccessKey } from '@hubspot/local-dev-lib/personal
 import { getAbsoluteFilePath, getCwd, getExt, } from '@hubspot/local-dev-lib/path';
 import { getCmsPublishMode } from './commonOpts.js';
 import { logError } from './errorHandlers/index.js';
+import { lib } from '../lang/en.js';
 export async function validateAccount(options) {
     const { derivedAccountId, userProvidedAccount } = options;
     const accountId = getAccountId(derivedAccountId);
     if (!accountId) {
         if (userProvidedAccount) {
-            logger.error(`The account "${userProvidedAccount}" could not be found in the config`);
+            uiLogger.error(lib.validation.accountNotFoundInConfig(userProvidedAccount));
         }
         else {
-            logger.error('An account needs to be supplied either via "--account" or through setting a "defaultPortal"');
+            uiLogger.error(lib.validation.accountRequired);
         }
         return false;
     }
     if (userProvidedAccount && loadConfigFromEnvironment()) {
-        throw new Error('Cannot specify an account when environment variables are supplied. Please unset the environment variables or do not use the "--account" flag.');
+        throw new Error(lib.validation.userProvidedAccount);
     }
     const accountConfig = getAccountConfig(accountId);
     if (!accountConfig) {
-        logger.error(`The account ${accountId} has not been configured`);
+        uiLogger.error(lib.validation.accountNotConfigured(accountId));
         return false;
     }
     const { authType, auth, apiKey, personalAccessKey } = accountConfig;
     if (typeof authType === 'string' && authType !== authType.toLowerCase()) {
-        logger.error(`Invalid "authType" value "${authType}" for account "${accountId}" in config file: ${getConfigPath()}. Valid values are ${commaSeparatedValues([
+        uiLogger.error(lib.validation.invalidAuthType(authType, accountId, getConfigPath() || '', commaSeparatedValues([
             PERSONAL_ACCESS_KEY_AUTH_METHOD,
             OAUTH_AUTH_METHOD,
             API_KEY_AUTH_METHOD,
-        ].map(method => method.value))}.`);
+        ].map(method => method.value))));
     }
     if (authType === 'oauth2') {
         if (typeof auth !== 'object') {
-            logger.error(`The OAuth2 auth configuration for account ${accountId} is missing`);
+            uiLogger.error(lib.validation.oauth2ConfigMissing(accountId));
             return false;
         }
         const { clientId, clientSecret, tokenInfo } = auth;
         if (!clientId || !clientSecret || !tokenInfo || !tokenInfo.refreshToken) {
-            logger.error(`The OAuth2 configuration for account ${accountId} is incorrect`);
-            logger.error('Run "hs auth --type=oauth2" to reauthenticate');
+            uiLogger.error(lib.validation.oauth2ConfigIncorrect(accountId));
             return false;
         }
         const oauth = getOauthManager(accountId, accountConfig);
@@ -56,7 +56,7 @@ export async function validateAccount(options) {
                 accessToken = await oauth.accessToken();
             }
             if (!accessToken) {
-                logger.error(`The OAuth2 access token could not be found for accountId ${accountId}`);
+                uiLogger.error(lib.validation.oauth2AccessTokenNotFound(accountId));
                 return false;
             }
         }
@@ -67,13 +67,13 @@ export async function validateAccount(options) {
     }
     else if (authType === 'personalaccesskey') {
         if (!personalAccessKey) {
-            logger.error(`The account "${accountId}" is configured to use a access key for authentication and is missing a "personalAccessKey" in the configuration file`);
+            uiLogger.error(lib.validation.personalAccessKeyMissing(accountId));
             return false;
         }
         try {
             const accessToken = await accessTokenForPersonalAccessKey(accountId);
             if (!accessToken) {
-                logger.error(`An OAuth2 access token for account "${accountId} could not be retrieved using the "personalAccessKey" provided`);
+                uiLogger.error(lib.validation.personalAccessKeyTokenRetrievalFailed(accountId));
                 return false;
             }
         }
@@ -83,7 +83,7 @@ export async function validateAccount(options) {
         }
     }
     else if (!apiKey) {
-        logger.error(`The accountId ${accountId} is missing authentication configuration`);
+        uiLogger.error(lib.validation.authConfigurationMissing(accountId));
         return false;
     }
     return true;
@@ -93,15 +93,12 @@ export function validateCmsPublishMode(options) {
     if (CMS_PUBLISH_MODE[cmsPublishMode]) {
         return true;
     }
-    const modesMessage = `Available CMS publish modes are: ${Object.values(CMS_PUBLISH_MODE).join(', ')}.`;
+    const modesMessage = lib.validation.availableCMSModes(Object.values(CMS_PUBLISH_MODE).join(', '));
     if (cmsPublishMode != null) {
-        logger.error([
-            `The CMS publish mode "${cmsPublishMode}" is invalid.`,
-            modesMessage,
-        ].join(' '));
+        uiLogger.error(lib.validation.invalidCmsPublishMode(cmsPublishMode, modesMessage));
     }
     else {
-        logger.error(['The CMS publish mode option is missing.', modesMessage].join(' '));
+        uiLogger.error(lib.validation.missingCmsPublishMode(modesMessage));
     }
     return false;
 }
@@ -124,11 +121,11 @@ export function fileExists(_path) {
 export function checkAndConvertToJson(_path) {
     const filePath = getAbsoluteFilePath(_path);
     if (!fileExists(filePath)) {
-        logger.error(`The path "${_path}" is not a path to a file`);
+        uiLogger.error(lib.validation.pathNotFile(_path));
         return null;
     }
     if (getExt(_path) !== 'json') {
-        logger.error(`The file "${_path}" must be a valid JSON file`);
+        uiLogger.error(lib.validation.fileNotJson(_path));
         return null;
     }
     let result;
@@ -136,7 +133,7 @@ export function checkAndConvertToJson(_path) {
         result = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
     }
     catch (e) {
-        logger.error(`The file "${_path}" contains invalid JSON`);
+        uiLogger.error(lib.validation.fileInvalidJson(_path));
         result = null;
     }
     return result;

package/lib/yargsUtils.d.ts

@@ -13,4 +13,4 @@ export declare function makeYargsBuilder<T>(callback: (yargs: Argv) => Argv<T>,
     };
     useJSONOutputOptions?: boolean;
 }): (yargs: Argv) => Promise<Argv<T>>;
-export declare function getExclusiveConflicts(options: string[]): Record<string, string[]>;
+export declare function strictEnforceBoolean(rawArgs: string[], booleanOptions: string[]): boolean;

package/lib/yargsUtils.js

@@ -1,5 +1,6 @@
 import { addCustomHelpOutput, addTestingOptions, addAccountOptions, addConfigOptions, addGlobalOptions, addUseEnvironmentOptions, addCmsPublishModeOptions, addJSONOutputOptions, } from './commonOpts.js';
 import { hasFlag } from './utils/hasFlag.js';
+import { commands } from '../lang/en.js';
 // Re-export for backwards compatibility
 export { hasFlag };
 export function makeYargsBuilder(callback, command, describe, options = {}) {
@@ -34,9 +35,15 @@ export function makeYargsBuilder(callback, command, describe, options = {}) {
         return result;
     };
 }
-export function getExclusiveConflicts(options) {
-    return options.reduce((acc, curr) => {
-        acc[curr] = options.filter(s => s !== curr);
-        return acc;
-    }, {});
+export function strictEnforceBoolean(rawArgs, booleanOptions) {
+    for (const option of booleanOptions) {
+        const argIndex = rawArgs.findIndex(arg => arg.startsWith(`--${option}=`));
+        if (argIndex !== -1) {
+            const value = rawArgs[argIndex].split('=')[1];
+            if (value && !['true', 'false'].includes(value.toLowerCase())) {
+                throw new Error(commands.config.subcommands.set.errors.invalidBoolean(option, value));
+            }
+        }
+    }
+    return true;
 }

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

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

package/mcp-server/tools/cms/HsCreateModuleTool.d.ts

@@ -13,19 +13,19 @@ declare const inputSchemaZodObject: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     absoluteCurrentWorkingDirectory: string;
     dest?: string | undefined;
-    global?: boolean | undefined;
     moduleLabel?: string | undefined;
     reactType?: boolean | undefined;
     contentTypes?: string | undefined;
+    global?: boolean | undefined;
     availableForNewContent?: boolean | undefined;
     userSuppliedName?: string | undefined;
 }, {
     absoluteCurrentWorkingDirectory: string;
     dest?: string | undefined;
-    global?: boolean | undefined;
     moduleLabel?: string | undefined;
     reactType?: boolean | undefined;
     contentTypes?: string | undefined;
+    global?: boolean | undefined;
     availableForNewContent?: boolean | undefined;
     userSuppliedName?: string | undefined;
 }>;

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

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

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

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

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

@@ -26,7 +26,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'get-hubspot-cms-serverless-function-logs';
+const toolName = 'get-cms-serverless-function-logs';
 export class HsFunctionLogsTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);
@@ -69,7 +69,7 @@ export class HsFunctionLogsTool extends Tool {
     register() {
         return this.mcpServer.registerTool(toolName, {
             title: 'Get HubSpot CMS serverless function logs for an endpoint',
-            description: 'Retrieve logs for HubSpot CMS serverless functions. Use this tool to help debug issues with serverless functions by reading the production logs. Supports various options like latest, compact, and limiting results. Use after listing functions with list-hubspot-cms-serverless-functions to get the endpoint path.',
+            description: 'Retrieve logs for HubSpot CMS serverless functions. Use this tool to help debug issues with serverless functions by reading the production logs. Supports various options like latest, compact, and limiting results. Use after listing functions with list-cms-serverless-functions to get the endpoint path.',
             inputSchema,
         }, this.handler);
     }

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

@@ -18,7 +18,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'list-hubspot-cms-serverless-functions';
+const toolName = 'list-cms-serverless-functions';
 export class HsListFunctionsTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

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

@@ -18,7 +18,7 @@ const inputSchema = {
 };
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const inputSchemaZodObject = z.object({ ...inputSchema });
-const toolName = 'list-hubspot-cms-remote-contents';
+const toolName = 'list-cms-remote-contents';
 export class HsListTool extends Tool {
     constructor(mcpServer) {
         super(mcpServer);

package/mcp-server/tools/cms/__tests__/HsCreateFunctionTool.test.js

@@ -28,7 +28,7 @@ describe('HsCreateFunctionTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-hubspot-cms-function', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-cms-function', {
                 title: 'Create HubSpot CMS Serverless Function',
                 description: `Creates a new HubSpot CMS serverless function using the hs create function command. Functions can be created non-interactively by specifying functionsFolder, filename, and endpointPath. Supports all HTTP methods (${HTTP_METHODS.join(', ')}).`,
                 inputSchema: expect.any(Object),

package/mcp-server/tools/cms/__tests__/HsCreateModuleTool.test.js

@@ -27,7 +27,7 @@ describe('HsCreateModuleTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-hubspot-cms-module', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-cms-module', {
                 title: 'Create HubSpot CMS Module',
                 description: 'Creates a new HubSpot CMS module using the hs create module command. Modules can be created non-interactively by specifying moduleLabel and other module options. You can create either HubL or React modules by setting the reactType parameter.',
                 inputSchema: expect.any(Object),

package/mcp-server/tools/cms/__tests__/HsCreateTemplateTool.test.js

@@ -28,7 +28,7 @@ describe('HsCreateTemplateTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-hubspot-cms-template', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('create-cms-template', {
                 title: 'Create HubSpot CMS Template',
                 description: `Creates a new HubSpot CMS template using the hs create template command. Templates can be created non-interactively by specifying templateType. Supports all template types including: ${TEMPLATE_TYPES.join(', ')}.`,
                 inputSchema: expect.any(Object),

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

@@ -27,9 +27,9 @@ describe('HsFunctionLogsTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-hubspot-cms-serverless-function-logs', expect.objectContaining({
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('get-cms-serverless-function-logs', expect.objectContaining({
                 title: 'Get HubSpot CMS serverless function logs for an endpoint',
-                description: 'Retrieve logs for HubSpot CMS serverless functions. Use this tool to help debug issues with serverless functions by reading the production logs. Supports various options like latest, compact, and limiting results. Use after listing functions with list-hubspot-cms-serverless-functions to get the endpoint path.',
+                description: 'Retrieve logs for HubSpot CMS serverless functions. Use this tool to help debug issues with serverless functions by reading the production logs. Supports various options like latest, compact, and limiting results. Use after listing functions with list-cms-serverless-functions to get the endpoint path.',
                 inputSchema: expect.any(Object),
             }), expect.any(Function));
             expect(result).toBe(mockRegisteredTool);

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

@@ -27,7 +27,7 @@ describe('HsListFunctionsTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-hubspot-cms-serverless-functions', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-cms-serverless-functions', {
                 title: 'List HubSpot CMS Serverless Functions',
                 description: 'Get a list of all serverless functions deployed in a HubSpot portal/account. Shows function routes, HTTP methods, secrets, and timestamps.',
                 inputSchema: expect.any(Object),

package/mcp-server/tools/cms/__tests__/HsListTool.test.js

@@ -27,7 +27,7 @@ describe('HsListTool', () => {
     describe('register', () => {
         it('should register the tool with the MCP server', () => {
             const result = tool.register();
-            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-hubspot-cms-remote-contents', {
+            expect(mockMcpServer.registerTool).toHaveBeenCalledWith('list-cms-remote-contents', {
                 title: 'List HubSpot CMS Directory Contents',
                 description: 'List remote contents of a HubSpot CMS directory.',
                 inputSchema: expect.any(Object),

package/mcp-server/tools/index.js

@@ -7,6 +7,8 @@ import { ValidateProjectTool } from './project/ValidateProjectTool.js';
 import { GetConfigValuesTool } from './project/GetConfigValuesTool.js';
 import { DocsSearchTool } from './project/DocsSearchTool.js';
 import { DocFetchTool } from './project/DocFetchTool.js';
+import { GetApiUsagePatternsByAppIdTool } from './project/GetApiUsagePatternsByAppIdTool.js';
+import { GetApplicationInfoTool } from './project/GetApplicationInfoTool.js';
 import { HsListTool } from './cms/HsListTool.js';
 import { HsCreateModuleTool } from './cms/HsCreateModuleTool.js';
 import { HsCreateTemplateTool } from './cms/HsCreateTemplateTool.js';
@@ -24,6 +26,8 @@ export function registerProjectTools(mcpServer) {
         new GetConfigValuesTool(mcpServer).register(),
         new DocsSearchTool(mcpServer).register(),
         new DocFetchTool(mcpServer).register(),
+        new GetApiUsagePatternsByAppIdTool(mcpServer).register(),
+        new GetApplicationInfoTool(mcpServer).register(),
     ];
 }
 export function registerCmsTools(mcpServer) {

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/GetApiUsagePatternsByAppIdTool.d.ts

@@ -0,0 +1,23 @@
+import { TextContentResponse, Tool } from '../../types.js';
+import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { z } from 'zod';
+declare const inputSchemaZodObject: z.ZodObject<{
+    appId: z.ZodString;
+    startDate: z.ZodOptional<z.ZodString>;
+    endDate: z.ZodOptional<z.ZodString>;
+}, "strip", z.ZodTypeAny, {
+    appId: string;
+    startDate?: string | undefined;
+    endDate?: string | undefined;
+}, {
+    appId: string;
+    startDate?: string | undefined;
+    endDate?: string | undefined;
+}>;
+export type GetApiUsagePatternsByAppIdInputSchema = z.infer<typeof inputSchemaZodObject>;
+export declare class GetApiUsagePatternsByAppIdTool extends Tool<GetApiUsagePatternsByAppIdInputSchema> {
+    constructor(mcpServer: McpServer);
+    handler({ appId, startDate, endDate, }: GetApiUsagePatternsByAppIdInputSchema): Promise<TextContentResponse>;
+    register(): RegisteredTool;
+}
+export {};