@hubspot/cli 8.1.0 → 8.1.2-experimental.0

package/api/migrate.js

@@ -1,4 +1,4 @@
-import { PLATFORM_VERSIONS, } from '@hubspot/local-dev-lib/constants/projects';
+import { PLATFORM_VERSIONS } from '@hubspot/project-parsing-lib/constants';
 import { http } from '@hubspot/local-dev-lib/http';
 const MIGRATIONS_API_PATH_V2 = 'dfs/migrations/v2';
 export const CLI_UNMIGRATABLE_REASONS = {
@@ -20,10 +20,14 @@ export async function listAppsForMigration(accountId, platformVersion, appId) {
     });
 }
 function mapPlatformVersionToEnum(platformVersion) {
-    if (platformVersion === PLATFORM_VERSIONS.unstable) {
-        return PLATFORM_VERSIONS.unstable.toUpperCase();
+    if (platformVersion === PLATFORM_VERSIONS.UNSTABLE) {
+        return PLATFORM_VERSIONS.UNSTABLE.toUpperCase();
     }
-    return `V${platformVersion.replace('.', '_')}`;
+    const reformattedPlatformVersion = platformVersion
+        .replaceAll('.', '_')
+        .replaceAll('-', '_')
+        .toUpperCase();
+    return `V${reformattedPlatformVersion}`;
 }
 export async function initializeAppMigration(accountId, applicationId, platformVersion) {
     return http.post(accountId, {

package/api/releases.d.ts

@@ -0,0 +1,36 @@
+import { SUBBUILD_TYPES } from '@hubspot/local-dev-lib/enums/build';
+import { HubSpotPromise, QueryParams } from '@hubspot/local-dev-lib/types/Http';
+import { ValueOf } from '@hubspot/local-dev-lib/types/Utils';
+export type Release = {
+    releaseTag: string;
+    buildId: number;
+    createdAt: string;
+    components?: Array<{
+        buildType: ValueOf<typeof SUBBUILD_TYPES>;
+        buildName?: string;
+        rootPath?: string;
+        id?: string;
+    }>;
+};
+export type FetchListReleasesResponse = {
+    results: Array<Release>;
+    paging: {
+        next: {
+            after: string;
+        };
+    };
+};
+export type AutoReleaseResponse = {
+    releaseTag: string;
+    status: string;
+    appId: number;
+};
+export type AutoReleaseStatusResponse = {
+    status: 'PENDING' | 'COMPLETE';
+    currentReleaseTag?: string;
+};
+export declare function createRelease(accountId: number, projectName: string, buildId: number): HubSpotPromise<Release>;
+export declare function listReleases(accountId: number, projectName: string, params?: QueryParams): HubSpotPromise<FetchListReleasesResponse>;
+export declare function getReleaseInfo(accountId: number, projectName: string, releaseTag: string): HubSpotPromise<Release>;
+export declare function triggerAutoRelease(accountId: number, projectId: number, buildId: number, targetPortalId: number): HubSpotPromise<AutoReleaseResponse>;
+export declare function getAutoReleaseStatus(accountId: number, projectId: number, targetPortalId: number, expectedReleaseTag: string, appId: number): HubSpotPromise<AutoReleaseStatusResponse>;

package/api/releases.js

@@ -0,0 +1,41 @@
+import { http } from '@hubspot/local-dev-lib/http';
+const PROJECTS_API_PATH = 'dfs/v1/projects';
+const PROJECTS_DEPLOY_API_PATH = 'dfs/deploy/v1';
+export function createRelease(accountId, projectName, buildId) {
+    return http.post(accountId, {
+        url: `${PROJECTS_API_PATH}/${encodeURIComponent(projectName)}/releases`,
+        data: { buildId },
+    });
+}
+export function listReleases(accountId, projectName, params = {}) {
+    return http.get(accountId, {
+        url: `${PROJECTS_API_PATH}/${encodeURIComponent(projectName)}/releases`,
+        params,
+    });
+}
+export function getReleaseInfo(accountId, projectName, releaseTag) {
+    return http.get(accountId, {
+        url: `${PROJECTS_API_PATH}/${encodeURIComponent(projectName)}/releases/${encodeURIComponent(releaseTag)}`,
+    });
+}
+export function triggerAutoRelease(accountId, projectId, buildId, targetPortalId) {
+    return http.post(accountId, {
+        url: `${PROJECTS_DEPLOY_API_PATH}/auto-release`,
+        data: {
+            projectId,
+            buildId,
+            targetPortalId,
+        },
+    });
+}
+export function getAutoReleaseStatus(accountId, projectId, targetPortalId, expectedReleaseTag, appId) {
+    return http.get(accountId, {
+        url: `${PROJECTS_DEPLOY_API_PATH}/auto-release/status`,
+        params: {
+            projectId,
+            targetPortalId,
+            expectedReleaseTag,
+            appId,
+        },
+    });
+}

package/bin/cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import yargs from 'yargs';
-import { logError } from '../lib/errorHandlers/index.js';
+import { logError, debugError } from '../lib/errorHandlers/index.js';
 import { setCLILogLevel, getCommandName } from '../lib/commonOpts.js';
 import { trackHelpUsage, trackConvertFieldsUsage, } from '../lib/usageTracking.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
@@ -31,9 +31,12 @@ import testAccountCommands from '../commands/testAccount.js';
 import getStartedCommand from '../commands/getStarted.js';
 import mcpCommand from '../commands/mcp.js';
 import upgradeCommand from '../commands/upgrade.js';
+import apiCommand from '../commands/api.js';
 import { uiLogger } from '../lib/ui/logger.js';
 import { initializeSpinniesManager } from '../lib/middleware/spinniesMiddleware.js';
 import { addCommandSuggestions } from '../lib/commandSuggestion.js';
+import { pkg } from '../lib/jsonLoader.js';
+import { parseYargsOrExit } from '../lib/yargs/parseYargsOrExit.js';
 function getTerminalWidth() {
     const width = yargs().terminalWidth();
     if (width >= 100)
@@ -72,7 +75,6 @@ const argv = yargs(process.argv.slice(2))
     initializeSpinniesManager,
 ])
     .exitProcess(false)
-    .fail(handleFailure)
     .option('noHyperlinks', {
     default: false,
     describe: 'prevent hyperlinks from displaying in the ui',
@@ -111,26 +113,30 @@ const argv = yargs(process.argv.slice(2))
     .command(hubdbCommand)
     .command(filemanagerCommand)
     // Misc commands
+    .command(apiCommand)
     .command(customObjectCommand)
     .command(completionCommand)
     .command(doctorCommand)
     .command(mcpCommand)
     .command(upgradeCommand);
-const argvWithSuggestions = addCommandSuggestions(argv)
+const parser = addCommandSuggestions(argv)
     .help()
     .alias('h', 'help')
+    .version(pkg.version)
+    .alias('v', 'version')
     .recommendCommands()
     .demandCommand(1, '')
     .wrap(getTerminalWidth())
-    .strict().argv;
+    .strict();
+const argvWithSuggestions = await parseYargsOrExit(parser, handleFailure);
 if ('help' in argvWithSuggestions && argvWithSuggestions.help !== undefined) {
     (async () => {
         await trackHelpUsage(getCommandName(argvWithSuggestions));
-    })();
+    })().catch(debugError);
 }
 if ('convertFields' in argvWithSuggestions &&
     argvWithSuggestions.convertFields !== undefined) {
     (async () => {
         await trackConvertFieldsUsage(getCommandName(argvWithSuggestions));
-    })();
+    })().catch(debugError);
 }

package/commands/account/auth.js

@@ -2,10 +2,11 @@ import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { PERSONAL_ACCESS_KEY_AUTH_METHOD } from '@hubspot/local-dev-lib/constants/auth';
 import { deleteConfigFileIfEmpty } from '@hubspot/local-dev-lib/config';
 import { handleExit } from '../../lib/process.js';
-import { trackCommandUsage, trackAuthAction } from '../../lib/usageTracking.js';
+import { trackAuthAction } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { uiFeatureHighlight } from '../../lib/ui/index.js';
 import { parseStringToNumber } from '../../lib/parsing.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -19,7 +20,7 @@ const authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
 const describe = commands.account.subcommands.auth.describe;
 const command = 'auth';
 async function handler(args) {
-    const { disableTracking, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, } = args;
+    const { disableTracking, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, exit, } = args;
     let parsedUserProvidedAccountId;
     if (userProvidedAccount) {
         try {
@@ -27,11 +28,10 @@ async function handler(args) {
         }
         catch (err) {
             uiLogger.error(commands.account.subcommands.auth.errors.invalidAccountIdProvided);
-            process.exit(EXIT_CODES.ERROR);
+            return exit(EXIT_CODES.ERROR);
         }
     }
     if (!disableTracking) {
-        trackCommandUsage('account-auth', {}, parsedUserProvidedAccountId);
         await trackAuthAction('account-auth', authType, TRACKING_STATUS.STARTED);
     }
     handleExit(deleteConfigFileIfEmpty);
@@ -44,7 +44,7 @@ async function handler(args) {
         if (!disableTracking) {
             await trackAuthAction('account-auth', authType, TRACKING_STATUS.ERROR);
         }
-        return process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const { accountId } = updatedConfig;
     uiFeatureHighlight([
@@ -56,7 +56,7 @@ async function handler(args) {
     if (!disableTracking) {
         await trackAuthAction('account-auth', authType, TRACKING_STATUS.COMPLETE, accountId);
     }
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function accountAuthBuilder(yargs) {
     yargs.options({
@@ -86,7 +86,7 @@ const builder = makeYargsBuilder(accountAuthBuilder, command, commands.account.s
 const accountAuthCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('account-auth', handler),
     builder,
 };
 export default accountAuthCommand;

package/commands/account/clean.js

@@ -3,28 +3,29 @@ import { accessTokenForPersonalAccessKey } from '@hubspot/local-dev-lib/personal
 import { removeAccountFromConfig, getAllConfigAccounts, getConfigDefaultAccountIfExists, setConfigAccountAsDefault, } from '@hubspot/local-dev-lib/config';
 import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
 import { uiAccountDescription } from '../../lib/ui/index.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { renderList } from '../../ui/render.js';
+import { warnIfLinkedDirectory } from '../../lib/link/warnIfLinkedDirectory.js';
 const command = 'clean';
 const describe = commands.account.subcommands.clean.describe;
 async function handler(args) {
-    const { qa } = args;
-    trackCommandUsage('accounts-clean');
+    const { qa, exit } = args;
     const accountsList = getAllConfigAccounts();
     const filteredTestAccounts = accountsList.filter(p => qa ? p.env === 'qa' : p.env !== 'qa');
     if (filteredTestAccounts && filteredTestAccounts.length === 0) {
         uiLogger.log(commands.account.subcommands.clean.noResults);
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
+    warnIfLinkedDirectory(args._);
     const accountsToRemove = [];
     SpinniesManager.init({
         succeedColor: 'white',
@@ -105,7 +106,7 @@ async function handler(args) {
         });
     }
     uiLogger.log('');
-    process.exit(EXIT_CODES.SUCCESS);
+    return exit(EXIT_CODES.SUCCESS);
 }
 function accountCleanBuilder(yargs) {
     yargs.example([['$0 accounts clean']]);
@@ -119,7 +120,7 @@ const builder = makeYargsBuilder(accountCleanBuilder, command, describe, {
 const accountCleanCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('accounts-clean', handler),
     builder,
 };
 export default accountCleanCommand;

package/commands/account/createOverride.js

@@ -6,20 +6,24 @@ import { getConfigFilePath, getConfigAccountIfExists, globalConfigFileExists, ge
 import { getDefaultAccountOverrideAccountId, getDefaultAccountOverrideFilePath, } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
-import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { selectAccountFromConfig } from '../../lib/prompts/accountsPrompt.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
+import { warnIfLinkedDirectory } from '../../lib/link/warnIfLinkedDirectory.js';
 const command = 'create-override [account]';
 const describe = commands.account.subcommands.createOverride.describe(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
 async function handler(args) {
+    const { exit } = args;
     let overrideDefaultAccount = args.account;
+    // TODO: Block this command when linked directory exists (next breaking change)
+    warnIfLinkedDirectory(args._);
     const globalConfigExists = globalConfigFileExists();
     if (!globalConfigExists) {
         uiLogger.error(commands.account.subcommands.createOverride.errors.globalConfigNotFound);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
     const accounts = getAllConfigAccounts();
     const accountOverrideId = getDefaultAccountOverrideAccountId(accounts);
@@ -33,7 +37,7 @@ async function handler(args) {
         });
         uiLogger.log('');
         if (!replaceOverrideFile) {
-            process.exit(EXIT_CODES.SUCCESS);
+            return exit(EXIT_CODES.SUCCESS);
         }
     }
     if (!overrideDefaultAccount) {
@@ -48,16 +52,15 @@ async function handler(args) {
     }
     const account = getConfigAccountIfExists(overrideDefaultAccount);
     const accountId = account?.accountId;
-    trackCommandUsage('account-createOverride', undefined, accountId);
     try {
         const overrideFilePath = path.join(getCwd(), DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
         await fs.writeFile(overrideFilePath, accountId.toString(), 'utf8');
         uiLogger.success(commands.account.subcommands.createOverride.success(overrideFilePath));
-        process.exit(EXIT_CODES.SUCCESS);
+        return exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
         logError(e);
-        process.exit(EXIT_CODES.ERROR);
+        return exit(EXIT_CODES.ERROR);
     }
 }
 function accountCreateOverrideBuilder(yargs) {
@@ -87,7 +90,7 @@ const builder = makeYargsBuilder(accountCreateOverrideBuilder, command, describe
 const accountCreateOverrideCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('account-createOverride', handler),
     builder,
 };
 export default accountCreateOverrideCommand;

package/commands/account/info.js

@@ -1,38 +1,57 @@
 import { getConfigAccountById, getConfigDefaultAccount, getConfigFilePath, } 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 { isDirectoryLinked } from '../../lib/link/linkUtils.js';
 import { getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
+import { uiAccountDescription } from '../../lib/ui/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { indent } from '../../lib/ui/index.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { renderList } from '../../ui/render.js';
 const describe = commands.account.subcommands.info.describe;
 const command = 'info [account]';
+function logLinkedAccountInfo(hsSettingsPath, localDefaultAccount) {
+    uiLogger.log(commands.account.subcommands.info.linkedDefaultTitle);
+    uiLogger.log(`${indent(1)}${commands.account.subcommands.info.settingsPath(hsSettingsPath)}`);
+    if (localDefaultAccount) {
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.info.linkedDefault(uiAccountDescription(localDefaultAccount))}`);
+    }
+}
+function logGlobalAccountInfo() {
+    const configPath = getConfigFilePath();
+    if (configPath) {
+        uiLogger.log(commands.account.subcommands.info.defaultAccountTitle);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.info.configPath(configPath)}`);
+        const defaultAccount = getConfigDefaultAccount();
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.info.defaultAccount(defaultAccount.name)}`);
+    }
+    const overrideFilePath = getDefaultAccountOverrideFilePath();
+    if (overrideFilePath) {
+        uiLogger.log('');
+        uiLogger.log(commands.account.subcommands.info.overrideFilePathTitle);
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.info.overrideFilePath(overrideFilePath)}`);
+        const defaultAccount = getConfigDefaultAccount();
+        uiLogger.log(`${indent(1)}${commands.account.subcommands.info.overrideAccount(defaultAccount.name)}`);
+    }
+}
 async function handler(args) {
     const { derivedAccountId } = args;
     const config = getConfigAccountById(derivedAccountId);
-    // check if the provided account is using a personal access key, if not, show an error
     if (config && config.authType === 'personalaccesskey') {
         const { name, personalAccessKey, env } = config;
         let scopeGroups = [];
         const response = await getAccessToken(personalAccessKey, env, derivedAccountId);
         scopeGroups = response.scopeGroups.map(s => [s]);
-        // If a default account is present in the config, display it
-        const configPath = getConfigFilePath();
-        if (configPath) {
-            uiLogger.log(commands.account.subcommands.info.defaultAccountTitle);
-            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.configPath(configPath)}`);
-            const defaultAccount = getConfigDefaultAccount();
-            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.defaultAccount(defaultAccount.name)}`);
+        const hsSettings = getHsSettingsFileIfExists();
+        const hsSettingsPath = getHsSettingsFilePath();
+        const isLinked = isDirectoryLinked(hsSettings) && hsSettingsPath !== null;
+        if (isLinked) {
+            logLinkedAccountInfo(hsSettingsPath, hsSettings.localDefaultAccount);
         }
-        // If a default account override is present, display it
-        const overrideFilePath = getDefaultAccountOverrideFilePath();
-        if (overrideFilePath) {
-            uiLogger.log('');
-            uiLogger.log(commands.account.subcommands.info.overrideFilePathTitle);
-            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.overrideFilePath(overrideFilePath)}`);
-            const defaultAccount = getConfigDefaultAccount();
-            uiLogger.log(`${indent(1)}${commands.account.subcommands.info.overrideAccount(defaultAccount.name)}`);
+        else {
+            logGlobalAccountInfo();
         }
         uiLogger.log('');
         uiLogger.log(commands.account.subcommands.info.name(name));
@@ -69,7 +88,7 @@ const builder = makeYargsBuilder(accountInfoBuilder, command, describe, {
 const accountInfoCommand = {
     command,
     describe,
-    handler,
+    handler: makeWrappedYargsHandler('account-info', handler),
     builder,
 };
 export default accountInfoCommand;

package/commands/account/link.d.ts

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

package/commands/account/link.js

@@ -0,0 +1,89 @@
+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 { getDefaultAccountOverrideAccountId } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
+import { checkAndAddHsFolderToGitignore } from '@hubspot/local-dev-lib/gitignore';
+import { DEFAULT_HS_SETTINGS_PATH, EMPTY_HS_SETTINGS_FILE, } from '@hubspot/local-dev-lib/constants/config';
+import { ACTION_RESULT_STATUS } from '../../types/Link.js';
+import { handleLinkFlow } from '../../lib/link/index.js';
+import { hasDeprecatedConfigConflict, writeLinkedSettings, } from '../../lib/link/linkUtils.js';
+import { renderLinkedAccountsTable } from '../../lib/link/renderLinkedAccountsTable.js';
+import { commands } from '../../lang/en.js';
+import { debugError } from '../../lib/errorHandlers/index.js';
+import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
+const command = 'link';
+// Hide the command until we're done testing and ready to make linking GA
+// const describe = commands.account.subcommands.link.describe;
+const describe = undefined;
+async function handler(args) {
+    const { exit } = args;
+    if (hasDeprecatedConfigConflict(args._)) {
+        return exit(EXIT_CODES.ERROR);
+    }
+    const existingSettings = getHsSettingsFileIfExists();
+    const isNewFile = existingSettings === null;
+    if (isNewFile) {
+        uiLogger.log(commands.account.subcommands.link.linkingDirectory(getCwd()));
+    }
+    else {
+        uiLogger.log(commands.account.subcommands.link.managingLinkedAccounts(getCwd()));
+    }
+    uiLogger.log('');
+    const settingsFilePath = getHsSettingsFilePath() || DEFAULT_HS_SETTINGS_PATH;
+    uiLogger.log(commands.account.subcommands.link.settingsInfo(settingsFilePath));
+    uiLogger.log('');
+    const settings = isNewFile ? EMPTY_HS_SETTINGS_FILE : existingSettings;
+    const accounts = getAllConfigAccounts();
+    const accountOverrideId = getDefaultAccountOverrideAccountId(accounts);
+    if (settings.accounts.length !== 0) {
+        await renderLinkedAccountsTable(settings);
+        uiLogger.log('');
+    }
+    const result = await handleLinkFlow({
+        settings,
+        accountOverrideId,
+        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);
+    }
+    try {
+        checkAndAddHsFolderToGitignore(settingsPath);
+    }
+    catch (e) {
+        debugError(e);
+    }
+    if (isNewFile) {
+        uiLogger.success(commands.account.subcommands.link.success.created(settingsPath));
+    }
+    else {
+        uiLogger.success(commands.account.subcommands.link.shared.savedToSettings(settingsPath));
+    }
+    return exit(EXIT_CODES.SUCCESS);
+}
+function linkBuilder(yargs) {
+    yargs.example([['$0 link']]);
+    return yargs;
+}
+const builder = makeYargsBuilder(linkBuilder, command, commands.account.subcommands.link.verboseDescribe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+});
+const linkCommand = {
+    command,
+    describe,
+    handler: makeWrappedYargsHandler('account-link', handler),
+    builder,
+};
+export default linkCommand;

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;