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

package/bin/cli.js

@@ -7,7 +7,7 @@ const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { trackHelpUsage, trackConvertFieldsUsage, } = require('../lib/usageTracking');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { loadConfigMiddleware, injectAccountIdMiddleware, validateAccountOptions, handleDeprecatedEnvVariables, } = require('../lib/middleware/configMiddleware');
-const { notifyAboutUpdates, } = require('../lib/middleware/notificationsMiddleware');
+const { autoUpdateCLI } = require('../lib/middleware/autoUpdateMiddleware');
 const { checkAndWarnGitInclusionMiddleware, } = require('../lib/middleware/gitMiddleware');
 const { performChecks } = require('../lib/middleware/yargsChecksMiddleware');
 const { setRequestHeaders } = require('../lib/middleware/requestMiddleware');
@@ -40,7 +40,7 @@ const feedbackCommand = require('../commands/feedback');
 const doctorCommand = require('../commands/doctor');
 const completionCommand = require('../commands/completion');
 const appCommand = require('../commands/app');
-notifyAboutUpdates();
+const setupMcpCommand = require('../commands/setupMcp');
 const getTerminalWidth = () => {
     const width = yargs.terminalWidth();
     if (width >= 100)
@@ -71,6 +71,7 @@ const argv = yargs
     handleDeprecatedEnvVariables,
     loadConfigMiddleware,
     injectAccountIdMiddleware,
+    autoUpdateCLI,
     checkAndWarnGitInclusionMiddleware,
     validateAccountOptions,
     checkFireAlarms,
@@ -105,10 +106,7 @@ const argv = yargs
     .command(secretCommands)
     .command(customObjectCommand)
     .command(functionCommands)
-    .command({
-    ...listCommand,
-    aliases: 'ls',
-})
+    .command(listCommand)
     .command(openCommand)
     .command(mvCommand)
     .command(projectCommands)
@@ -121,6 +119,7 @@ const argv = yargs
     .command(doctorCommand)
     .command(completionCommand)
     .command(appCommand)
+    .command(setupMcpCommand)
     .help()
     .alias('h', 'help')
     .recommendCommands()

package/bin/hsmcp.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/bin/hsmcp.js

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+"use strict";
+console.log('Starting MCP server...');
+try {
+    require('../mcp-server/index');
+}
+catch (error) {
+    console.error('Failed to start MCP server:');
+    console.error('Error name:', error.name || 'Unknown');
+    console.error('Error message:', error.message || 'No message');
+    console.error('Full error:', error);
+    process.exit(1);
+}

package/commands/account/auth.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const describe: string;
-export declare const command = "auth";
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountAuthArgs = CommonArgs & ConfigArgs & {
     disableTracking?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<AccountAuthArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountAuthArgs>;
-export {};
+declare const accountAuthCommand: YargsCommandModule<unknown, AccountAuthArgs>;
+export default accountAuthCommand;

package/commands/account/auth.js

@@ -1,8 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = exports.describe = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const config_1 = require("@hubspot/local-dev-lib/config");
 const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
@@ -11,7 +8,7 @@ const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
 const text_1 = require("@hubspot/local-dev-lib/text");
 const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
-const commonOpts_1 = require("../../lib/commonOpts");
+const config_2 = require("@hubspot/local-dev-lib/constants/config");
 const configMigrate_1 = require("../../lib/configMigrate");
 const process_1 = require("../../lib/process");
 const index_1 = require("../../lib/errorHandlers/index");
@@ -24,6 +21,7 @@ const index_2 = require("../../lib/errorHandlers/index");
 const usageTracking_2 = require("../../lib/usageTracking");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_1 = require("../../lib/ui");
+const yargsUtils_1 = require("../../lib/yargsUtils");
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -155,8 +153,8 @@ async function handleConfigUpdate(env, configAlreadyExists, disableTracking, aut
     }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-exports.describe = (0, lang_1.i18n)('commands.account.subcommands.auth.describe');
-exports.command = 'auth';
+const describe = (0, lang_1.i18n)('commands.account.subcommands.auth.describe');
+const command = 'auth';
 async function handler(args) {
     const { providedAccountId, disableTracking } = args;
     const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
@@ -169,7 +167,7 @@ async function handler(args) {
     const configAlreadyExists = (0, migrate_1.configFileExists)(true);
     await handleConfigUpdate(env, configAlreadyExists, disableTracking, authType, providedAccountId);
 }
-function builder(yargs) {
+function accountAuthBuilder(yargs) {
     yargs.options({
         account: {
             describe: (0, lang_1.i18n)('commands.account.subcommands.auth.options.account.describe'),
@@ -182,7 +180,19 @@ function builder(yargs) {
             default: false,
         },
     });
-    (0, commonOpts_1.addTestingOptions)(yargs);
-    (0, commonOpts_1.addGlobalOptions)(yargs);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountAuthBuilder, command, (0, lang_1.i18n)('commands.account.subcommands.auth.verboseDescribe', {
+    authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
+    globalConfigPath: config_2.GLOBAL_CONFIG_PATH,
+}), {
+    useGlobalOptions: true,
+    useTestingOptions: true,
+});
+const accountAuthCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountAuthCommand;

package/commands/account/clean.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const command = "clean";
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountCleanArgs = CommonArgs & ConfigArgs & {
     qa?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<AccountCleanArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountCleanArgs>;
-export {};
+declare const accountCleanCommand: YargsCommandModule<unknown, AccountCleanArgs>;
+export default accountCleanCommand;

package/commands/account/clean.js

@@ -3,9 +3,6 @@ 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 personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
@@ -16,15 +13,15 @@ const config_2 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const commonOpts_1 = require("../../lib/commonOpts");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const table_1 = require("../../lib/ui/table");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const ui_1 = require("../../lib/ui");
 const errorHandlers_1 = require("../../lib/errorHandlers");
-exports.command = 'clean';
-exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.clean.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'clean';
+const describe = (0, lang_1.i18n)(`commands.account.subcommands.clean.describe`);
 async function handler(args) {
     const { qa } = args;
     (0, usageTracking_1.trackCommandUsage)('accounts-clean');
@@ -131,9 +128,19 @@ async function handler(args) {
     logger_1.logger.log('');
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addTestingOptions)(yargs);
+function accountCleanBuilder(yargs) {
     yargs.example([['$0 accounts clean']]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountCleanBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useTestingOptions: true,
+});
+const accountCleanCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountCleanCommand;

package/commands/account/createOverride.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs } from '../../types/Yargs';
-export declare const describe: string;
-export declare const command = "create-override [account]";
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountCreateOverrideArgs = CommonArgs & {
     account: string | number;
 };
-export declare function handler(args: ArgumentsCamelCase<AccountCreateOverrideArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountCreateOverrideArgs>;
-export {};
+declare const accountCreateOverrideCommand: YargsCommandModule<unknown, AccountCreateOverrideArgs>;
+export default accountCreateOverrideCommand;

package/commands/account/createOverride.js

@@ -3,27 +3,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = exports.describe = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const path_2 = require("@hubspot/local-dev-lib/path");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const config_2 = require("@hubspot/local-dev-lib/config");
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
 const lang_1 = require("../../lib/lang");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const usageTracking_1 = require("../../lib/usageTracking");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
 const index_1 = require("../../lib/errorHandlers/index");
-exports.describe = (0, lang_1.i18n)('commands.account.subcommands.createOverride.describe', {
+const ui_1 = require("../../lib/ui");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'create-override [account]';
+const describe = (0, lang_1.i18n)('commands.account.subcommands.createOverride.describe', {
     hsAccountFileName: config_1.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
 });
-exports.command = 'create-override [account]';
 async function handler(args) {
     let overrideDefaultAccount = args.account;
+    const globalConfig = (0, migrate_1.getGlobalConfig)();
+    if (!globalConfig) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.createOverride.errors.globalConfigNotFound', {
+            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const accountOverride = (0, config_2.getCWDAccountOverride)();
     const overrideFilePath = (0, config_2.getDefaultAccountOverrideFilePath)();
     if (accountOverride && overrideFilePath) {
@@ -75,7 +82,7 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
-function builder(yargs) {
+function accountCreateOverrideBuilder(yargs) {
     yargs.positional('account', {
         describe: (0, lang_1.i18n)('commands.account.subcommands.createOverride.options.account.describe'),
         type: 'string',
@@ -102,3 +109,13 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountCreateOverrideBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const accountCreateOverrideCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountCreateOverrideCommand;

package/commands/account/info.d.ts

@@ -1,8 +1,4 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const describe: string;
-export declare const command = "info [account]";
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountInfoArgs = CommonArgs & ConfigArgs;
-export declare function handler(args: ArgumentsCamelCase<AccountInfoArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<AccountInfoArgs>>;
-export {};
+declare const accountInfoCommand: YargsCommandModule<unknown, AccountInfoArgs>;
+export default accountInfoCommand;

package/commands/account/info.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.command = exports.describe = void 0;
-exports.handler = handler;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
@@ -9,8 +7,8 @@ const yargsUtils_1 = require("../../lib/yargsUtils");
 const lang_1 = require("../../lib/lang");
 const index_1 = require("../../lib/ui/index");
 const table_1 = require("../../lib/ui/table");
-exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.info.describe`);
-exports.command = 'info [account]';
+const describe = (0, lang_1.i18n)(`commands.account.subcommands.info.describe`);
+const command = 'info [account]';
 async function handler(args) {
     const { derivedAccountId } = args;
     const config = (0, config_1.getAccountConfig)(derivedAccountId);
@@ -74,4 +72,14 @@ function accountInfoBuilder(yargs) {
     ]);
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(accountInfoBuilder, exports.command, exports.describe, { useConfigOptions: true });
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountInfoBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const accountInfoCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountInfoCommand;

package/commands/account/list.d.ts

@@ -1,8 +1,4 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const command: string[];
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountListArgs = CommonArgs & ConfigArgs;
-export declare function handler(args: ArgumentsCamelCase<AccountListArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountListArgs>;
-export {};
+declare const accountListCommand: YargsCommandModule<unknown, AccountListArgs>;
+export default accountListCommand;

package/commands/account/list.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 config_1 = require("@hubspot/local-dev-lib/config");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const commonOpts_1 = require("../../lib/commonOpts");
 const index_1 = require("../../lib/ui/index");
 const table_1 = require("../../lib/ui/table");
 const usageTracking_1 = require("../../lib/usageTracking");
 const accountTypes_1 = require("../../lib/accountTypes");
 const lang_1 = require("../../lib/lang");
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
-exports.command = ['list', 'ls'];
-exports.describe = (0, lang_1.i18n)('commands.account.subcommands.list.describe');
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = ['list', 'ls'];
+const describe = (0, lang_1.i18n)('commands.account.subcommands.list.describe');
 function sortAndMapAccounts(accounts) {
     const mappedAccountData = {};
     // Standard and app developer accounts
@@ -105,8 +102,18 @@ async function handler(args) {
     logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.list.accounts`));
     logger_1.logger.log((0, table_1.getTableContents)(accountData, { border: { bodyLeft: '  ' } }));
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
+function accountListBuilder(yargs) {
     yargs.example([['$0 accounts list']]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountListBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const accountListCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountListCommand;

package/commands/account/remove.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const command = "remove [account]";
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountRemoveArgs = CommonArgs & ConfigArgs & {
     account?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<AccountRemoveArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountRemoveArgs>;
-export {};
+declare const accountRemoveCommand: YargsCommandModule<unknown, AccountRemoveArgs>;
+export default accountRemoveCommand;

package/commands/account/remove.js

@@ -3,9 +3,6 @@ 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 config_1 = require("@hubspot/local-dev-lib/config");
@@ -14,9 +11,9 @@ const lang_1 = require("../../lib/lang");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
-const commonOpts_1 = require("../../lib/commonOpts");
-exports.command = 'remove [account]';
-exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.remove.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'remove [account]';
+const describe = (0, lang_1.i18n)(`commands.account.subcommands.remove.describe`);
 async function handler(args) {
     const { account } = args;
     let accountToRemove = account;
@@ -59,15 +56,19 @@ async function handler(args) {
     }));
     // Get updated version of the config
     (0, config_1.loadConfig)((0, config_1.getConfigPath)());
-    if (accountToRemove === currentDefaultAccount) {
+    const accountToRemoveId = (0, config_1.getAccountId)(accountToRemove);
+    let defaultAccountId;
+    if (currentDefaultAccount) {
+        defaultAccountId = (0, config_1.getAccountId)(currentDefaultAccount);
+    }
+    if (accountToRemoveId === defaultAccountId) {
         logger_1.logger.log();
         logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.remove.logs.replaceDefaultAccount`));
         const newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
         (0, config_1.updateDefaultAccount)(newDefaultAccount);
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
+function accountRemoveBuilder(yargs) {
     yargs.positional('account', {
         describe: (0, lang_1.i18n)(`commands.account.subcommands.remove.options.account.describe`),
         type: 'string',
@@ -84,3 +85,14 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountRemoveBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const accountRemoveCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountRemoveCommand;

package/commands/account/removeOverride.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs } from '../../types/Yargs';
-export declare const describe: string;
-export declare const command = "remove-override";
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
 type RemoveOverrideArgs = CommonArgs & {
     force?: boolean;
 };
-export declare function handler(args: ArgumentsCamelCase<RemoveOverrideArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<RemoveOverrideArgs>;
-export {};
+declare const accountRemoveOverrideCommand: YargsCommandModule<unknown, RemoveOverrideArgs>;
+export default accountRemoveOverrideCommand;

package/commands/account/removeOverride.js

@@ -3,24 +3,31 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.command = exports.describe = void 0;
-exports.handler = handler;
-exports.builder = builder;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const config_2 = require("@hubspot/local-dev-lib/constants/config");
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
 const lang_1 = require("../../lib/lang");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
 const usageTracking_1 = require("../../lib/usageTracking");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const index_1 = require("../../lib/errorHandlers/index");
-exports.describe = (0, lang_1.i18n)('commands.account.subcommands.removeOverride.describe', {
+const ui_1 = require("../../lib/ui");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'remove-override';
+const describe = (0, lang_1.i18n)('commands.account.subcommands.removeOverride.describe', {
     overrideFile: config_2.DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME,
 });
-exports.command = 'remove-override';
 async function handler(args) {
     const { force } = args;
+    const globalConfig = (0, migrate_1.getGlobalConfig)();
+    if (!globalConfig) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.createOverride.errors.globalConfigNotFound', {
+            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const accountOverride = (0, config_1.getCWDAccountOverride)();
     const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
     if (accountOverride && overrideFilePath) {
@@ -67,10 +74,20 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
 }
-function builder(yargs) {
+function accountRemoveOverrideBuilder(yargs) {
     yargs.options('force', {
         describe: (0, lang_1.i18n)('commands.account.subcommands.removeOverride.options.force.describe'),
         type: 'boolean',
     });
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountRemoveOverrideBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const accountRemoveOverrideCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountRemoveOverrideCommand;

package/commands/account/rename.d.ts

@@ -1,11 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs } from '../../types/Yargs';
-export declare const command = "rename <account-name> <new-name>";
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountRenameArgs = CommonArgs & ConfigArgs & {
     accountName: string;
     newName: string;
 };
-export declare function handler(args: ArgumentsCamelCase<AccountRenameArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountRenameArgs>;
-export {};
+declare const accountRenameCommand: YargsCommandModule<unknown, AccountRenameArgs>;
+export default accountRenameCommand;

package/commands/account/rename.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 config_1 = require("@hubspot/local-dev-lib/config");
-const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-exports.command = 'rename <account-name> <new-name>';
-exports.describe = (0, lang_1.i18n)(`commands.account.subcommands.rename.describe`);
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'rename <account-name> <new-name>';
+const describe = (0, lang_1.i18n)(`commands.account.subcommands.rename.describe`);
 async function handler(args) {
     const { accountName, newName, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('accounts-rename', undefined, derivedAccountId);
@@ -28,9 +25,7 @@ async function handler(args) {
     }));
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
+function accountRenameBuilder(yargs) {
     yargs.positional('account-name', {
         describe: (0, lang_1.i18n)(`commands.account.subcommands.rename.positionals.accountName.describe`),
         type: 'string',
@@ -44,3 +39,15 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountRenameBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+});
+const accountRenameCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = accountRenameCommand;

package/commands/account/use.d.ts

@@ -1,10 +1,6 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs } from '../../types/Yargs';
-export declare const command = "use [account]";
-export declare const describe: string;
-interface AccountUseArgs extends CommonArgs {
+import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
+type AccountUseArgs = CommonArgs & {
     account?: string;
-}
-export declare function handler(args: ArgumentsCamelCase<AccountUseArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<AccountUseArgs>;
-export {};
+};
+declare const accountUseCommand: YargsCommandModule<unknown, AccountUseArgs>;
+export default accountUseCommand;