@hubspot/cli 8.0.12-experimental.0 → 8.0.12-experimental.1

package/bin/cli.js

@@ -36,6 +36,7 @@ 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)
@@ -74,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',
@@ -119,7 +119,7 @@ const argv = yargs(process.argv.slice(2))
     .command(doctorCommand)
     .command(mcpCommand)
     .command(upgradeCommand);
-const argvWithSuggestions = addCommandSuggestions(argv)
+const parser = addCommandSuggestions(argv)
     .help()
     .alias('h', 'help')
     .version(pkg.version)
@@ -127,7 +127,8 @@ const argvWithSuggestions = addCommandSuggestions(argv)
     .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));

package/commands/account/clean.js

@@ -14,6 +14,7 @@ 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) {
@@ -24,6 +25,7 @@ async function handler(args) {
         uiLogger.log(commands.account.subcommands.clean.noResults);
         return exit(EXIT_CODES.SUCCESS);
     }
+    warnIfLinkedDirectory(args._);
     const accountsToRemove = [];
     SpinniesManager.init({
         succeedColor: 'white',

package/commands/account/createOverride.js

@@ -12,11 +12,14 @@ import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHand
 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);

package/commands/account/info.js

@@ -1,6 +1,9 @@
 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 { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.js';
@@ -9,31 +12,46 @@ 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));

package/commands/account/link.js

@@ -7,6 +7,7 @@ import { getHsSettingsFileIfExists, getHsSettingsFilePath, } from '@hubspot/loca
 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';
@@ -46,11 +47,11 @@ async function handler(args) {
         accountOverrideId,
         args,
     });
-    if (result.status === 'error') {
+    if (result.status === ACTION_RESULT_STATUS.ERROR) {
         uiLogger.error(result.reason);
         return exit(EXIT_CODES.ERROR);
     }
-    if (result.status === 'noop') {
+    if (result.status === ACTION_RESULT_STATUS.NOOP) {
         return exit(EXIT_CODES.SUCCESS);
     }
     const settingsPath = getHsSettingsFilePath() || DEFAULT_HS_SETTINGS_PATH;

package/commands/account/list.js

@@ -1,92 +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 { isSandbox, isDeveloperTestAccount } from '../../lib/accountTypes.js';
-import { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } from '@hubspot/local-dev-lib/constants/config';
 import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHandlerWithUsageTracking.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() {
     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']]);

package/commands/account/remove.js

@@ -8,9 +8,11 @@ import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHand
 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)

package/commands/account/removeOverride.js

@@ -9,10 +9,13 @@ import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHand
 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, 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);

package/commands/account/unlink.js

@@ -4,6 +4,7 @@ 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';
@@ -38,11 +39,11 @@ async function handler(args) {
         },
         args,
     });
