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

package/lib/ui/SpinniesManager.js

@@ -7,8 +7,10 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 **/
+import readline from 'readline';
 import chalk from 'chalk';
-import { colorOptions, purgeSpinnerOptions, purgeSpinnersOptions, SPINNERS, terminalSupportsUnicode, } from './spinniesUtils.js';
+import cliCursor from 'cli-cursor';
+import { breakText, cleanStream, colorOptions, getLinesLength, purgeSpinnerOptions, purgeSpinnersOptions, SPINNERS, terminalSupportsUnicode, writeStream, prefixOptions, } from './spinniesUtils.js';
 function safeColor(text, color) {
     const chalkFn = chalk[color];
     if (typeof chalkFn === 'function') {
@@ -34,10 +36,14 @@ class SpinniesManager {
             succeedColor: 'green',
             failColor: 'red',
             spinner: terminalSupportsUnicode() ? SPINNERS.dots : SPINNERS.dashes,
-            disableSpins: true,
+            disableSpins: false,
             ...purgeSpinnersOptions(options),
         };
-        this.spin = false;
+        this.spin =
+            !this.options.disableSpins &&
+                !process.env.CI &&
+                process.stderr &&
+                process.stderr.isTTY;
         if (!this.hasAnySpinners()) {
             this.resetState();
         }
@@ -135,7 +141,22 @@ class SpinniesManager {
         status = status || 'spinning';
         this.spinners[name] = { ...this.spinners[name], ...options, status };
     }
-    updateSpinnerState() { }
+    updateSpinnerState() {
+        if (this.spin) {
+            if (this.currentInterval) {
+                clearInterval(this.currentInterval);
+            }
+            this.currentInterval = this.loopStream();
+            if (!this.isCursorHidden) {
+                cliCursor.hide();
+            }
+            this.isCursorHidden = true;
+            this.checkIfActiveSpinners();
+        }
+        else {
+            this.setRawStreamOutput();
+        }
+    }
     loopStream() {
         const frames = this.options.spinner?.frames || SPINNERS.dots.frames;
         const interval = this.options.spinner?.interval || SPINNERS.dots.interval;
@@ -147,10 +168,86 @@ class SpinniesManager {
                     : ++this.currentFrameIndex;
         }, interval);
     }
-    setStreamOutput(frame = '') { }
-    setRawStreamOutput() { }
-    checkIfActiveSpinners() { }
-    bindSigint() { }
+    setStreamOutput(frame = '') {
+        let output = '';
+        const linesLength = [];
+        const hasActiveSpinners = this.hasActiveSpinners();
+        Object.values(this.spinners).forEach(spinner => {
+            let { text } = spinner;
+            const { status, color, spinnerColor, succeedColor, failColor, indent = 0, succeedPrefix = prefixOptions(this.options).succeedPrefix, failPrefix = prefixOptions(this.options).failPrefix, } = spinner;
+            let line;
+            let prefixLength = indent;
+            text = text ?? '';
+            if (status === 'spinning') {
+                prefixLength += frame.length + 1;
+                text = breakText(text, prefixLength);
+                const colorizedFrame = safeColor(frame, spinnerColor);
+                const colorizedText = safeColor(text, color);
+                line = `${colorizedFrame} ${colorizedText}`;
+            }
+            else {
+                if (status === 'succeed') {
+                    prefixLength += succeedPrefix.length + 1;
+                    if (hasActiveSpinners) {
+                        text = breakText(text, prefixLength);
+                    }
+                    const colorizedText = safeColor(text, succeedColor);
+                    line = `${chalk.green(succeedPrefix)} ${colorizedText}`;
+                }
+                else if (status === 'fail') {
+                    prefixLength += failPrefix.length + 1;
+                    if (hasActiveSpinners) {
+                        text = breakText(text, prefixLength);
+                    }
+                    const colorizedText = safeColor(text, failColor);
+                    line = `${chalk.red(failPrefix)} ${colorizedText}`;
+                }
+                else {
+                    if (hasActiveSpinners) {
+                        text = breakText(text, prefixLength);
+                    }
+                    line = safeColor(text, color);
+                }
+            }
+            linesLength.push(...getLinesLength(text, prefixLength));
+            output += indent ? `${' '.repeat(indent)}${line}\n` : `${line}\n`;
+        });
+        if (!hasActiveSpinners) {
+            readline.clearScreenDown(this.stream);
+        }
+        writeStream(this.stream, output, linesLength);
+        if (hasActiveSpinners) {
+            cleanStream(this.stream, linesLength);
+        }
+        this.lineCount = linesLength.length;
+    }
+    setRawStreamOutput() {
+        Object.values(this.spinners).forEach(i => {
+            process.stderr.write(`- ${i.text}\n`);
+        });
+    }
+    checkIfActiveSpinners() {
+        if (!this.hasActiveSpinners()) {
+            if (this.spin) {
+                this.setStreamOutput();
+                readline.moveCursor(this.stream, 0, this.lineCount);
+                if (this.currentInterval) {
+                    clearInterval(this.currentInterval);
+                }
+                this.isCursorHidden = false;
+                cliCursor.show();
+            }
+            this.spinners = {};
+        }
+    }
+    bindSigint() {
+        process.removeAllListeners('SIGINT');
+        process.on('SIGINT', () => {
+            cliCursor.show();
+            readline.moveCursor(process.stderr, 0, this.lineCount);
+            process.exit(0);
+        });
+    }
 }
 const toExport = new SpinniesManager();
 export default toExport;

package/lib/usageTracking.js

@@ -44,7 +44,7 @@ export async function trackCommandUsage(command, meta = {}, accountId) {
         action: 'cli-command',
         command,
         authType,
-        ...meta,
+        meta,
         accountId,
     });
 }
@@ -133,12 +133,12 @@ async function trackCliInteraction({ action, accountId, command, authType, meta
             }
         }
         try {
+            logger.debug('Sent usage tracking command event: %o', usageTrackingEvent);
             return trackUsage('cli-interaction', EventClass.INTERACTION, usageTrackingEvent, accountId);
         }
         catch (error) {
             debugError(error);
         }
-        logger.debug('Sent usage tracking command event: %o', usageTrackingEvent);
     }
     catch (e) {
         debugError(e);

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.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/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),