@hubspot/cli 8.10.0 → 8.11.0-beta.0

package/commands/hubdb/list.d.ts

@@ -1,4 +1,4 @@
 import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
-type HubdbListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
+export type HubdbListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
 declare const hubdbListCommand: YargsCommandModule<unknown, HubdbListArgs>;
 export default hubdbListCommand;

package/commands/mcp/setup.d.ts

@@ -1,6 +1,8 @@
 import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
 interface MCPSetupArgs extends CommonArgs {
     client?: string[];
+    standalone?: boolean;
+    cliVersion?: string;
 }
 declare const mcpSetupCommand: YargsCommandModule<unknown, MCPSetupArgs>;
 export default mcpSetupCommand;

package/commands/mcp/setup.js

@@ -8,7 +8,11 @@ const describe = commands.mcp.setup.describe;
 async function handler(args) {
     const { exit } = args;
     try {
-        await configureMcpServer(args.client);
+        await configureMcpServer({
+            targets: args.client,
+            standalone: args.standalone,
+            cliVersion: args.cliVersion,
+        });
     }
     catch (e) {
         return exit(EXIT_CODES.ERROR);
@@ -21,6 +25,30 @@ function setupBuilder(yargs) {
         type: 'array',
         choices: [...supportedTools.map(tool => tool.value)],
     });
+    yargs.option('standalone', {
+        describe: commands.mcp.setup.args.standalone,
+        type: 'boolean',
+    });
+    yargs.option('cli-version', {
+        describe: commands.mcp.setup.args.cliVersion,
+        type: 'string',
+    });
+    yargs.check(argv => {
+        if (argv.cliVersion !== undefined && argv.standalone !== true) {
+            throw new Error(commands.mcp.setup.errors.cliVersionRequiresStandalone);
+        }
+        return true;
+    });
+    yargs.example([
+        [
+            '$0 mcp setup --client claude --no-standalone',
+            commands.mcp.setup.examples.nonInteractive,
+        ],
+        [
+            '$0 mcp setup --client cursor --standalone --cli-version 8.0.1',
+            commands.mcp.setup.examples.standalone,
+        ],
+    ]);
     return yargs;
 }
 const builder = makeYargsBuilder(setupBuilder, command, describe, {

package/commands/project/appInstallStatus.d.ts

@@ -1,4 +1,4 @@
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
-type ProjectInstallStatusArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs;
+export type ProjectInstallStatusArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs;
 declare const projectInstallStatusCommand: YargsCommandModule<unknown, ProjectInstallStatusArgs>;
 export default projectInstallStatusCommand;

package/commands/project/info.d.ts

@@ -1,4 +1,4 @@
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
-type ProjectInfoArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs;
+export type ProjectInfoArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs;
 declare const projectInfoCommand: YargsCommandModule<unknown, ProjectInfoArgs>;
 export default projectInfoCommand;

package/commands/project/installApp.d.ts

@@ -1,5 +1,5 @@
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs.js';
-type ProjectInstallAppArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs & {
+export type ProjectInstallAppArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs & {
     force: boolean;
     profile?: string;
 };

package/commands/project/profile/add.d.ts

@@ -1,7 +1,8 @@
 import { YargsCommandModule, CommonArgs } from '../../../types/Yargs.js';
-type ProjectProfileAddArgs = CommonArgs & {
+export type ProjectProfileAddArgs = CommonArgs & {
     name?: string;
     targetAccount?: number;
+    copyFrom?: string;
 };
 declare const projectProfileAddCommand: YargsCommandModule<unknown, ProjectProfileAddArgs>;
 export default projectProfileAddCommand;

package/commands/project/profile/add.js

@@ -157,7 +157,20 @@ async function handler(args) {
         accountId: targetAccountId,
         variables: {},
     };
-    const profileToCopyVariablesFrom = await selectProfileToCopyVariablesFrom(existingProfiles);
+    let profileToCopyVariablesFrom;
+    if (args.copyFrom) {
+        if (existingProfiles.includes(args.copyFrom)) {
+            profileToCopyVariablesFrom = args.copyFrom;
+        }
+        else {
+            uiLogger.error(commands.project.profile.add.errors.copyFromProfileNotFound(args.copyFrom));
+            return exit(EXIT_CODES.ERROR);
+        }
+    }
+    else {
+        profileToCopyVariablesFrom =
+            await selectProfileToCopyVariablesFrom(existingProfiles);
+    }
     if (profileToCopyVariablesFrom) {
         try {
             const profileToCopyFileContent = loadHsProfileFile(projectSourceDir, profileToCopyVariablesFrom);
@@ -190,8 +203,16 @@ function projectProfileAddBuilder(yargs) {
         describe: commands.project.profile.add.options.targetAccount,
         type: 'number',
     });
+    yargs.option('copy-from', {
+        describe: commands.project.profile.add.options.copyFrom,
+        type: 'string',
+    });
     yargs.example([
         ['$0 project profile add qa', commands.project.profile.add.example],
+        [
+            '$0 project profile add qa --target-account 123 --copy-from staging',
+            commands.project.profile.add.exampleCopyFrom,
+        ],
     ]);
     return yargs;
 }

package/commands/project/profile/delete.d.ts

@@ -1,5 +1,5 @@
 import { YargsCommandModule, CommonArgs } from '../../../types/Yargs.js';
-type ProjectProfileDeleteArgs = CommonArgs & {
+export type ProjectProfileDeleteArgs = CommonArgs & {
     name?: string;
 };
 declare const projectProfileDeleteCommand: YargsCommandModule<unknown, ProjectProfileDeleteArgs>;

package/commands/project/upload.js

@@ -113,7 +113,10 @@ async function handler(args) {
             (!result.buildResult.isAutoDeployEnabled || preview || skipAutoDeploy)) {
             uiLogger.log(chalk.bold(commands.project.upload.logs.buildSucceeded(result.buildId)));
             if (!preview) {
-                uiLogger.log(commands.project.upload.logs.autoDeployDisabled(`hs project deploy --build=${result.buildId}`));
+                const deployCommand = `hs project deploy --build=${result.buildId}`;
+                uiLogger.log(skipAutoDeploy
+                    ? commands.project.upload.logs.autoDeploySkipped(deployCommand)
+                    : commands.project.upload.logs.autoDeployDisabled(deployCommand));
                 logFeedbackMessage(result.buildId);
             }
             await displayWarnLogs(targetAccountId, projectConfig.name, result.buildId);

package/commands/project/validate.d.ts

@@ -1,5 +1,5 @@
 import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
-type ProjectValidateArgs = CommonArgs & {
+export type ProjectValidateArgs = CommonArgs & {
     profile?: string;
 };
 declare const projectValidateCommand: YargsCommandModule<unknown, ProjectValidateArgs>;

package/commands/testAccount/importData.d.ts

@@ -1,7 +1,7 @@
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs.js';
 export declare const command = "import-data";
 export declare const describe: string;
-type CrmImportDataArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+export type CrmImportDataArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     filePath: string | undefined;
     skipConfirm: boolean | undefined;
 };

package/lang/en.d.ts

@@ -1330,11 +1330,18 @@ export declare const commands: {
             vsCode: string;
             args: {
                 client: string;
+                standalone: string;
+                cliVersion: string;
                 docsSearch: string;
             };
+            examples: {
+                nonInteractive: string;
+                standalone: string;
+            };
             success: (derivedTargets: string[]) => string;
             errors: {
                 errorParsingJsonFIle: (filename: string, errorMessage: string) => string;
+                cliVersionRequiresStandalone: string;
             };
             spinners: {
                 failedToConfigure: string;
@@ -1429,6 +1436,7 @@ export declare const commands: {
                 describe: string;
                 verboseDescribe: string;
                 example: string;
+                exampleCopyFrom: string;
                 logs: {
                     copyExistingProfile: (profileName: string) => string;
                     copyExistingProfiles: string;
@@ -1452,6 +1460,7 @@ export declare const commands: {
                     invalidTargetAccount: string;
                     noAccountsConfigured: string;
                     failedToLoadProfile: (profileName: string) => string;
+                    copyFromProfileNotFound: (profileName: string) => string;
                     failedToCreateProfile: string;
                 };
                 positionals: {
@@ -1459,6 +1468,7 @@ export declare const commands: {
                 };
                 options: {
                     targetAccount: string;
+                    copyFrom: string;
                 };
             };
             delete: {
@@ -1880,6 +1890,7 @@ export declare const commands: {
                 readyToGoLive: string;
                 runCommand: (command: string) => string;
                 autoDeployDisabled: (deployCommand: string) => string;
+                autoDeploySkipped: (deployCommand: string) => string;
             };
             errors: {
                 noProjectConfig: string;

package/lang/en.js

@@ -1339,11 +1339,18 @@ export const commands = {
             vsCode: 'VSCode',
             args: {
                 client: 'Target apps to configure',
+                standalone: 'Use npx for all of the hs commands run by the MCP server. This allows you to use the MCP server without having the CLI globally installed.',
+                cliVersion: 'Pin a specific CLI version for standalone mode',
                 docsSearch: 'Should the docs search mcp server be installed',
             },
+            examples: {
+                nonInteractive: 'Configure Claude Code without prompts',
+                standalone: 'Configure Cursor in standalone mode with a pinned CLI version',
+            },
             success: (derivedTargets) => `You can now use the HubSpot CLI MCP Server in ${derivedTargets.join(', ')}.  ${chalk.bold('You may need to restart these tools to apply the changes')}.`,
             errors: {
                 errorParsingJsonFIle: (filename, errorMessage) => `Unable to update ${chalk.bold(filename)} due to invalid JSON: ${errorMessage}`,
+                cliVersionRequiresStandalone: '`--cli-version` requires `--standalone`. Pass `--standalone` to use a specific CLI version.',
             },
             spinners: {
                 failedToConfigure: 'Failed to configure the HubSpot mcp server.',
@@ -1444,6 +1451,7 @@ export const commands = {
                 describe: 'Add a new project profile',
                 verboseDescribe: `Add a new project profile\n\nProfiles enable you to reference variables in your component configuration files. Use the syntax ${chalk.bold('\${VARIABLE_NAME}')} to reference profile variables in your component configuration files. Then target the profile using the ${uiCommandReference('--profile')} flag when you upload your project.`,
                 example: 'Add a new project profile named hsprofile.qa.json',
+                exampleCopyFrom: 'Add a profile and copy variables from the staging profile',
                 logs: {
                     copyExistingProfile: (profileName) => `Found an existing profile. We can copy the variables from ${chalk.bold(profileName)} into your new profile.`,
                     copyExistingProfiles: 'We can copy the variables from one of your existing profiles into your new profile.',
@@ -1467,6 +1475,7 @@ export const commands = {
                     invalidTargetAccount: 'Target account is not configured in the CLI',
                     noAccountsConfigured: 'No accounts configured in the CLI',
                     failedToLoadProfile: (profileName) => `Unable to copy variables. Failed to load profile ${chalk.bold(profileName)}`,
+                    copyFromProfileNotFound: (profileName) => `Profile ${chalk.bold(profileName)} does not exist. Available profiles can be found in your project source directory.`,
                     failedToCreateProfile: 'Failed to create profile',
                 },
                 positionals: {
@@ -1474,6 +1483,7 @@ export const commands = {
                 },
                 options: {
                     targetAccount: 'The target account ID for this profile',
+                    copyFrom: 'Copy variables from an existing profile',
                 },
             },
             delete: {
@@ -1895,6 +1905,7 @@ export const commands = {
                 readyToGoLive: '🚀 Ready to take your project live?',
                 runCommand: (command) => `Run \`${uiCommandReference(command)}\``,
                 autoDeployDisabled: (deployCommand) => `Automatic deploys are disabled for this project. Run ${uiCommandReference(deployCommand)} to deploy this build.`,
+                autoDeploySkipped: (deployCommand) => `Auto-deploy was skipped for this build. Run ${uiCommandReference(deployCommand)} to deploy this build.`,
             },
             errors: {
                 noProjectConfig: 'No project detected. Run this command from a project directory.',

package/lib/mcp/setup.d.ts

@@ -8,7 +8,12 @@ interface McpCommand {
     args: string[];
     env?: Record<string, string>;
 }
-export declare function configureMcpServer(targets: string[] | undefined): Promise<string[]>;
+interface ConfigureMcpServerOptions {
+    targets?: string[];
+    standalone?: boolean;
+    cliVersion?: string;
+}
+export declare function configureMcpServer(options: ConfigureMcpServerOptions): Promise<string[]>;
 export declare function setupVsCode(mcpCommand?: McpCommand): Promise<boolean>;
 export declare function setupClaudeCode(mcpCommand?: McpCommand): Promise<boolean>;
 export declare function setupCursor(mcpCommand?: McpCommand): boolean;

package/lib/mcp/setup.js

@@ -32,8 +32,9 @@ const defaultMcpCommand = {
     command: 'hs',
     args: ['mcp', 'start'],
 };
-export async function configureMcpServer(targets) {
+export async function configureMcpServer(options) {
     try {
+        const { targets, standalone, cliVersion: cliVersionFlag } = options;
         let derivedTargets = [];
         if (!targets || targets.length === 0) {
             const { selectedTargets } = await promptUser({
@@ -52,23 +53,33 @@ export async function configureMcpServer(targets) {
         else {
             derivedTargets = targets;
         }
-        // Prompt for standalone mode
-        const { useStandaloneMode } = await promptUser({
-            name: 'useStandaloneMode',
-            type: 'confirm',
-            message: commands.mcp.setup.prompts.standaloneMode,
-            default: false,
-        });
-        const { cliVersion } = useStandaloneMode
-            ? await promptUser({
-                name: 'cliVersion',
-                type: 'input',
-                message: commands.mcp.setup.prompts.cliVersion,
-                validate: (v) => !v || /^[\d]+\.[\d]+\.[\d]+([-+][\w.]+)?$/.test(v.trim())
-                    ? true
-                    : 'Please enter a valid semver version (e.g. 8.0.1) or leave blank for latest.',
-            })
-            : { cliVersion: '' };
+        let useStandaloneMode = standalone;
+        if (useStandaloneMode === undefined) {
+            const response = await promptUser({
+                name: 'useStandaloneMode',
+                type: 'confirm',
+                message: commands.mcp.setup.prompts.standaloneMode,
+                default: false,
+            });
+            useStandaloneMode = response.useStandaloneMode;
+        }
+        let cliVersion = '';
+        if (useStandaloneMode) {
+            if (cliVersionFlag !== undefined) {
+                cliVersion = cliVersionFlag;
+            }
+            else {
+                const response = await promptUser({
+                    name: 'cliVersion',
+                    type: 'input',
+                    message: commands.mcp.setup.prompts.cliVersion,
+                    validate: (v) => !v || /^[\d]+\.[\d]+\.[\d]+([-+][\w.]+)?$/.test(v.trim())
+                        ? true
+                        : 'Please enter a valid semver version (e.g. 8.0.1) or leave blank for latest.',
+                });
+                cliVersion = response.cliVersion;
+            }
+        }
         const cliPackage = cliVersion
             ? `@hubspot/cli@${cliVersion}`
             : '@hubspot/cli';

package/lib/projects/upload.d.ts

@@ -24,7 +24,7 @@ type HandleProjectUploadArg<T> = {
     profile?: string;
     force?: boolean;
 };
-export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, skipNpmAudit, skipAutoDeploy: _skipAutoDeploy, force, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
+export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, skipNpmAudit, skipAutoDeploy, force, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
 export declare function validateSourceDirectory(srcDir: string, projectConfig: ProjectConfig, projectDir: string): Promise<void>;
 export declare function validateNoHSMetaMismatch(srcDir: string, projectConfig: ProjectConfig): Promise<void>;
 type HandleTranslateArg = {

package/lib/projects/upload.js

@@ -21,7 +21,7 @@ import { archiveWorkspacesAndDependencies, getPackageJsonPathsToUpdate, getLockf
 import { isLegacyProject } from '@hubspot/project-parsing-lib/projects';
 import { validateLintConfigOnUpload } from './validateLintConfigOnUpload.js';
 import { runNpmAuditsBeforeProjectUpload } from './npmAuditOnUpload.js';
-async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation) {
+async function uploadProjectFiles(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation, skipAutoDeploy) {
     const accountIdentifier = uiAccountDescription(accountId) || `${accountId}`;
     SpinniesManager.add('upload', {
         text: lib.projectUpload.uploadProjectFiles.add(projectName, accountIdentifier),
@@ -30,8 +30,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     let buildId;
     let error;
     try {
-        // TODO(skip-auto-deploy): Pass skipAutoDeploy once local-dev-lib is bumped
-        const { data: upload } = await uploadProject(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation);
+        const { data: upload } = await uploadProject(accountId, projectName, filePath, uploadMessage, platformVersion, intermediateRepresentation, skipAutoDeploy);
         buildId = upload.buildId;
         SpinniesManager.succeed('upload', {
             text: lib.projectUpload.uploadProjectFiles.succeed(projectName, accountIdentifier),
@@ -48,10 +47,7 @@ async function uploadProjectFiles(accountId, projectName, filePath, uploadMessag
     }
     return { buildId, error };
 }
-// TODO(skip-auto-deploy): Use skipAutoDeploy once local-dev-lib is bumped to support it
-export async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, skipNpmAudit = false, 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-skipAutoDeploy: _skipAutoDeploy = false, force = false, }) {
+export async function handleProjectUpload({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage = '', forceCreate = false, isUploadCommand = false, sendIR = false, skipValidation = false, skipNpmAudit = false, skipAutoDeploy = false, force = false, }) {
     const srcDir = path.resolve(projectDir, projectConfig.srcDir);
     await validateSourceDirectory(srcDir, projectConfig, projectDir);
     await validateNoHSMetaMismatch(srcDir, projectConfig);
@@ -119,7 +115,7 @@ skipAutoDeploy: _skipAutoDeploy = false, force = false, }) {
                 return resolve({ projectNotFound: true });
             }
             const projectId = project?.id;
-            const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion, intermediateRepresentation);
+            const { buildId, error } = await uploadProjectFiles(accountId, projectConfig.name, tempFile.name, uploadMessage, projectConfig.platformVersion, intermediateRepresentation, skipAutoDeploy);
             if (error) {
                 resolve({ uploadError: error, projectId });
             }

package/mcp-server/Tool.d.ts

@@ -1,15 +1,20 @@
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
+import { RequestHandlerExtra } from '@modelcontextprotocol/sdk/shared/protocol.js';
+import { ServerNotification, ServerRequest } from '@modelcontextprotocol/sdk/types.js';
 import { McpLogger } from './utils/logger.js';
 import { TextContentResponse } from './types.js';
+import { CommandResults, Command } from './utils/command.js';
+export type ToolExtra = RequestHandlerExtra<ServerRequest, ServerNotification>;
 export declare class Tool<InputSchema> {
     protected mcpServer: McpServer;
     protected logger: McpLogger;
     protected toolName: string;
     constructor(mcpServer: McpServer, logger: McpLogger, toolName: string);
     register(): RegisteredTool;
-    handler(input: InputSchema): TextContentResponse | Promise<TextContentResponse>;
-    protected getTrackingMeta(input: InputSchema): {
+    handler(_input: InputSchema): TextContentResponse | Promise<TextContentResponse>;
+    protected runCommand(directory: string, command: Command, extra?: ToolExtra): Promise<CommandResults>;
+    protected getTrackingMeta(_input: InputSchema): {
         [key: string]: string;
     } | undefined;
-    protected wrappedHandler(input: InputSchema): Promise<TextContentResponse>;
+    protected wrappedHandler(input: InputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
 }

package/mcp-server/Tool.js

@@ -1,6 +1,7 @@
 import { formatTextContents } from './utils/content.js';
 import { getErrorMessage } from '../lib/errorHandlers/index.js';
 import { trackToolUsage } from './utils/toolUsageTracking.js';
+import { runCommandInDir } from './utils/command.js';
 export class Tool {
     mcpServer;
     logger;
@@ -13,17 +14,36 @@ export class Tool {
     register() {
         throw new Error('Must implement register');
     }
-    handler(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    input) {
+    handler(_input) {
         throw new Error('Must implement handler');
     }
-    getTrackingMeta(
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    input) {
+    runCommand(directory, command, extra) {
+        let progressCount = 0;
+        return runCommandInDir(directory, command, async (chunk) => {
+            try {
+                const message = `${chunk.trimEnd()}`;
+                const token = extra?._meta?.progressToken;
+                if (token !== undefined && extra?.sendNotification) {
+                    progressCount++;
+                    await extra.sendNotification({
+                        method: 'notifications/progress',
+                        params: {
+                            progressToken: token,
+                            progress: progressCount,
+                            message,
+                        },
+                    });
+                }
+            }
+            catch {
+                // Swallow notification errors so a failed notification never crashes the tool
+            }
+        });
+    }
+    getTrackingMeta(_input) {
         return undefined;
     }
-    async wrappedHandler(input) {
+    async wrappedHandler(input, extra) {
         const startTime = Date.now();
         try {
             // `input` is logged unredacted. Tool input schemas MUST NOT include
@@ -34,7 +54,7 @@ export class Tool {
                 args: input,
             });
             await trackToolUsage(this.toolName, this.getTrackingMeta(input));
-            const result = await this.handler(input);
+            const result = await this.handler(input, extra);
             this.logger.debug(this.toolName, {
                 message: 'Tool completed',
                 durationMs: Date.now() - startTime,

package/mcp-server/server.js

@@ -17,22 +17,26 @@ WHEN TO USE THIS SERVER
   via \`search-docs\` + \`fetch-doc\` rather than from prior knowledge.
 
 REQUIRED WORKFLOWS
-1. Documentation lookup: always call \`search-docs\` first, then
+1. Authentication: call \`auth-account\` when the user wants to connect a
+   HubSpot account, when any tool reports "No account ID found", or when
+   there are no authenticated accounts. The tool opens a browser tab for
+   the user to authorize — no Personal Access Key is required up front.
+2. Documentation lookup: always call \`search-docs\` first, then
    \`fetch-doc\` on the most relevant result(s) before planning, writing
    code, or answering platform/API questions. Do not answer from memory.
-2. Locating a HubSpot project: when the current working directory is not
+3. Locating a HubSpot project: when the current working directory is not
    a HubSpot project (no \`hsproject.json\`) or you need to determine
    whether a directory contains one, call \`find-projects\` before
    running any tool that requires a project path.
-3. Editing \`*-hsmeta.json\`: call \`get-feature-config-schema\` for that
+4. Editing \`*-hsmeta.json\`: call \`get-feature-config-schema\` for that
    feature type first to learn the allowed fields and values.
-4. Debugging a failed build: start with \`get-build-status\` to surface
+5. Debugging a failed build: start with \`get-build-status\` to surface
    error messages, and only reach for \`get-build-logs\` for deeper
    troubleshooting or warnings.
-5. Reading serverless function logs: call \`list-cms-serverless-functions\`
+6. Reading serverless function logs: call \`list-cms-serverless-functions\`
    first to discover the endpoint path, then
    \`get-cms-serverless-function-logs\`.
-6. App analytics: call \`get-apps-info\` to discover \`appId\` values
+7. App analytics: call \`get-apps-info\` to discover \`appId\` values
    before \`get-api-usage-patterns-by-app-id\`.
 
 OUTPUT

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

@@ -1,5 +1,5 @@
 import { TextContentResponse } from '../../types.js';
-import { Tool } from '../../Tool.js';
+import { Tool, ToolExtra } from '../../Tool.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
@@ -20,7 +20,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 export type HsCreateFunctionInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class HsCreateFunctionTool extends Tool<HsCreateFunctionInputSchema> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ dest, functionsFolder, filename, endpointMethod, endpointPath, absoluteCurrentWorkingDirectory, }: HsCreateFunctionInputSchema): Promise<TextContentResponse>;
+    handler({ dest, functionsFolder, filename, endpointMethod, endpointPath, absoluteCurrentWorkingDirectory, }: HsCreateFunctionInputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};

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

@@ -1,10 +1,9 @@
 import { Tool } from '../../Tool.js';
 import { z } from 'zod';
 import { absoluteCurrentWorkingDirectory } from '../project/constants.js';
-import { runCommandInDir } from '../../utils/command.js';
 import { formatTextContents, formatTextContent } from '../../utils/content.js';
-import { addFlag } from '../../utils/command.js';
 import { HTTP_METHODS } from '../../../types/Cms.js';
+import { HubSpotCommand } from '../../utils/command.js';
 import { setupHubSpotConfig } from '../../utils/config.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
 const inputSchema = {
@@ -37,7 +36,7 @@ export class HsCreateFunctionTool extends Tool {
     constructor(mcpServer, logger) {
         super(mcpServer, logger, toolName);
     }
-    async handler({ dest, functionsFolder, filename, endpointMethod, endpointPath, absoluteCurrentWorkingDirectory, }) {
+    async handler({ dest, functionsFolder, filename, endpointMethod, endpointPath, absoluteCurrentWorkingDirectory, }, extra) {
         setupHubSpotConfig(absoluteCurrentWorkingDirectory);
         const content = [];
         // Require functions folder
@@ -59,28 +58,22 @@ export class HsCreateFunctionTool extends Tool {
             };
         }
         // Build the command
-        let command = 'hs cms function create';
+        const command = new HubSpotCommand('cms function create');
         if (dest) {
-            command += ` "${dest}"`;
+            command.addArg(dest);
         }
-        // Add function-specific flags
         if (functionsFolder) {
-            command = addFlag(command, 'functions-folder', functionsFolder);
+            command.addFlag('functions-folder', functionsFolder);
         }
         if (filename) {
-            command = addFlag(command, 'filename', filename);
-        }
-        if (endpointMethod) {
-            command = addFlag(command, 'endpoint-method', endpointMethod);
-        }
-        else {
-            command = addFlag(command, 'endpoint-method', 'GET');
+            command.addFlag('filename', filename);
         }
+        command.addFlag('endpoint-method', endpointMethod ?? 'GET');
         if (endpointPath) {
-            command = addFlag(command, 'endpoint-path', endpointPath);
+            command.addFlag('endpoint-path', endpointPath);
         }
         try {
-            const { stdout, stderr } = await runCommandInDir(absoluteCurrentWorkingDirectory, command);
+            const { stdout, stderr } = await this.runCommand(absoluteCurrentWorkingDirectory, command, extra);
             return formatTextContents(stdout, stderr);
         }
         catch (error) {
@@ -102,6 +95,6 @@ export class HsCreateFunctionTool extends Tool {
                 idempotentHint: false,
                 openWorldHint: false,
             },
-        }, input => this.wrappedHandler(input));
+        }, (input, extra) => this.wrappedHandler(input, extra));
     }
 }

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

@@ -1,5 +1,5 @@
 import { TextContentResponse } from '../../types.js';
-import { Tool } from '../../Tool.js';
+import { Tool, ToolExtra } from '../../Tool.js';
 import { McpServer, RegisteredTool } from '@modelcontextprotocol/sdk/server/mcp.js';
 import { McpLogger } from '../../utils/logger.js';
 import { z } from 'zod';
@@ -16,7 +16,7 @@ declare const inputSchemaZodObject: z.ZodObject<{
 export type HsCreateModuleInputSchema = z.infer<typeof inputSchemaZodObject>;
 export declare class HsCreateModuleTool extends Tool<HsCreateModuleInputSchema> {
     constructor(mcpServer: McpServer, logger: McpLogger);
-    handler({ userSuppliedName, dest, moduleLabel, reactType, contentTypes, global, availableForNewContent, absoluteCurrentWorkingDirectory, }: HsCreateModuleInputSchema): Promise<TextContentResponse>;
+    handler({ userSuppliedName, dest, moduleLabel, reactType, contentTypes, global, availableForNewContent, absoluteCurrentWorkingDirectory, }: HsCreateModuleInputSchema, extra?: ToolExtra): Promise<TextContentResponse>;
     register(): RegisteredTool;
 }
 export {};