-    if (result.status === 'error') {
+    if (result.status === ACTION_RESULT_STATUS.ERROR) {
         uiLogger.error(result.reason);
         return exit(EXIT_CODES.ERROR);
     }
-    if (result.status === 'noop') {
+    if (result.status === ACTION_RESULT_STATUS.NOOP) {
         return exit(EXIT_CODES.SUCCESS);
     }
     const settingsPath = getHsSettingsFilePath() || DEFAULT_HS_SETTINGS_PATH;

package/commands/account/use.js

@@ -1,5 +1,7 @@
 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 { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
@@ -8,9 +10,69 @@ import { makeYargsHandlerWithUsageTracking } from '../../lib/yargs/makeYargsHand
 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();
@@ -52,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,

package/commands/project/dev/deprecatedFlow.js

@@ -1,4 +1,5 @@
-import { getConfigAccountById, getAllConfigAccounts, getConfigAccountEnvironment, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById, getLinkedOrAllConfigAccounts, getConfigAccountEnvironment, } from '@hubspot/local-dev-lib/config';
+import { getHsSettingsFileIfExists, getHsSettingsFilePath, } from '@hubspot/local-dev-lib/config/hsSettings';
 import { findProjectComponents, getProjectComponentTypes, } from '../../../lib/projects/structure.js';
 import { ComponentTypes } from '../../../types/Projects.js';
 import { commands } from '../../../lang/en.js';
@@ -11,6 +12,7 @@ import { handleExit } from '../../../lib/process.js';
 import { getErrorMessage } from '../../../lib/errorHandlers/index.js';
 import { isSandbox, isDeveloperTestAccount, } from '../../../lib/accountTypes.js';
 import { ensureProjectExists } from '../../../lib/projects/ensureProjectExists.js';
+import { isDirectoryLinked, addAccountToLinkedSettings, } from '../../../lib/link/linkUtils.js';
 export async function deprecatedProjectDevFlow({ args, accountId, projectConfig, projectDir, }) {
     const { userProvidedAccount, derivedAccountId, exit } = args;
     const env = getConfigAccountEnvironment(derivedAccountId);
@@ -32,7 +34,9 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
         uiLogger.error(commands.project.dev.errors.invalidProjectComponents);
         return exit(EXIT_CODES.SUCCESS);
     }
-    const accounts = getAllConfigAccounts();
+    const hsSettings = getHsSettingsFileIfExists();
+    const directoryIsLinked = isDirectoryLinked(hsSettings);
+    const accounts = getLinkedOrAllConfigAccounts();
     if (!accounts) {
         uiLogger.error(commands.project.dev.errors.noAccountsInConfig);
         return exit(EXIT_CODES.ERROR);
@@ -69,6 +73,10 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
     else {
         await checkIfDefaultAccountIsSupported(accountConfig, hasPublicApps, exit);
     }
+    if (directoryIsLinked) {
+        uiLogger.log('');
+        uiLogger.info(commands.account.subcommands.link.shared.usingLinkedAccounts(getHsSettingsFilePath()));
+    }
     // The user is targeting an account type that we recommend developing on
     if (!targetProjectAccountId && bypassRecommendedAccountPrompt) {
         targetTestingAccountId = derivedAccountId;
@@ -101,6 +109,9 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
             if (!accountAdded) {
                 return exit(EXIT_CODES.SUCCESS);
             }
+            if (directoryIsLinked) {
+                addAccountToLinkedSettings(notInConfigAccount.id);
+            }
         }
         createNewSandbox = hasPrivateApps && createNestedAccount;
         createNewDeveloperTestAccount = hasPublicApps && createNestedAccount;
@@ -114,6 +125,9 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
         }
         // We will be running our tests against this new sandbox account
         targetTestingAccountId = targetProjectAccountId;
+        if (directoryIsLinked) {
+            addAccountToLinkedSettings(targetProjectAccountId);
+        }
     }
     if (createNewDeveloperTestAccount) {
         try {
@@ -123,6 +137,9 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
             return exit(EXIT_CODES.ERROR);
         }
         targetProjectAccountId = derivedAccountId;
+        if (directoryIsLinked) {
+            addAccountToLinkedSettings(targetTestingAccountId);
+        }
     }
     if (!targetProjectAccountId || !targetTestingAccountId) {
         uiLogger.error(commands.project.dev.errors.noAccount(accountId));
@@ -156,6 +173,7 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
         targetAccountId: targetTestingAccountId,
         env,
         exit,
+        port: args.port,
     });
     await LocalDev.start();
     handleExit(({ isSIGHUP }) => LocalDev.stop(!isSIGHUP));

package/commands/project/dev/index.js

@@ -13,6 +13,7 @@ import { uiLogger } from '../../../lib/ui/logger.js';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { projectProfilePrompt } from '../../../lib/prompts/projectProfilePrompt.js';
 import { isPromptExitError } from '../../../lib/errors/PromptExitError.js';
+import { LOCAL_DEV_DEFAULT_PORT } from '../../../lib/constants.js';
 const command = 'dev';
 const describe = commands.project.dev.describe;
 function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2) {
@@ -149,6 +150,11 @@ function projectDevBuilder(yargs) {
         type: 'string',
         description: commands.project.dev.options.account,
     });
+    yargs.option('port', {
+        type: 'number',
+        description: commands.project.dev.options.port,
+        default: LOCAL_DEV_DEFAULT_PORT,
+    });
     yargs.example([['$0 project dev', commands.project.dev.examples.default]]);
     yargs.conflicts('profile', 'account');
     yargs.conflicts('profile', 'testing-account');

package/commands/project/dev/unifiedFlow.js

@@ -3,7 +3,7 @@ import util from 'util';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { startPortManagerServer, stopPortManagerServer, } from '@hubspot/local-dev-lib/portManager';
 import { isTranslationError, translateForLocalDev, } from '@hubspot/project-parsing-lib/translate';
-import { getConfigAccountEnvironment, getAllConfigAccounts, getConfigAccountById, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountEnvironment, getLinkedOrAllConfigAccounts, getConfigAccountById, } from '@hubspot/local-dev-lib/config';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { ensureProjectExists } from '../../../lib/projects/ensureProjectExists.js';
@@ -18,6 +18,8 @@ import { uiLogger } from '../../../lib/ui/logger.js';
 import { commands } from '../../../lang/en.js';
 import LocalDevWebsocketServer from '../../../lib/projects/localDev/LocalDevWebsocketServer.js';
 import { isLocalDevRunning } from '../../../lib/projects/localDev/helpers/process.js';
