@hubspot/cli 8.2.0-beta.0 → 8.2.0-experimental.1

package/commands/account/list.js

@@ -1,94 +1,50 @@
-import { getConfigFilePath, getAllConfigAccounts, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
+import { getConfigFilePath, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { getDefaultAccountOverrideFilePath } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
+import { getHsSettingsFileIfExists, getHsSettingsFilePath, } from '@hubspot/local-dev-lib/config/hsSettings';
+import { getCwd } from '@hubspot/local-dev-lib/path';
 import { indent } from '../../lib/ui/index.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { isSandbox, isDeveloperTestAccount } from '../../lib/accountTypes.js';
-import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
-import { renderTable } from '../../ui/render.js';
+import { renderAccountTable } from '../../lib/ui/accountTable.js';
+import { renderLinkedAccountsTable } from '../../lib/link/renderLinkedAccountsTable.js';
+import { isDirectoryLinked } from '../../lib/link/linkUtils.js';
 const command = ['list', 'ls'];
 const describe = commands.account.subcommands.list.describe;
-function sortAndMapAccounts(accounts) {
-    const mappedAccountData = {};
-    // Standard and app developer accounts
-    accounts
-        .filter(p => p.accountType &&
-        (p.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD ||
-            p.accountType === HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER))
-        .forEach(account => {
-        mappedAccountData[account.accountId] = [account];
-    });
-    // Non-standard accounts (sandbox, developer test account)
-    accounts
-        .filter(p => p.accountType && (isSandbox(p) || isDeveloperTestAccount(p)))
-        .forEach(p => {
-        if (p.parentAccountId) {
-            mappedAccountData[p.parentAccountId] = [
-                ...(mappedAccountData[p.parentAccountId] || []),
-                p,
-            ];
-        }
-        else {
-            mappedAccountData[p.accountId] = [p];
-        }
-    });
-    return mappedAccountData;
-}
-function getAccountData(mappedAccountData) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const accountData = [];
-    Object.entries(mappedAccountData).forEach(([key, set]) => {
-        const hasParentAccount = set.filter(p => p.accountId === parseInt(key, 10))[0];
-        set.forEach(account => {
-            let name = `${account.name} [${HUBSPOT_ACCOUNT_TYPE_STRINGS[account.accountType]}]`;
-            if (isSandbox(account)) {
-                if (hasParentAccount && set.length > 1) {
-                    name = `↳ ${name}`;
-                }
-            }
-            else if (isDeveloperTestAccount(account)) {
-                if (hasParentAccount && set.length > 1) {
-                    name = `↳ ${name}`;
-                }
-            }
-            accountData.push([name, account.accountId, account.authType]);
-        });
-    });
-    return accountData;
-}
-async function handler(args) {
-    const { derivedAccountId } = args;
-    trackCommandUsage('accounts-list', undefined, derivedAccountId);
+async function handler() {
     const configPath = getConfigFilePath();
-    const accountsList = getAllConfigAccounts();
-    const mappedAccountData = sortAndMapAccounts(accountsList);
-    const accountData = getAccountData(mappedAccountData);
-    const tableHeader = [
-        commands.account.subcommands.list.labels.name,
-        commands.account.subcommands.list.labels.accountId,
-        commands.account.subcommands.list.labels.authType,
-    ];
     const defaultAccount = getConfigDefaultAccountIfExists();
     const accountId = defaultAccount?.accountId;
     const overrideFilePath = getDefaultAccountOverrideFilePath();
-    // If a default account is present in the config, display it
-    if (configPath && accountId) {
-        uiLogger.log(commands.account.subcommands.list.defaultAccountTitle);
-        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.configPath(configPath)}`);
-        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.currentResolvedDefaultAccount(accountId)}`);
+    const hsSettings = getHsSettingsFileIfExists();
+    const hsSettingsPath = getHsSettingsFilePath();
+    const isLinked = isDirectoryLinked(hsSettings);
+    if (isLinked && hsSettingsPath) {
+        uiLogger.log(commands.account.subcommands.list.linkedDefaultTitle);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.directory(getCwd())}`);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.configPath(hsSettingsPath)}`);
+        if (hsSettings.localDefaultAccount) {
+            uiLogger.log(`${indent(1)}${commands.account.subcommands.list.currentResolvedDefaultAccount(hsSettings.localDefaultAccount)}`);
+        }
+        uiLogger.log('');
+        uiLogger.log(commands.account.subcommands.list.linkedAccounts);
+        await renderLinkedAccountsTable(hsSettings);
         uiLogger.log('');
     }
