@hubspot/cli 7.5.11-experimental.0 → 7.7.0-experimental.0

package/commands/secret/addSecret.js

@@ -1,20 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const secrets_1 = require("@hubspot/local-dev-lib/api/secrets");
 const index_1 = require("../../lib/errorHandlers/index");
 const usageTracking_1 = require("../../lib/usageTracking");
-const commonOpts_1 = require("../../lib/commonOpts");
 const ui_1 = require("../../lib/ui");
 const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_2 = require("../../lib/ui");
-exports.command = 'add [name]';
-exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.add.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'add [name]';
+const describe = (0, lang_1.i18n)(`commands.secret.subcommands.add.describe`);
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -49,13 +46,23 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function addSecretBuilder(yargs) {
     yargs.positional('name', {
         describe: (0, lang_1.i18n)(`commands.secret.subcommands.add.positionals.name.describe`),
         type: 'string',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(addSecretBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const addSecretCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = addSecretCommand;

package/commands/secret/deleteSecret.d.ts

@@ -1,12 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "delete [name]";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
-type DeleteSecretArgs = CommonArgs & CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type DeleteSecretArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     name?: string;
     force?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<DeleteSecretArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<DeleteSecretArgs>;
-export {};
+declare const deleteSecretCommand: YargsCommandModule<unknown, DeleteSecretArgs>;
+export default deleteSecretCommand;

package/commands/secret/deleteSecret.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const secrets_1 = require("@hubspot/local-dev-lib/api/secrets");
 const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
@@ -11,10 +8,10 @@ const exitCodes_1 = require("../../lib/enums/exitCodes");
 const index_1 = require("../../lib/errorHandlers/index");
 const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
-const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-exports.command = 'delete [name]';
-exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.delete.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'delete [name]';
+const describe = (0, lang_1.i18n)(`commands.secret.subcommands.delete.describe`);
 async function handler(args) {
     const { name, derivedAccountId, force } = args;
     let secretName = name;
@@ -59,10 +56,7 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function deleteSecretBuilder(yargs) {
     yargs
         .positional('name', {
         describe: (0, lang_1.i18n)(`commands.secret.subcommands.delete.positionals.name.describe`),
@@ -74,3 +68,16 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(deleteSecretBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const deleteSecretCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = deleteSecretCommand;

package/commands/secret/listSecret.d.ts

@@ -1,9 +1,4 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "list";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
-type ListSecretArgs = CommonArgs & CombinedArgs;
-export declare function handler(args: ArgumentsCamelCase<ListSecretArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ListSecretArgs>;
-export {};
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type ListSecretArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
+declare const listSecretCommand: YargsCommandModule<unknown, ListSecretArgs>;
+export default listSecretCommand;

package/commands/secret/listSecret.js

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const secrets_1 = require("@hubspot/local-dev-lib/api/secrets");
 const index_1 = require("../../lib/errorHandlers/index");
 const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
-const commonOpts_1 = require("../../lib/commonOpts");
 const lang_1 = require("../../lib/lang");
-exports.command = 'list';
-exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.list.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'list';
+const describe = (0, lang_1.i18n)(`commands.secret.subcommands.list.describe`);
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('secrets-list', {}, derivedAccountId);
@@ -32,9 +29,19 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function listSecretBuilder(yargs) {
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(listSecretBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const listSecretCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = listSecretCommand;

package/commands/secret/updateSecret.d.ts

@@ -1,11 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "update [name]";
-export declare const describe: string;
-type CombinedArgs = ConfigArgs & AccountArgs & EnvironmentArgs;
-type UpdateSecretArgs = CommonArgs & CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type UpdateSecretArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     name?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<UpdateSecretArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<UpdateSecretArgs>;
-export {};
+declare const updateSecretCommand: YargsCommandModule<unknown, UpdateSecretArgs>;
+export default updateSecretCommand;

package/commands/secret/updateSecret.js

@@ -1,19 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const secrets_1 = require("@hubspot/local-dev-lib/api/secrets");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const index_1 = require("../../lib/errorHandlers/index");
 const usageTracking_1 = require("../../lib/usageTracking");
 const ui_1 = require("../../lib/ui");
-const commonOpts_1 = require("../../lib/commonOpts");
 const secretPrompt_1 = require("../../lib/prompts/secretPrompt");
 const lang_1 = require("../../lib/lang");
-exports.command = 'update [name]';
-exports.describe = (0, lang_1.i18n)(`commands.secret.subcommands.update.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'update [name]';
+const describe = (0, lang_1.i18n)(`commands.secret.subcommands.update.describe`);
 async function handler(args) {
     const { name, derivedAccountId } = args;
     let secretName = name;
@@ -48,13 +45,23 @@ async function handler(args) {
         }));
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function updateSecretBuilder(yargs) {
     yargs.positional('name', {
         describe: (0, lang_1.i18n)(`commands.secret.subcommands.update.positionals.name.describe`),
         type: 'string',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(updateSecretBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const updateSecretCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = updateSecretCommand;

package/commands/secret.d.ts

@@ -1,4 +1,3 @@
-import { Argv } from 'yargs';
-export declare const command: string[];
-export declare const describe: string;
-export declare function builder(yargs: Argv): Argv;
+import { YargsCommandModuleBucket } from '../types/Yargs';
+declare const secretCommand: YargsCommandModuleBucket;
+export default secretCommand;

package/commands/secret.js

@@ -1,55 +1,32 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.builder = builder;
-const commonOpts_1 = require("../lib/commonOpts");
-const addSecretCommand = __importStar(require("./secret/addSecret"));
-const listSecretCommand = __importStar(require("./secret/listSecret"));
-const deleteSecretCommand = __importStar(require("./secret/deleteSecret"));
-const updateSecretCommand = __importStar(require("./secret/updateSecret"));
+const addSecret_1 = __importDefault(require("./secret/addSecret"));
+const listSecret_1 = __importDefault(require("./secret/listSecret"));
+const deleteSecret_1 = __importDefault(require("./secret/deleteSecret"));
+const updateSecret_1 = __importDefault(require("./secret/updateSecret"));
 const lang_1 = require("../lib/lang");
-exports.command = ['secret', 'secrets'];
-exports.describe = (0, lang_1.i18n)(`commands.secret.describe`);
-function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
+const yargsUtils_1 = require("../lib/yargsUtils");
+const command = ['secret', 'secrets'];
+const describe = (0, lang_1.i18n)(`commands.secret.describe`);
+function secretBuilder(yargs) {
     yargs
-        .command(listSecretCommand)
-        .command(addSecretCommand)
-        .command(updateSecretCommand)
-        .command(deleteSecretCommand)
+        .command(listSecret_1.default)
+        .command(addSecret_1.default)
+        .command(updateSecret_1.default)
+        .command(deleteSecret_1.default)
         .demandCommand(1, '');
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(secretBuilder, command, describe);
+const secretCommand = {
+    command,
+    describe,
+    builder,
+    handler: () => { },
+};
+exports.default = secretCommand;
+// TODO Remove this legacy export once we've migrated all commands to TS
+module.exports = secretCommand;

package/commands/setupMcp.d.ts

@@ -0,0 +1,8 @@
+import { CommonArgs, YargsCommandModule } from '../types/Yargs';
+type SetupMcpArgs = CommonArgs & {
+    autoSetup?: boolean;
+    showInstructions?: boolean;
+    global?: boolean;
+};
+declare const setupMcpCommand: YargsCommandModule<unknown, SetupMcpArgs>;
+export default setupMcpCommand;

package/commands/setupMcp.js

@@ -0,0 +1,229 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const en_1 = require("../lang/en");
+const yargsUtils_1 = require("../lib/yargsUtils");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const promptUtils_1 = require("../lib/prompts/promptUtils");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const os_1 = __importDefault(require("os"));
+const command = 'setup-mcp';
+const describe = en_1.commands.setupMcp.describe;
+function getCursorMcpConfigPath(global = true) {
+    if (global) {
+        // Global configuration: ~/.cursor/mcp.json
+        const homeDir = os_1.default.homedir();
+        return path_1.default.join(homeDir, '.cursor', 'mcp.json');
+    }
+    else {
+        // Project-specific configuration: .cursor/mcp.json in current directory
+        return path_1.default.join(process.cwd(), '.cursor', 'mcp.json');
+    }
+}
+const MCP_SERVER_COMMAND = 'hsmcp';
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+async function readCursorConfig(global = true) {
+    const configPath = getCursorMcpConfigPath(global);
+    try {
+        if (await fs_extra_1.default.pathExists(configPath)) {
+            const content = await fs_extra_1.default.readFile(configPath, 'utf8');
+            return JSON.parse(content);
+        }
+    }
+    catch (error) {
+        logger_1.logger.debug(`Error reading Cursor config: ${error}`);
+    }
+    return { mcpServers: {} };
+}
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+async function writeCursorConfig(config, global = true) {
+    const configPath = getCursorMcpConfigPath(global);
+    const configDir = path_1.default.dirname(configPath);
+    // Ensure the directory exists
+    await fs_extra_1.default.ensureDir(configDir);
+    // Write the config with proper formatting
+    await fs_extra_1.default.writeFile(configPath, JSON.stringify(config, null, 2));
+}
+async function setupMcpServer(global = true) {
+    try {
+        const config = await readCursorConfig(global);
+        // Check if hsmcp command is available
+        try {
+            require('child_process').execSync(`which ${MCP_SERVER_COMMAND} 2>/dev/null`, {
+                encoding: 'utf8',
+            });
+        }
+        catch (error) {
+            logger_1.logger.error(en_1.commands.setupMcp.errors.serverNotFound);
+            logger_1.logger.error(en_1.commands.setupMcp.errors.installHint);
+            return false;
+        }
+        // Check if already configured
+        if (config.mcpServers && config.mcpServers['hubspot-cli-mcp']) {
+            logger_1.logger.info(en_1.commands.setupMcp.warnings.alreadyConfigured);
+            const { shouldOverwrite } = await (0, promptUtils_1.promptUser)([
+                {
+                    type: 'confirm',
+                    name: 'shouldOverwrite',
+                    message: en_1.commands.setupMcp.prompts.overwrite,
+                    default: false,
+                },
+            ]);
+            if (!shouldOverwrite) {
+                return true;
+            }
+        }
+        // Configure the MCP server with the simple global command
+        if (!config.mcpServers) {
+            config.mcpServers = {};
+        }
+        config.mcpServers['hubspot-cli-mcp'] = {
+            command: MCP_SERVER_COMMAND,
+            args: [],
+        };
+        await writeCursorConfig(config, global);
+        const configType = global ? 'global' : 'project-specific';
+        logger_1.logger.success(en_1.commands.setupMcp.success.configured.replace('Claude', `Cursor (${configType})`));
+        logger_1.logger.info(en_1.commands.setupMcp.success.restartCursor);
+        return true;
+    }
+    catch (error) {
+        logger_1.logger.error(`${en_1.commands.setupMcp.errors.configurationFailed}: ${error}`);
+        return false;
+    }
+}
+function displayInstructions(global = true) {
+    const configPath = getCursorMcpConfigPath(global);
+    const configType = global ? 'global' : 'project-specific';
+    logger_1.logger.log(en_1.commands.setupMcp.instructions.title.replace('Claude', `Cursor (${configType})`));
+    logger_1.logger.log('');
+    logger_1.logger.log(en_1.commands.setupMcp.instructions.step1);
+    logger_1.logger.log(`  ${configPath}`);
+    logger_1.logger.log('');
+    logger_1.logger.log(en_1.commands.setupMcp.instructions.step2);
+    logger_1.logger.log('  {');
+    logger_1.logger.log('    "mcpServers": {');
+    logger_1.logger.log('      "hubspot-cli-mcp": {');
+    logger_1.logger.log(`        "command": "${MCP_SERVER_COMMAND}",`);
+    logger_1.logger.log('        "args": []');
+    logger_1.logger.log('      }');
+    logger_1.logger.log('    }');
+    logger_1.logger.log('  }');
+    logger_1.logger.log('');
+    logger_1.logger.log(en_1.commands.setupMcp.instructions.step3.replace('Claude', 'Cursor'));
+    logger_1.logger.log('');
+    logger_1.logger.log(en_1.commands.setupMcp.instructions.documentation);
+}
+async function handler(args) {
+    const useGlobal = args.global !== false; // Default to global unless explicitly set to false
+    if (args.showInstructions) {
+        displayInstructions(useGlobal);
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        return;
+    }
+    if (args.autoSetup) {
+        const success = await setupMcpServer(useGlobal);
+        process.exit(success ? exitCodes_1.EXIT_CODES.SUCCESS : exitCodes_1.EXIT_CODES.ERROR);
+        return;
+    }
+    // Interactive mode - determine scope first if not specified
+    let isGlobal = useGlobal;
+    if (args.global === undefined) {
+        const { scope } = await (0, promptUtils_1.promptUser)([
+            {
+                type: 'list',
+                name: 'scope',
+                message: en_1.commands.setupMcp.prompts.selectScope,
+                choices: [
+                    {
+                        name: en_1.commands.setupMcp.choices.global,
+                        value: 'global',
+                    },
+                    {
+                        name: en_1.commands.setupMcp.choices.project,
+                        value: 'project',
+                    },
+                ],
+            },
+        ]);
+        isGlobal = scope === 'global';
+    }
+    // Then ask what action to take
+    const { action } = await (0, promptUtils_1.promptUser)([
+        {
+            type: 'list',
+            name: 'action',
+            message: en_1.commands.setupMcp.prompts.selectAction,
+            choices: [
+                {
+                    name: en_1.commands.setupMcp.choices.autoSetup,
+                    value: 'auto',
+                },
+                {
+                    name: en_1.commands.setupMcp.choices.showInstructions,
+                    value: 'instructions',
+                },
+            ],
+        },
+    ]);
+    if (action === 'auto') {
+        const success = await setupMcpServer(isGlobal);
+        process.exit(success ? exitCodes_1.EXIT_CODES.SUCCESS : exitCodes_1.EXIT_CODES.ERROR);
+    }
+    else {
+        displayInstructions(isGlobal);
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+}
+function setupMcpBuilder(yargs) {
+    yargs
+        .options({
+        'auto-setup': {
+            describe: en_1.commands.setupMcp.options.autoSetup.describe,
+            type: 'boolean',
+            default: false,
+        },
+        'show-instructions': {
+            describe: en_1.commands.setupMcp.options.showInstructions.describe,
+            type: 'boolean',
+            default: false,
+        },
+        global: {
+            describe: en_1.commands.setupMcp.options.global.describe,
+            type: 'boolean',
+        },
+    })
+        .example([
+        ['$0 setup-mcp', en_1.commands.setupMcp.examples.default],
+        ['$0 setup-mcp --auto-setup', en_1.commands.setupMcp.examples.autoSetup],
+        [
+            '$0 setup-mcp --auto-setup --global',
+            en_1.commands.setupMcp.examples.autoSetupGlobal,
+        ],
+        [
+            '$0 setup-mcp --auto-setup --no-global',
+            en_1.commands.setupMcp.examples.autoSetupProject,
+        ],
+        [
+            '$0 setup-mcp --show-instructions',
+            en_1.commands.setupMcp.examples.showInstructions,
+        ],
+    ]);
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(setupMcpBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const setupMcpCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = setupMcpCommand;
+// Legacy export for compatibility
+module.exports = setupMcpCommand;

package/commands/theme/generate-selectors.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs } from '../../types/Yargs';
-export declare const command = "generate-selectors <path>";
-export declare const describe: string;
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
 type ThemeSelectorArgs = CommonArgs & {
     path: string;
 };
-export declare function handler(args: ArgumentsCamelCase<ThemeSelectorArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ThemeSelectorArgs>;
-export {};
+declare const themeSelectorsCommand: YargsCommandModule<unknown, ThemeSelectorArgs>;
+export default themeSelectorsCommand;

package/commands/theme/generate-selectors.js

@@ -3,14 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const fs_1 = __importDefault(require("fs"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const lang_1 = require("../../lib/lang");
 const generateSelectors_1 = require("../../lib/generateSelectors");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
+const yargsUtils_1 = require("../../lib/yargsUtils");
 const HUBL_EXPRESSION_REGEX = new RegExp(/{%\s*(.*)\s*%}/, 'g');
 const HUBL_VARIABLE_NAME_REGEX = new RegExp(/{%\s*set\s*(\w*)/, 'i');
 const HUBL_STATEMENT_REGEX = new RegExp(/{{\s*[\w.(,\d\-\s)|/~]*.*}}/, 'g');
@@ -20,8 +18,8 @@ const CSS_VARS_NAME_REGEX = new RegExp(/(--[\w.(,\d\-)]*)/, 'g');
 const CSS_SELECTORS_REGEX = new RegExp(/([\s\w:.,\0-[\]]*){/, 'i');
 const CSS_EXPRESSION_REGEX = new RegExp(/(?!\s)([^}])*(?![.#\s,>])[^}]*}/, 'g');
 const THEME_PATH_REGEX = new RegExp(/=\s*.*(theme\.(\w|\.)*)/, 'i');
-exports.command = 'generate-selectors <path>';
-exports.describe = (0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.describe');
+const command = 'generate-selectors <path>';
+const describe = (0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.describe');
 async function handler(args) {
     const { path } = args;
     const fieldsJsonPath = (0, generateSelectors_1.findFieldsJsonPath)(path);
@@ -158,7 +156,7 @@ async function handler(args) {
         selectorsPath,
     }));
 }
-function builder(yargs) {
+function themeSelectorBuilder(yargs) {
     yargs.positional('path', {
         describe: (0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.positionals.path.describe'),
         type: 'string',
@@ -166,3 +164,13 @@ function builder(yargs) {
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(themeSelectorBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const themeSelectorsCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = themeSelectorsCommand;

package/commands/theme/marketplace-validate.d.ts

@@ -1,11 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "marketplace-validate <path>";
-export declare const describe: string;
-type CombinedArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
-type ThemeValidateArgs = CombinedArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type ThemeValidateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     path: string;
 };
-export declare function handler(args: ArgumentsCamelCase<ThemeValidateArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ThemeValidateArgs>;
-export {};
+declare const themeValidateCommand: YargsCommandModule<unknown, ThemeValidateArgs>;
+export default themeValidateCommand;