+import { getHsSettingsFileIfExists, getHsSettingsFilePath, } from '@hubspot/local-dev-lib/config/hsSettings';
+import { isDirectoryLinked, addAccountToLinkedSettings, } from '../../../lib/link/linkUtils.js';
 export async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTargetTestingAccountId, projectConfig, projectDir, }) {
     const { exit } = args;
     if (await isLocalDevRunning()) {
@@ -56,13 +58,19 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         uiLogger.error(commands.project.dev.errors.noAccount(targetProjectAccountId));
         return exit(EXIT_CODES.ERROR);
     }
-    const accounts = getAllConfigAccounts();
+    const hsSettings = getHsSettingsFileIfExists();
+    const directoryIsLinked = isDirectoryLinked(hsSettings);
+    const accounts = getLinkedOrAllConfigAccounts();
     const accountIsCombined = await isUnifiedAccount(targetProjectAccountConfig);
     const targetProjectAccountIsTestAccountOrSandbox = isTestAccountOrSandbox(targetProjectAccountConfig);
     if (!accountIsCombined) {
         uiLogger.error(commands.project.dev.errors.accountNotCombined);
         return exit(EXIT_CODES.ERROR);
     }
+    if (directoryIsLinked && !providedTargetTestingAccountId) {
+        uiLogger.log('');
+        uiLogger.info(commands.account.subcommands.link.shared.usingLinkedAccounts(getHsSettingsFilePath()));
+    }
     let targetTestingAccountId = providedTargetTestingAccountId;
     // Temporarily removing logic to use profile account as testing account
     // if (profileConfig) {
@@ -90,6 +98,9 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
                 if (!accountAdded) {
                     return exit(EXIT_CODES.SUCCESS);
                 }
+                if (directoryIsLinked) {
+                    addAccountToLinkedSettings(devAccountPromptResponse.notInConfigAccount.id);
+                }
             }
             else if (devAccountPromptResponse.createNestedAccount) {
                 // Create a new developer test account and automatically add it to the CLI config
@@ -99,6 +110,9 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
                 catch {
                     return exit(EXIT_CODES.ERROR);
                 }
+                if (directoryIsLinked) {
+                    addAccountToLinkedSettings(targetTestingAccountId);
+                }
             }
         }
         else if (accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
@@ -112,6 +126,9 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
                 catch {
                     return exit(EXIT_CODES.ERROR);
                 }
+                if (directoryIsLinked) {
+                    addAccountToLinkedSettings(targetTestingAccountId);
+                }
             }
         }
         else {
@@ -143,7 +160,7 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
     }
     // End setup, start local dev process
     try {
-        await startPortManagerServer();
+        await startPortManagerServer(args.port);
     }
     catch (e) {
         logError(e);

package/commands/project/lint.js

@@ -10,7 +10,7 @@ import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import SpinniesManager from '../../lib/ui/SpinniesManager.js';
-import { areAllLintPackagesInstalled, getMissingLintPackages, lintPackages, displayLintResults, hasEslintConfig, hasDeprecatedEslintConfig, getDeprecatedEslintConfigFiles, createEslintConfig, REQUIRED_PACKAGES_AND_MIN_VERSIONS, } from '../../lib/projects/uieLinting.js';
+import { areAllLintPackagesInstalled, getMissingLintPackages, getMissingLintScripts, addLintScriptsToPackageJson, lintPackages, displayLintResults, hasEslintConfig, hasDeprecatedEslintConfig, getDeprecatedEslintConfigFiles, createEslintConfig, REQUIRED_PACKAGES_AND_MIN_VERSIONS, } from '../../lib/projects/uieLinting.js';
 const command = 'lint';
 const describe = commands.project.lint.help.describe;
 async function handler(args) {
@@ -133,6 +133,23 @@ async function handler(args) {
                     return exit(EXIT_CODES.ERROR);
                 }
             }
+            const locationsNeedingScripts = locationsReadyToLint.filter(location => getMissingLintScripts(location).length > 0);
+            if (locationsNeedingScripts.length > 0) {
+                SpinniesManager.add('lintScriptsAdd', {
+                    text: commands.project.lint.loading.addingLintScripts,
+                });
+                const addedResults = [];
+                for (const location of locationsNeedingScripts) {
+                    const result = addLintScriptsToPackageJson(location);
+                    if (result.added.length > 0) {
+                        addedResults.push(result);
+                    }
+                }
+                SpinniesManager.succeed('lintScriptsAdd');
+                addedResults.forEach(({ added, relativePath }) => {
+                    uiLogger.success(commands.project.lint.lintScriptsAdded(added, relativePath));
+                });
+            }
             SpinniesManager.add('lintRun', {
                 text: commands.project.lint.loading.linting,
             });