@hubspot/cli 7.10.0 → 7.11.0-beta.0

package/lib/middleware/{__test__ → __tests__}/configMiddleware.test.js

@@ -2,7 +2,7 @@ import { uiLogger } from '../../ui/logger.js';
 import * as cliConfig from '@hubspot/local-dev-lib/config';
 import * as validation from '../../validation.js';
 import { EXIT_CODES } from '../../enums/exitCodes.js';
-import { handleDeprecatedEnvVariables, injectAccountIdMiddleware, loadAndValidateConfigMiddleware, validateAccountOptions, } from '../configMiddleware.js';
+import { handleDeprecatedEnvVariables, injectAccountIdMiddleware, validateConfigMiddleware, validateAccountOptions, } from '../configMiddleware.js';
 vi.mock('../../ui/logger.js', () => ({
     uiLogger: {
         error: vi.fn(),
@@ -12,10 +12,10 @@ vi.mock('../../ui/logger.js', () => ({
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../validation');
 const validateAccountSpy = vi.spyOn(validation, 'validateAccount');
-const loadConfigSpy = vi.spyOn(cliConfig, 'loadConfig');
-const getAccountIdSpy = vi.spyOn(cliConfig, 'getAccountId');
+const getConfigAccountIfExistsSpy = vi.spyOn(cliConfig, 'getConfigAccountIfExists');
+const globalConfigFileExistsSpy = vi.spyOn(cliConfig, 'globalConfigFileExists');
 const configFileExistsSpy = vi.spyOn(cliConfig, 'configFileExists');
-const getConfigPathSpy = vi.spyOn(cliConfig, 'getConfigPath');
+const getConfigFilePathSpy = vi.spyOn(cliConfig, 'getConfigFilePath');
 const validateConfigSpy = vi.spyOn(cliConfig, 'validateConfig');
 const processExitSpy = vi.spyOn(process, 'exit');
 describe('lib/middleware/configMiddleware', () => {
@@ -23,7 +23,7 @@ describe('lib/middleware/configMiddleware', () => {
         processExitSpy.mockImplementation(code => {
             throw new Error(`Process.exit called with code ${code}`);
         });
-        getConfigPathSpy.mockReturnValue('/path/to/config');
+        getConfigFilePathSpy.mockReturnValue('/path/to/config');
     });
     describe('handleDeprecatedEnvVariables()', () => {
         it('should handle deprecated HUBSPOT_PORTAL_ID environment variable', () => {
@@ -76,11 +76,13 @@ describe('lib/middleware/configMiddleware', () => {
             await injectAccountIdMiddleware(argv);
             expect(argv.userProvidedAccount).toBeUndefined();
             expect(argv.derivedAccountId).toBe(123);
-            expect(getAccountIdSpy).not.toHaveBeenCalled();
+            expect(getConfigAccountIfExistsSpy).not.toHaveBeenCalled();
             process.env = originalEnv;
         });
         it('should use getAccountId when useEnv is false', async () => {
-            getAccountIdSpy.mockReturnValue(456);
+            getConfigAccountIfExistsSpy.mockReturnValue({
+                accountId: 456,
+            });
             const argv = {
                 _: ['some-command'],
                 account: 'test-account',
@@ -90,41 +92,40 @@ describe('lib/middleware/configMiddleware', () => {
             await injectAccountIdMiddleware(argv);
             expect(argv.userProvidedAccount).toBe('test-account');
             expect(argv.derivedAccountId).toBe(456);
-            expect(getAccountIdSpy).toHaveBeenCalledWith('test-account');
+            expect(getConfigAccountIfExistsSpy).toHaveBeenCalledWith('test-account');
         });
     });
-    describe('loadAndValidateConfigMiddleware()', () => {
-        it('should exit with error when config file exists and --config flag is used', async () => {
+    describe('validateConfigMiddleware()', () => {
+        it('should allow using --config flag', async () => {
             configFileExistsSpy.mockReturnValue(true);
+            validateConfigSpy.mockReturnValue({ isValid: true, errors: [] });
             const argv = {
                 _: ['some-command'],
                 config: 'custom-config.json',
                 $0: 'hs',
             };
-            await expect(loadAndValidateConfigMiddleware(argv)).rejects.toThrow();
-            expect(processExitSpy).toHaveBeenCalledWith(EXIT_CODES.ERROR);
-            expect(uiLogger.error).toHaveBeenCalledWith('A configuration file already exists at /path/to/config. To specify a new configuration file, delete the existing one and try again.');
+            await validateConfigMiddleware(argv);
+            // Should not throw or exit - this is now allowed
+            expect(processExitSpy).not.toHaveBeenCalled();
+            expect(uiLogger.error).not.toHaveBeenCalled();
         });
-        it('should load config and validate for non-init commands', async () => {
-            configFileExistsSpy.mockReturnValue(false);
-            loadConfigSpy.mockReturnValue({});
-            validateConfigSpy.mockReturnValue(true);
+        it('should validate config for non-init commands', async () => {
+            globalConfigFileExistsSpy.mockReturnValue(true);
+            validateConfigSpy.mockReturnValue({ isValid: true, errors: [] });
             const argv = {
                 _: ['some-command'],
                 $0: 'hs',
             };
-            await loadAndValidateConfigMiddleware(argv);
-            expect(loadConfigSpy).toHaveBeenCalled();
+            await validateConfigMiddleware(argv);
             expect(validateConfigSpy).toHaveBeenCalled();
         });
         it('should skip validation for init command', async () => {
-            configFileExistsSpy.mockReturnValue(false);
+            globalConfigFileExistsSpy.mockReturnValue(false);
             const argv = {
                 _: ['init'],
                 $0: 'hs',
             };
-            await loadAndValidateConfigMiddleware(argv);
-            expect(loadConfigSpy).not.toHaveBeenCalled();
+            await validateConfigMiddleware(argv);
             expect(validateConfigSpy).not.toHaveBeenCalled();
         });
     });

package/lib/middleware/{__test__ → __tests__}/gitMiddleware.test.js

@@ -3,19 +3,19 @@ import * as gitUI from '../../ui/git.js';
 import { checkAndWarnGitInclusionMiddleware } from '../gitMiddleware.js';
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../ui/git');
-const getConfigPathSpy = vi.spyOn(config, 'getConfigPath');
+const getConfigFilePathSpy = vi.spyOn(config, 'getConfigFilePath');
 const checkAndWarnGitInclusionSpy = vi.spyOn(gitUI, 'checkAndWarnGitInclusion');
 describe('lib/middleware/gitMiddleware', () => {
     describe('checkAndWarnGitInclusionMiddleware()', () => {
         it('should call checkAndWarnGitInclusion when command is provided and config path exists', () => {
             const mockConfigPath = '/path/to/config.js';
-            getConfigPathSpy.mockReturnValue(mockConfigPath);
+            getConfigFilePathSpy.mockReturnValue(mockConfigPath);
             const argv = {
                 _: ['some-command'],
                 $0: 'hs',
             };
             checkAndWarnGitInclusionMiddleware(argv);
-            expect(getConfigPathSpy).toHaveBeenCalledTimes(1);
+            expect(getConfigFilePathSpy).toHaveBeenCalledTimes(1);
             expect(checkAndWarnGitInclusionSpy).toHaveBeenCalledWith(mockConfigPath);
         });
         it('should not call checkAndWarnGitInclusion when no command is provided', () => {
@@ -24,17 +24,19 @@ describe('lib/middleware/gitMiddleware', () => {
                 $0: 'hs',
             };
             checkAndWarnGitInclusionMiddleware(argv);
-            expect(getConfigPathSpy).not.toHaveBeenCalled();
+            expect(getConfigFilePathSpy).not.toHaveBeenCalled();
             expect(checkAndWarnGitInclusionSpy).not.toHaveBeenCalled();
         });
-        it('should not call checkAndWarnGitInclusion when config path is null', () => {
-            getConfigPathSpy.mockReturnValue(null);
+        it('should not call checkAndWarnGitInclusion when config path does not exist', () => {
+            getConfigFilePathSpy.mockImplementation(() => {
+                throw new Error('Config path does not exist');
+            });
             const argv = {
                 _: ['some-command'],
                 $0: 'hs',
             };
             checkAndWarnGitInclusionMiddleware(argv);
-            expect(getConfigPathSpy).toHaveBeenCalledTimes(1);
+            expect(getConfigFilePathSpy).toHaveBeenCalledTimes(1);
             expect(checkAndWarnGitInclusionSpy).not.toHaveBeenCalled();
         });
     });

package/lib/middleware/autoUpdateMiddleware.js

@@ -1,13 +1,14 @@
 import updateNotifier from 'update-notifier';
-import { isConfigFlagEnabled } from '@hubspot/local-dev-lib/config';
+import { getConfig } from '@hubspot/local-dev-lib/config';
 import { pkg } from '../jsonLoader.js';
-import { UI_COLORS } from '../ui/index.js';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { lib } from '../../lang/en.js';
 import { DEFAULT_PACKAGE_MANAGER, isGloballyInstalled, executeInstall, } from '../npm.js';
 import { debugError } from '../errorHandlers/index.js';
 import { uiLogger } from '../ui/logger.js';
 import { isTargetedCommand } from './commandTargetingUtils.js';
+import { renderInline } from '../../ui/index.js';
+import { getWarningBox } from '../../ui/components/StatusMessageBoxes.js';
 // Default behavior is to check for notifications at most once per day
 // update-notifier stores the last checked date in the user's home directory
 const notifier = updateNotifier({
@@ -16,23 +17,16 @@ const notifier = updateNotifier({
     shouldNotifyInNpmScript: true,
 });
 const CMS_CLI_PACKAGE_NAME = '@hubspot/cms-cli';
-function updateNotification() {
-    notifier.notify({
+async function updateNotification(currentVersion, latestVersion, updateCommand) {
+    await renderInline(getWarningBox({
+        title: pkg.name === CMS_CLI_PACKAGE_NAME
+            ? ''
+            : lib.middleware.updateNotification.notifyTitle,
         message: pkg.name === CMS_CLI_PACKAGE_NAME
             ? lib.middleware.updateNotification.cmsUpdateNotification(CMS_CLI_PACKAGE_NAME)
-            : lib.middleware.updateNotification.cliUpdateNotification,
-        defer: false,
-        boxenOptions: {
-            borderColor: UI_COLORS.MARIGOLD_DARK,
-            margin: 1,
-            padding: 1,
-            textAlignment: 'center',
-            borderStyle: 'round',
-            title: pkg.name === CMS_CLI_PACKAGE_NAME
-                ? undefined
-                : lib.middleware.updateNotification.notifyTitle,
-        },
-    });
+            : lib.middleware.updateNotification.cliUpdateNotification(currentVersion, updateCommand, latestVersion),
+        textCentered: true,
+    }));
 }
 const SKIP_AUTO_UPDATE_COMMANDS = {
     config: {
@@ -43,13 +37,28 @@ const preventAutoUpdateForCommand = (commandParts) => {
     return isTargetedCommand(commandParts, SKIP_AUTO_UPDATE_COMMANDS);
 };
 export async function autoUpdateCLI(argv) {
-    // This lets us back to default update-notifier behavior
     let showManualInstallHelp = true;
+    let isGlobalInstall = null;
+    const checkGlobalInstall = async () => {
+        if (isGlobalInstall === null) {
+            isGlobalInstall =
+                (await isGloballyInstalled(DEFAULT_PACKAGE_MANAGER)) &&
+                    (await isGloballyInstalled('hs'));
+        }
+        return isGlobalInstall;
+    };
+    let config;
+    try {
+        config = getConfig();
+    }
+    catch (e) {
+        debugError(e);
+    }
     if (notifier &&
         notifier.update &&
         !argv.useEnv &&
         !process.env.SKIP_HUBSPOT_CLI_AUTO_UPDATES &&
-        isConfigFlagEnabled('allowAutoUpdates') &&
+        config?.allowAutoUpdates !== false &&
         !preventAutoUpdateForCommand(argv._)) {
         // Ignore all update notifications if the current version is a pre-release
         if (!notifier.update.current.includes('-')) {
@@ -63,8 +72,7 @@ export async function autoUpdateCLI(argv) {
                     text: lib.middleware.autoUpdateCLI.updateAvailable(notifier.update.latest),
                 });
                 try {
-                    if ((await isGloballyInstalled(DEFAULT_PACKAGE_MANAGER)) &&
-                        (await isGloballyInstalled('hs'))) {
+                    if (await checkGlobalInstall()) {
                         await executeInstall(['@hubspot/cli@latest'], '-g');
                         showManualInstallHelp = false;
                         SpinniesManager.succeed('cliAutoUpdate', {
@@ -87,7 +95,10 @@ export async function autoUpdateCLI(argv) {
             }
         }
     }
-    if (showManualInstallHelp) {
-        updateNotification();
+    if (showManualInstallHelp &&
+        notifier.update &&
+        process.stdout.isTTY &&
+        !notifier.update.current.includes('-')) {
+        await updateNotification(notifier.update.current, notifier.update.latest, `npm i ${(await checkGlobalInstall()) ? '-g' : ''} @hubspot/cli`);
     }
 }

package/lib/middleware/commandTargetingUtils.js

@@ -1,4 +1,4 @@
-import { configFileExists } from '@hubspot/local-dev-lib/config';
+import { globalConfigFileExists } from '@hubspot/local-dev-lib/config';
 export function isTargetedCommand(commandParts, targetCommandMap) {
     const currentCommandPart = commandParts[0];
     if (!targetCommandMap[currentCommandPart]) {
@@ -20,10 +20,11 @@ export function isTargetedCommand(commandParts, targetCommandMap) {
 const SKIP_CONFIG_LOADING_COMMANDS = {
     init: true,
     feedback: true,
+    mcp: { start: true },
 };
 // Returns true if the command requires a config file to be present
 export function shouldLoadConfigForCommand(commandParts) {
-    const globalConfigExists = configFileExists(true);
+    const globalConfigExists = globalConfigFileExists();
     // the user is trying to migrate the global config
     const isGlobalConfigMigration = !globalConfigExists &&
         isTargetedCommand(commandParts, {

package/lib/middleware/configMiddleware.d.ts

@@ -3,11 +3,16 @@ import { CLIOptions } from '@hubspot/local-dev-lib/types/CLIOptions';
 export declare function handleDeprecatedEnvVariables(argv: Arguments<{
     useEnv?: boolean;
 }>): void;
+export declare function handleCustomConfigLocationMiddleware(argv: Arguments<{
+    useEnv?: boolean;
+    config?: string;
+}>): void;
 /**
  * Auto-injects the derivedAccountId flag into all commands
  */
 export declare function injectAccountIdMiddleware(argv: Arguments<{
     account?: string;
+    config?: string;
 }>): Promise<void>;
-export declare function loadAndValidateConfigMiddleware(argv: Arguments<CLIOptions>): Promise<void>;
+export declare function validateConfigMiddleware(argv: Arguments<CLIOptions>): Promise<void>;
 export declare function validateAccountOptions(argv: Arguments): Promise<void>;

package/lib/middleware/configMiddleware.js

@@ -1,9 +1,11 @@
-import { loadConfig, getAccountId, configFileExists, getConfigPath, validateConfig, } from '@hubspot/local-dev-lib/config';
+import path from 'path';
+import { getConfigAccountIfExists, validateConfig, getConfigDefaultAccountIfExists, configFileExists, } from '@hubspot/local-dev-lib/config';
+import { getCwd } from '@hubspot/local-dev-lib/path';
 import { validateAccount } from '../validation.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import { commands } from '../../lang/en.js';
 import { uiDeprecatedTag } from '../ui/index.js';
-import { isTargetedCommand, shouldLoadConfigForCommand, shouldRunAccountValidationForCommand, shouldRunConfigValidationForCommand, } from './commandTargetingUtils.js';
+import { shouldLoadConfigForCommand, shouldRunAccountValidationForCommand, shouldRunConfigValidationForCommand, } from './commandTargetingUtils.js';
 import { parseStringToNumber } from '../parsing.js';
 import { uiLogger } from '../ui/logger.js';
 import { lib } from '../../lang/en.js';
@@ -17,6 +19,18 @@ export function handleDeprecatedEnvVariables(argv) {
         process.env.HUBSPOT_ACCOUNT_ID = process.env.HUBSPOT_PORTAL_ID;
     }
 }
+export function handleCustomConfigLocationMiddleware(argv) {
+    const { useEnv, config } = argv;
+    if (useEnv) {
+        process.env.USE_ENVIRONMENT_HUBSPOT_CONFIG = 'true';
+    }
+    else if (config && typeof config === 'string') {
+        const absoluteConfigPath = path.isAbsolute(config)
+            ? config
+            : path.join(getCwd(), config);
+        process.env.HUBSPOT_CONFIG_PATH = absoluteConfigPath;
+    }
+}
 /**
  * Auto-injects the derivedAccountId flag into all commands
  */
@@ -33,10 +47,23 @@ export async function injectAccountIdMiddleware(argv) {
         }
     }
     else {
-        argv.derivedAccountId = getAccountId(account);
+        // Wrap in try-catch to handle cases where config file doesn't exist yet (e.g., during hs init)
+        try {
+            let accountInConfig = account
+                ? getConfigAccountIfExists(account)
+                : undefined;
+            if (!accountInConfig) {
+                accountInConfig = getConfigDefaultAccountIfExists();
+            }
+            argv.derivedAccountId = accountInConfig?.accountId;
+        }
+        catch (err) {
+            // Config file doesn't exist yet, which is fine for commands like hs init
+            argv.derivedAccountId = undefined;
+        }
     }
 }
-export async function loadAndValidateConfigMiddleware(argv) {
+export async function validateConfigMiddleware(argv) {
     // Skip this when no command is provided
     if (!argv._.length || argv.help) {
         return;
@@ -45,23 +72,17 @@ export async function loadAndValidateConfigMiddleware(argv) {
     if (!shouldLoadConfigForCommand(argv._)) {
         return;
     }
-    // If the config file exists and the --config flag is used, exit with an error
-    if (configFileExists(true) &&
-        argv.config &&
-        !isTargetedCommand(argv._, { config: { migrate: true } })) {
-        uiLogger.error(commands.generalErrors.loadConfigMiddleware.configFileExists(getConfigPath()));
-        process.exit(EXIT_CODES.ERROR);
-    }
-    const config = loadConfig(argv.config, argv);
     // We don't run validation for auth because users should be able to run it when
     // no accounts are configured, but we still want to exit if the config file is not found
-    if (isTargetedCommand(argv._, { auth: true }) && !config) {
+    if (!process.env.USE_ENVIRONMENT_HUBSPOT_CONFIG && !configFileExists()) {
+        console.error('Config file not found, run hs account auth to configure your account');
         process.exit(EXIT_CODES.ERROR);
     }
     // Only validate the config if the command requires it
     if (shouldRunConfigValidationForCommand(argv._)) {
-        const configIsValid = validateConfig();
-        if (!configIsValid) {
+        const { isValid, errors } = validateConfig();
+        if (!isValid) {
+            uiLogger.error(commands.generalErrors.validateConfigMiddleware.configValidationFailed(errors));
             process.exit(EXIT_CODES.ERROR);
         }
     }

package/lib/middleware/fireAlarmMiddleware.js

@@ -2,7 +2,6 @@ import chalk from 'chalk';
 import { fetchFireAlarms } from '@hubspot/local-dev-lib/api/fireAlarm';
 import { debugError } from '../errorHandlers/index.js';
 import { pkg } from '../jsonLoader.js';
-import { logInBox } from '../ui/boxen.js';
 import { renderInline } from '../../ui/index.js';
 import { getWarningBox } from '../../ui/components/StatusMessageBoxes.js';
 /*
@@ -100,20 +99,10 @@ async function logFireAlarms(accountId, command, version) {
             }
             return acc;
         }, '');
-        if (!process.env.HUBSPOT_ENABLE_INK) {
-            await logInBox({
-                contents: notifications,
-                options: {
-                    title: 'Notifications',
-                },
-            });
-        }
-        else {
-            await renderInline(getWarningBox({
-                title: 'Notifications',
-                message: notifications,
-            }));
-        }
+        await renderInline(getWarningBox({
+            title: 'Notifications',
+            message: notifications,
+        }));
     }
 }
 export async function checkFireAlarms(argv) {

package/lib/middleware/gitMiddleware.js

@@ -1,15 +1,19 @@
-import { getConfigPath, configFileExists } from '@hubspot/local-dev-lib/config';
+import { getConfigFilePath, globalConfigFileExists, } from '@hubspot/local-dev-lib/config';
 import { checkAndWarnGitInclusion } from '../ui/git.js';
+import { debugError } from '../errorHandlers/index.js';
 export function checkAndWarnGitInclusionMiddleware(argv) {
     // Skip this when no command is provided
     if (argv._.length) {
         // Skip if using global config
-        if (configFileExists(true)) {
+        if (globalConfigFileExists()) {
             return;
         }
-        const configPath = getConfigPath();
-        if (configPath) {
+        try {
+            const configPath = getConfigFilePath();
             checkAndWarnGitInclusion(configPath);
         }
+        catch (error) {
+            debugError(error);
+        }
     }
 }

package/lib/oauth.d.ts

@@ -1,2 +1,2 @@
-import { OAuth2ManagerAccountConfig } from '@hubspot/local-dev-lib/types/Accounts';
-export declare function authenticateWithOauth(accountConfig: OAuth2ManagerAccountConfig): Promise<void>;
+import { OAuthConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
+export declare function authenticateWithOauth(accountConfig: OAuthConfigAccount): Promise<void>;

package/lib/oauth.js

@@ -1,8 +1,7 @@
 import express from 'express';
 import open from 'open';
 import { OAuth2Manager } from '@hubspot/local-dev-lib/models/OAuth2Manager';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
-import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import { addOauthToAccountConfig } from '@hubspot/local-dev-lib/oauth';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { uiLogger } from './ui/logger.js';
@@ -14,15 +13,15 @@ import { EXIT_CODES } from './enums/exitCodes.js';
 const PORT = 3000;
 const redirectUri = `http://localhost:${PORT}/oauth-callback`;
 function buildAuthUrl(oauthManager) {
-    const { env: accountEnv, clientId, scopes: accountScopes, } = oauthManager.account;
+    const { env: accountEnv, auth } = oauthManager.account;
     const env = accountEnv || ENVIRONMENTS.PROD;
-    const scopes = accountScopes || DEFAULT_OAUTH_SCOPES;
-    if (!clientId) {
+    const scopes = auth.scopes.length > 0 ? auth.scopes : DEFAULT_OAUTH_SCOPES;
+    if (!auth.clientId) {
         uiLogger.error(lib.oauth.missingClientId);
         process.exit(EXIT_CODES.ERROR);
     }
     return (`${getHubSpotWebsiteOrigin(env)}/oauth/${oauthManager.account.accountId}/authorize` +
-        `?client_id=${encodeURIComponent(clientId)}` + // app's client ID
+        `?client_id=${encodeURIComponent(auth.clientId)}` + // app's client ID
         `&scope=${encodeURIComponent(scopes.join(' '))}` + // scopes being requested by the app
         `&redirect_uri=${encodeURIComponent(redirectUri)}` // where to send the user after the consent page
     );
@@ -45,8 +44,8 @@ async function authorize(oauthManager) {
             if (req.query.code) {
                 const authCodeProof = {
                     grant_type: 'authorization_code',
-                    client_id: oauthManager.account.clientId,
-                    client_secret: oauthManager.account.clientSecret,
+                    client_id: oauthManager.account.auth.clientId,
+                    client_secret: oauthManager.account.auth.clientSecret,
                     redirect_uri: redirectUri,
                     code: req.query.code,
                 };
@@ -82,8 +81,7 @@ async function authorize(oauthManager) {
     });
 }
 function setupOauth(accountConfig) {
-    const accountId = getAccountIdentifier(accountConfig);
-    const config = getAccountConfig(accountId);
+    const config = getConfigAccountById(accountConfig.accountId);
     return new OAuth2Manager({
         ...accountConfig,
         env: accountConfig.env || config?.env || ENVIRONMENTS.PROD,

package/lib/projects/__tests__/AppDevModeInterface.test.js

@@ -12,7 +12,7 @@ vi.mock('@hubspot/ui-extensions-dev-server', () => {
 });
 import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { fetchAppMetadataByUid, fetchPublicAppProductionInstallCounts, installStaticAuthAppOnTestAccount, } from '@hubspot/local-dev-lib/api/appsDev';
-import { getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
 import AppDevModeInterface from '../localDev/AppDevModeInterface.js';
 import LocalDevState from '../localDev/LocalDevState.js';
 import LocalDevLogger from '../localDev/LocalDevLogger.js';
@@ -121,7 +121,7 @@ describe('AppDevModeInterface', () => {
                 previouslyAuthorizedScopeGroups: [],
             },
         });
-        getAccountConfig.mockReturnValue({
+        getConfigAccountById.mockReturnValue({
             parentAccountId: 12345,
         });
         isDeveloperTestAccount.mockReturnValue(true);
@@ -290,13 +290,14 @@ describe('AppDevModeInterface', () => {
         });
         it('should handle app reinstallation', async () => {
             // Set up conditions for non-automatic installation
-            getAccountConfig.mockReturnValue(null);
             fetchAppInstallationData.mockResolvedValue({
                 data: {
                     isInstalledWithScopeGroups: false,
                     previouslyAuthorizedScopeGroups: ['old-scope'],
                 },
             });
+            // Make it not automatically installable by making it not a test account
+            isDeveloperTestAccount.mockReturnValue(false);
             await appDevModeInterface.setup();
             expect(installAppBrowserPrompt).toHaveBeenCalledWith('http://static-install-url', true);
         });
@@ -308,7 +309,7 @@ describe('AppDevModeInterface', () => {
         });
         it('should exit if user declines auto-install', async () => {
             // Set up conditions for automatic installation
-            getAccountConfig.mockReturnValue({
+            getConfigAccountById.mockReturnValue({
                 parentAccountId: 12345, // matches targetProjectAccountId
             });
             isDeveloperTestAccount.mockReturnValue(true);
@@ -375,6 +376,15 @@ describe('AppDevModeInterface', () => {
                 data: { uniquePortalInstallCount: 5 },
             });
             getStaticAuthAppInstallUrl.mockReturnValue('http://static-install-url');
+            getConfigAccountById.mockReturnValue({
+                parentAccountId: 12345,
+            });
+            isDeveloperTestAccount.mockReturnValue(true);
+            isSandbox.mockReturnValue(false);
+            installAppAutoPrompt.mockResolvedValue(true);
+            confirmPrompt.mockResolvedValue(true);
+            installStaticAuthAppOnTestAccount.mockResolvedValue(undefined);
+            isServerRunningAtUrl.mockResolvedValue(true);
             installAppBrowserPrompt.mockImplementation(async () => {
                 const addListenerCall = mockLocalDevState.addListener.mock.calls.find(call => call[0] === 'devServerMessage');
                 if (addListenerCall) {
@@ -387,8 +397,8 @@ describe('AppDevModeInterface', () => {
             mockLocalDevState.getAppDataByUid = vi.fn().mockReturnValue(mockAppData);
             mockLocalDevState.setAppDataForUid = vi.fn();
             mockLocalDevState.addListener = vi.fn();
-            // Target account config is missing
-            getAccountConfig.mockReturnValue(null);
+            // Target account config is missing - make it not a test account so isAutomaticallyInstallable returns false
+            isDeveloperTestAccount.mockReturnValue(false);
             // App is not installed
             fetchAppInstallationData.mockResolvedValue({
                 data: {
@@ -401,6 +411,7 @@ describe('AppDevModeInterface', () => {
                 localDevState: mockLocalDevState,
                 localDevLogger: mockLocalDevLogger,
             });
+            // Remove the spy to see if that's causing the timeout
             await newAppDevModeInterface.setup();
             expect(installAppBrowserPrompt).toHaveBeenCalled();
         });

package/lib/projects/__tests__/DevServerManager.test.js

@@ -28,6 +28,7 @@ vi.mock('@hubspot/local-dev-lib/config', () => ({
     getAccountId: vi.fn().mockReturnValue(123),
     hasLocalStateFlag: vi.fn().mockReturnValue(false),
     getConfigDefaultAccount: vi.fn().mockReturnValue({ accountId: 123 }),
+    globalConfigFileExists: vi.fn().mockReturnValue(true),
 }));
 vi.mock('@hubspot/local-dev-lib/urls', () => ({
     getHubSpotApiOrigin: vi.fn().mockReturnValue('https://api.hubspot.com'),

package/lib/projects/__tests__/LocalDevProcess.test.js

@@ -26,6 +26,7 @@ vi.mock('../deploy');
 vi.mock('../config');
 vi.mock('@hubspot/local-dev-lib/api/projects');
 vi.mock('@hubspot/local-dev-lib/errors/index');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../localDev/LocalDevLogger');
 vi.mock('../localDev/DevServerManager');
 // Tests for LocalDevProcess and LocalDevState