-    // If a default account override is present, display it
-    if (overrideFilePath && accountId) {
-        uiLogger.log(commands.account.subcommands.list.overrideFilePathTitle);
-        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.overrideFilePath(overrideFilePath)}`);
+    if (!isLinked && configPath && accountId) {
+        uiLogger.log(commands.account.subcommands.list.defaultAccountTitle);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.list.configPath(configPath)}`);
         uiLogger.log(`${indent(1)}${commands.account.subcommands.list.currentResolvedDefaultAccount(accountId)}`);
         uiLogger.log('');
+        if (overrideFilePath) {
+            uiLogger.log(commands.account.subcommands.list.overrideFilePathTitle);
+            uiLogger.log(`${indent(1)}${commands.account.subcommands.list.overrideFilePath(overrideFilePath)}`);
+            uiLogger.log(`${indent(1)}${commands.account.subcommands.list.currentResolvedDefaultAccount(accountId)}`);
+            uiLogger.log('');
+        }
     }
-    uiLogger.log(commands.account.subcommands.list.accounts);
-    renderTable(tableHeader, accountData, true);
+    renderAccountTable(isLinked);
 }
 function accountListBuilder(yargs) {
     yargs.example([['$0 accounts list']]);
@@ -101,7 +57,7 @@ const builder = makeYargsBuilder(accountListBuilder, command, describe, {
 const accountListCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('accounts-list', handler),
     builder,
 };
 export default accountListCommand;

package/commands/account/remove.js

@@ -1,16 +1,18 @@
 import fs from 'fs';
 import { getConfigFilePath, removeAccountFromConfig, getConfigDefaultAccountIfExists, getConfigAccountIfExists, getConfigAccountById, setConfigAccountAsDefault, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
 import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
+import { warnIfLinkedDirectory } from '../../lib/link/warnIfLinkedDirectory.js';
 const command = 'remove [account]';
 const describe = commands.account.subcommands.remove.describe;
 async function handler(args) {
+    warnIfLinkedDirectory(args._);
     const { account: accountFlag } = args;
     let accountToRemoveConfig = accountFlag
         ? getConfigAccountIfExists(accountFlag)
@@ -23,7 +25,6 @@ async function handler(args) {
         accountToRemoveId = await selectAccountFromConfig(commands.account.subcommands.remove.prompts.selectAccountToRemove);
     }
     accountToRemoveConfig = getConfigAccountById(accountToRemoveId);
-    trackCommandUsage('accounts-remove', undefined, accountToRemoveId);
     const currentDefaultAccount = getConfigDefaultAccountIfExists();
     const accounts = getAllConfigAccounts();
     const accountOverride = getDefaultAccountOverrideAccountId(accounts);
@@ -81,7 +82,7 @@ const builder = makeYargsBuilder(accountRemoveBuilder, command, describe, {
 const accountRemoveCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('accounts-remove', handler),
     builder,
 };
 export default accountRemoveCommand;

package/commands/account/removeOverride.js

@@ -3,27 +3,28 @@ import { globalConfigFileExists, getAllConfigAccounts, } from '@hubspot/local-de
 import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME } from '@hubspot/local-dev-lib/constants/config';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { commands } from '../../lang/en.js';
+import { warnIfLinkedDirectory } from '../../lib/link/warnIfLinkedDirectory.js';
 const command = 'remove-override';
 const describe = commands.account.subcommands.removeOverride.describe(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
 async function handler(args) {
-    const { force } = args;
+    const { force, exit } = args;
+    // TODO: Block this command when linked directory exists (next breaking change)
+    warnIfLinkedDirectory(args._);
     const globalConfigExists = globalConfigFileExists();
     if (!globalConfigExists) {
         uiLogger.error(commands.account.subcommands.removeOverride.errors.globalConfigNotFound);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const accounts = getAllConfigAccounts();
     const accountOverride = getDefaultAccountOverrideAccountId(accounts);
     const overrideFilePath = getDefaultAccountOverrideFilePath();
     if (accountOverride && overrideFilePath) {
-        const accountId = accountOverride;
-        trackCommandUsage('account-removeOverride', undefined, accountId);
         if (!force) {
             uiLogger.log(commands.account.subcommands.removeOverride.accountOverride(overrideFilePath, accountOverride.toString()));
             const { deleteOverrideFile } = await promptUser({
@@ -34,22 +35,22 @@ async function handler(args) {
             });
             uiLogger.log('');
             if (!deleteOverrideFile) {
-                process.exit(EXIT_CODES.SUCCESS);
+                return exit(EXIT_CODES.SUCCESS);
             }
         }
         try {
             fs.unlinkSync(overrideFilePath);
             uiLogger.success(commands.account.subcommands.removeOverride.success);
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
         catch (error) {
             logError(error);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     else {
         uiLogger.log(commands.account.subcommands.removeOverride.noOverrideFile);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
 }
 function accountRemoveOverrideBuilder(yargs) {
@@ -65,7 +66,7 @@ const builder = makeYargsBuilder(accountRemoveOverrideBuilder, command, describe
 const accountRemoveOverrideCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('account-removeOverride', handler),
     builder,
 };
 export default accountRemoveOverrideCommand;

package/commands/account/rename.js

@@ -1,7 +1,7 @@
 import { renameConfigAccount } from '@hubspot/local-dev-lib/config';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
@@ -9,8 +9,7 @@ import { toKebabCase } from '@hubspot/local-dev-lib/text';
 const command = 'rename <account-name> <new-name>';
 const describe = commands.account.subcommands.rename.describe;
 async function handler(args) {
-    const { accountName, newName, derivedAccountId } = args;
-    trackCommandUsage('accounts-rename', undefined, derivedAccountId);
+    const { accountName, newName, exit } = args;
     const newNameKebabCase = toKebabCase(newName);
     const nameWasSanitized = newNameKebabCase !== newName;
     try {
@@ -18,10 +17,10 @@ async function handler(args) {
     }
     catch (error) {
         logError(error);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     uiLogger.success(commands.account.subcommands.rename.success.renamed(accountName, newNameKebabCase, nameWasSanitized));
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function accountRenameBuilder(yargs) {
     yargs.positional('account-name', {
@@ -45,7 +44,7 @@ const builder = makeYargsBuilder(accountRenameBuilder, command, describe, {
 const accountRenameCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('accounts-rename', handler),
     builder,
 };
 export default accountRenameCommand;

package/commands/account/unlink.d.ts

@@ -0,0 +1,4 @@
+import { YargsCommandModule } from '../../types/Yargs.js';
+import { LinkArgs } from '../../types/Link.js';
+declare const unlinkCommand: YargsCommandModule<unknown, LinkArgs>;
+export default unlinkCommand;

package/commands/account/unlink.js

@@ -0,0 +1,68 @@
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { getAllConfigAccounts } from '@hubspot/local-dev-lib/config';
+import { getCwd } from '@hubspot/local-dev-lib/path';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { getHsSettingsFileIfExists, getHsSettingsFilePath, } from '@hubspot/local-dev-lib/config/hsSettings';
+import { ACTION_RESULT_STATUS } from '../../types/Link.js';
+import { ActionHandlers } from '../../lib/link/index.js';
+import { hasDeprecatedConfigConflict, isDirectoryLinked, writeLinkedSettings, } from '../../lib/link/linkUtils.js';
+import { commands } from '../../lang/en.js';
+import { DEFAULT_HS_SETTINGS_PATH } from '@hubspot/local-dev-lib/constants/config';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+const command = 'unlink';
+const describe = commands.account.subcommands.unlink.describe;
+async function handler(args) {
+    const { exit } = args;
+    if (hasDeprecatedConfigConflict(args._)) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const existingSettings = getHsSettingsFileIfExists();
+    if (!isDirectoryLinked(existingSettings)) {
+        const globalAccounts = getAllConfigAccounts();
+        uiLogger.log(commands.account.subcommands.link.shared.noLinkedAccounts);
+        uiLogger.log(commands.account.subcommands.link.shared.globalAccountsAvailable(globalAccounts.length));
+        uiLogger.log('');
+        uiLogger.log(commands.account.subcommands.link.shared.configurePrompt);
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    uiLogger.log(commands.account.subcommands.link.managingLinkedAccounts(getCwd()));
+    uiLogger.log('');
+    const result = await ActionHandlers.unlink({
+        state: existingSettings,
+        context: {
+            globalAccountsList: getAllConfigAccounts(),
+            globalDefaultAccount: undefined,
+            accountOverrideId: null,
+        },
+        args,
+    });
+    if (result.status === ACTION_RESULT_STATUS.ERROR) {
+        uiLogger.error(result.reason);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (result.status === ACTION_RESULT_STATUS.NOOP) {
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    const settingsPath = getHsSettingsFilePath() || DEFAULT_HS_SETTINGS_PATH;
+    if (!writeLinkedSettings(result.settings, settingsPath)) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    uiLogger.success(commands.account.subcommands.link.shared.savedToSettings(settingsPath));
+    return exit(EXIT_CODES.SUCCESS);
+}
+function unlinkBuilder(yargs) {
+    yargs.example([['$0 account unlink']]);
+    return yargs;
+}
+const builder = makeYargsBuilder(unlinkBuilder, command, commands.account.subcommands.unlink.verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const unlinkCommand = {
+    command,
+    describe,
+    handler: makeWrappedYargsHandler('account-unlink', handler),
+    builder,
+};
+export default unlinkCommand;

package/commands/account/use.js

@@ -1,16 +1,79 @@
 import { getConfigFilePath, setConfigAccountAsDefault, getConfigAccountIfExists, getConfigAccountByName, getConfigAccountById, globalConfigFileExists, getAllConfigAccounts, } from '@hubspot/local-dev-lib/config';
 import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
+import { getHsSettingsFileIfExists, getHsSettingsFilePath, writeHsSettingsFile, } from '@hubspot/local-dev-lib/config/hsSettings';
+import { getCwd } from '@hubspot/local-dev-lib/path';
 import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { selectAccountFromConfig, AUTHENTICATE_NEW_ACCOUNT_VALUE, } from '../../lib/prompts/accountsPrompt.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { authenticateNewAccount } from '../../lib/accountAuth.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { confirmPrompt } from '../../lib/prompts/promptUtils.js';
+import { handleLinkedUseAction } from '../../lib/link/index.js';
+import { isDirectoryLinked } from '../../lib/link/linkUtils.js';
+import { ACTION_RESULT_STATUS } from '../../types/Link.js';
+import { DEFAULT_HS_SETTINGS_PATH } from '@hubspot/local-dev-lib/constants/config';
 const command = 'use [account]';
 const describe = commands.account.subcommands.use.describe;
-async function handler(args) {
+async function handleLinkedUse(args, hsSettings) {
+    const { exit } = args;
+    uiLogger.log(commands.account.subcommands.use.linked.editingLinkedDefault(getCwd()));
+    uiLogger.log('');
+    if (!args.account && hsSettings.accounts.length === 1) {
+        uiLogger.log(commands.account.subcommands.use.linked.alreadyDefault(hsSettings.accounts[0]));
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    let targetAccountId;
+    if (args.account) {
+        const account = getConfigAccountIfExists(args.account);
+        if (!account) {
+            uiLogger.error(commands.account.subcommands.use.errors.accountNotFound(args.account, getConfigFilePath()));
+            return exit(EXIT_CODES.ERROR);
+        }
+        if (!hsSettings.accounts.includes(account.accountId)) {
+            if (!process.stdin.isTTY) {
+                uiLogger.log(commands.account.subcommands.use.linked.nonInteractiveNotLinked(account.name));
+                setConfigAccountAsDefault(String(args.account));
+                uiLogger.success(commands.account.subcommands.use.success.defaultAccountUpdated(account.name));
+                return exit(EXIT_CODES.SUCCESS);
+            }
+            uiLogger.log(commands.account.subcommands.use.linked.accountNotLinked(account.name));
+            const shouldLink = await confirmPrompt(commands.account.subcommands.use.linked.promptToLink(account.name));
+            if (!shouldLink) {
+                uiLogger.log(commands.account.subcommands.use.linked.settingGlobalDefault);
+                setConfigAccountAsDefault(String(args.account));
+                uiLogger.success(commands.account.subcommands.use.success.defaultAccountUpdated(account.name));
+                return exit(EXIT_CODES.SUCCESS);
+            }
+        }
+        targetAccountId = account.accountId;
+    }
+    const result = await handleLinkedUseAction({
+        state: hsSettings,
+        targetAccountId,
+    });
+    if (result.status === ACTION_RESULT_STATUS.ERROR) {
+        uiLogger.error(result.reason);
+        return exit(EXIT_CODES.ERROR);
+    }
+    if (result.status === ACTION_RESULT_STATUS.NOOP) {
+        return exit(EXIT_CODES.SUCCESS);
+    }
+    const settingsPath = getHsSettingsFilePath() || DEFAULT_HS_SETTINGS_PATH;
+    try {
+        writeHsSettingsFile(result.settings);
+    }
+    catch (err) {
+        uiLogger.error(commands.account.subcommands.link.shared.writeSettingsFailed(settingsPath, err));
+        return exit(EXIT_CODES.ERROR);
+    }
+    uiLogger.success(commands.account.subcommands.link.shared.savedToSettings(settingsPath));
+    return exit(EXIT_CODES.SUCCESS);
+}
+async function handleGlobalUse(args) {
+    const { exit } = args;
     let newDefaultAccount = args.account;
     const usingGlobalConfig = globalConfigFileExists();
     if (!newDefaultAccount) {
@@ -29,9 +92,8 @@ async function handler(args) {
             setAsDefaultAccount: true,
         });
         if (!updatedConfig) {
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
-        trackCommandUsage('accounts-use', undefined, updatedConfig.accountId);
         return;
     }
     let account;
@@ -41,7 +103,6 @@ async function handler(args) {
     else {
         account = getConfigAccountByName(String(newDefaultAccount));
     }
-    trackCommandUsage('accounts-use', undefined, account?.accountId);
     const accounts = getAllConfigAccounts();
     const accountOverride = getDefaultAccountOverrideAccountId(accounts);
     const overrideFilePath = getDefaultAccountOverrideFilePath();
@@ -53,6 +114,14 @@ async function handler(args) {
     setConfigAccountAsDefault(String(newDefaultAccount));
     return uiLogger.success(commands.account.subcommands.use.success.defaultAccountUpdated(account.name));
 }
+async function handler(args) {
+    const hsSettings = getHsSettingsFileIfExists();
+    const isLinked = isDirectoryLinked(hsSettings);
+    if (isLinked) {
+        return handleLinkedUse(args, hsSettings);
+    }
+    return handleGlobalUse(args);
+}
 function accountUseBuilder(yargs) {
     yargs.positional('account', {
         describe: commands.account.subcommands.use.options.account.describe,
@@ -77,7 +146,7 @@ const builder = makeYargsBuilder(accountUseBuilder, command, describe, {
 const accountUseCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('accounts-use', handler),
     builder,
 };
 export default accountUseCommand;

package/commands/account.js

@@ -8,12 +8,16 @@ import remove from './account/remove.js';
 import clean from './account/clean.js';
 import createOverride from './account/createOverride.js';
 import removeOverride from './account/removeOverride.js';
+import link from './account/link.js';
+import unlink from './account/unlink.js';
 import { makeYargsBuilder } from '../lib/yargsUtils.js';
 const command = ['account', 'accounts'];
 const describe = commands.account.describe;
 function accountBuilder(yargs) {
     yargs
         .command(auth)
+        .command(link)
+        .command(unlink)
         .command(list)
         .command(rename)
         .command(use)

package/commands/api.d.ts

@@ -0,0 +1,10 @@
+import { CommonArgs, ConfigArgs, EnvironmentArgs, AccountArgs, JSONOutputArgs, YargsCommandModule } from '../types/Yargs.js';
+declare const HTTP_METHODS: readonly ["GET", "POST", "PUT", "PATCH", "DELETE"];
+type HttpMethod = (typeof HTTP_METHODS)[number];
+export type ApiArgs = CommonArgs & ConfigArgs & EnvironmentArgs & AccountArgs & JSONOutputArgs & {
+    endpoint: string;
+    method?: HttpMethod;
+    data?: string;
+};
+declare const apiCommand: YargsCommandModule<unknown, ApiArgs>;
+export default apiCommand;