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

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -3,8 +3,8 @@ import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import path from 'path';
 import { pkg } from '../jsonLoader.js';
 import { uiLogger } from '../ui/logger.js';
-import { getAccountId, getDefaultAccountOverrideFilePath, isConfigFlagEnabled, } from '@hubspot/local-dev-lib/config';
-import { getAccountConfig, getConfigPath } from '@hubspot/local-dev-lib/config';
+import { isConfigFlagEnabled, getConfigFilePath, getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideFilePath } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { walk } from '@hubspot/local-dev-lib/fs';
 import util from 'util';
@@ -33,15 +33,18 @@ export class DiagnosticInfoBuilder {
     files;
     processInfo;
     constructor(processInfo) {
-        this.accountId = getAccountId();
-        const accountConfig = getAccountConfig(this.accountId);
+        const accountConfig = getConfigDefaultAccountIfExists();
+        this.accountId = accountConfig?.accountId;
         this.configSettings = {
             httpUseLocalhost: isConfigFlagEnabled('httpUseLocalhost'),
         };
         this.env = accountConfig?.env;
         this.authType = accountConfig?.authType;
         this.accountType = accountConfig?.accountType;
-        this.personalAccessKey = accountConfig?.personalAccessKey;
+        this.personalAccessKey =
+            accountConfig && 'personalAccessKey' in accountConfig
+                ? accountConfig.personalAccessKey
+                : undefined;
         this.processInfo = processInfo;
     }
     async generateDiagnosticInfo() {
@@ -58,7 +61,7 @@ export class DiagnosticInfoBuilder {
             platform,
             arch,
             path: mainModule?.path,
-            config: getConfigPath(),
+            config: getConfigFilePath(),
             defaultAccountOverrideFile: getDefaultAccountOverrideFilePath(),
             configSettings: this.configSettings,
             versions: {

package/lib/doctor/Doctor.js

@@ -1,5 +1,6 @@
 import { uiLogger } from '../ui/logger.js';
-import { getAccountId, getCWDAccountOverride, } from '@hubspot/local-dev-lib/config';
+import { getConfigDefaultAccountIfExists } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideAccountId } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { hasMissingPackages } from '../dependencyManagement.js';
 import { getLatestCliVersion } from '../npm.js';
@@ -25,7 +26,7 @@ export class Doctor {
     diagnosticInfoBuilder;
     constructor(diagnosticInfoBuilder = new DiagnosticInfoBuilder(process)) {
         SpinniesManager.init();
-        this.accountId = getAccountId();
+        this.accountId = getConfigDefaultAccountIfExists()?.accountId ?? null;
         this.diagnosticInfoBuilder = diagnosticInfoBuilder;
     }
     async diagnose() {
@@ -88,7 +89,7 @@ export class Doctor {
             });
             this.diagnosis?.addDefaultAccountOverrideFileSection({
                 type: 'warning',
-                message: lib.doctor.defaultAccountOverrideFileChecks.overrideAccountId(getCWDAccountOverride()),
+                message: lib.doctor.defaultAccountOverrideFileChecks.overrideAccountId(getDefaultAccountOverrideAccountId()),
             });
         }
     }

package/lib/doctor/__tests__/Diagnosis.test.js

@@ -1,8 +1,8 @@
 vi.mock('@hubspot/local-dev-lib/config');
 import { Diagnosis } from '../Diagnosis.js';
-import { getAccountConfig as __getAccountConfig } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists as __getConfigAccountIfExists } from '@hubspot/local-dev-lib/config';
 import stripAnsi from 'strip-ansi';
-const getAccountConfig = __getAccountConfig;
+const getConfigAccountIfExists = __getConfigAccountIfExists;
 describe('lib/doctor/Diagnosis', () => {
     const diagnosticInfo = {
         account: {},
@@ -31,7 +31,8 @@ describe('lib/doctor/Diagnosis', () => {
     };
     const accountId = 123456;
     beforeEach(() => {
-        getAccountConfig.mockReturnValue({
+        getConfigAccountIfExists.mockReturnValue({
+            accountId,
             accountType: 'STANDARD',
             name: 'Standard Account',
         });

package/lib/doctor/__tests__/DiagnosticInfoBuilder.test.js

@@ -2,6 +2,7 @@ import util from 'util';
 import { vi } from 'vitest';
 vi.mock('@hubspot/local-dev-lib/fs');
 vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('@hubspot/local-dev-lib/config/defaultAccountOverride');
 vi.mock('@hubspot/local-dev-lib/personalAccessKey');
 vi.mock('../../projects/config');
 vi.mock('@hubspot/local-dev-lib/api/projects');
@@ -16,17 +17,19 @@ vi.mock('../../jsonLoader.js', () => {
     };
 });
 import { DiagnosticInfoBuilder, } from '../DiagnosticInfoBuilder.js';
-import { getAccountId as _getAccountId, getAccountConfig as _getAccountConfig, getConfigPath as _getConfigPath, getDefaultAccountOverrideFilePath as _getDefaultAccountOverrideFilePath, isConfigFlagEnabled as _isConfigFlagEnabled, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountIfExists as _getConfigAccountIfExists, getConfigAccountById as _getConfigAccountById, getConfigFilePath as _getConfigFilePath, isConfigFlagEnabled as _isConfigFlagEnabled, getConfigDefaultAccountIfExists as _getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
+import { getDefaultAccountOverrideFilePath as _getDefaultAccountOverrideFilePath } from '@hubspot/local-dev-lib/config/defaultAccountOverride';
 import { getAccessToken as _getAccessToken } from '@hubspot/local-dev-lib/personalAccessKey';
 import { walk as _walk } from '@hubspot/local-dev-lib/fs';
 import { getProjectConfig as _getProjectConfig } from '../../projects/config.js';
 import { fetchProject as _fetchProject } from '@hubspot/local-dev-lib/api/projects';
 const walk = _walk;
 const getAccessToken = _getAccessToken;
-const getAccountConfig = _getAccountConfig;
-const getConfigPath = _getConfigPath;
+const getConfigAccountById = _getConfigAccountById;
+const getConfigAccountIfExists = _getConfigAccountIfExists;
+const getConfigDefaultAccountIfExists = _getConfigDefaultAccountIfExists;
+const getConfigFilePath = _getConfigFilePath;
 const getDefaultAccountOverrideFilePath = _getDefaultAccountOverrideFilePath;
-const getAccountId = _getAccountId;
 const getProjectConfig = _getProjectConfig;
 const isConfigFlagEnabled = _isConfigFlagEnabled;
 const fetchProject = _fetchProject;
@@ -36,6 +39,8 @@ util.promisify = utilPromisify;
 describe('lib/doctor/DiagnosticInfo', () => {
     const accountId = 898989;
     const accountConfig = {
+        name: 'test-account',
+        accountId: accountId,
         env: 'prod',
         authType: 'personalaccesskey',
         accountType: 'STANDARD',
@@ -73,16 +78,19 @@ describe('lib/doctor/DiagnosticInfo', () => {
     const configPath = '/path/to/config';
     const defaultAccountOverrideFile = 'path/to/default/account/override/.hsaccount';
     beforeEach(() => {
-        getAccountId.mockReturnValue(accountId);
-        getAccountConfig.mockReturnValue(accountConfig);
+        getConfigAccountIfExists.mockReturnValue({
+            accountId,
+            name: 'test',
+        });
+        getConfigAccountById.mockReturnValue(accountConfig);
+        getConfigDefaultAccountIfExists.mockReturnValue(accountConfig);
         walk.mockResolvedValue(projectFiles);
         isConfigFlagEnabled.mockReturnValue(false);
         mockPromisifyImpl.mockResolvedValue(npmVersion);
     });
     it('should initialize the required state on creation', () => {
         const builder = new DiagnosticInfoBuilder(processInfo);
-        expect(getAccountId).toHaveBeenCalledTimes(1);
-        expect(getAccountConfig).toHaveBeenCalledTimes(1);
+        expect(getConfigDefaultAccountIfExists).toHaveBeenCalledTimes(1);
         expect(builder.accountId).toEqual(accountId);
         expect(builder.env).toEqual(accountConfig.env);
         expect(builder.authType).toEqual(accountConfig.authType);
@@ -131,7 +139,7 @@ describe('lib/doctor/DiagnosticInfo', () => {
                 data: projectDetails,
             });
             getAccessToken.mockResolvedValue(accessToken);
-            getConfigPath.mockReturnValue(configPath);
+            getConfigFilePath.mockReturnValue(configPath);
             getDefaultAccountOverrideFilePath.mockReturnValue(defaultAccountOverrideFile);
         });
         it('should gather the required data and generate the diagnostic', async () => {

package/lib/doctor/__tests__/Doctor.test.js

@@ -6,6 +6,7 @@ import { HubSpotHttpError } from '@hubspot/local-dev-lib/models/HubSpotHttpError
 import { AxiosError } from 'axios';
 import { isSpecifiedError as _isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
 import { promisify as _promisify } from 'util';
+import { getConfigDefaultAccount as _getConfigDefaultAccount, getConfigDefaultAccountIfExists as _getConfigDefaultAccountIfExists, } from '@hubspot/local-dev-lib/config';
 vi.mock('../../ui/logger.js');
 vi.mock('../Diagnosis');
 vi.mock('../../ui/SpinniesManager');
@@ -15,6 +16,7 @@ vi.mock('../../npm');
 vi.mock('@hubspot/local-dev-lib/portManager');
 vi.mock('@hubspot/local-dev-lib/personalAccessKey');
 vi.mock('@hubspot/local-dev-lib/errors/index');
+vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('util');
 const hasMissingPackages = vi.mocked(_hasMissingPackages);
 const isPortManagerPortAvailable = vi.mocked(_isPortManagerPortAvailable);
@@ -23,6 +25,8 @@ const accessTokenForPersonalAccessKey = vi.mocked(_accessTokenForPersonalAccessK
 const authorizedScopesForPortalAndUser = vi.mocked(_authorizedScopesForPortalAndUser);
 const scopesOnAccessToken = vi.mocked(_scopesOnAccessToken);
 const isSpecifiedError = vi.mocked(_isSpecifiedError);
+const getConfigDefaultAccount = vi.mocked(_getConfigDefaultAccount);
+const getConfigDefaultAccountIfExists = vi.mocked(_getConfigDefaultAccountIfExists);
 describe('lib/doctor/Doctor', () => {
     let doctor;
     // @ts-ignore
@@ -57,6 +61,16 @@ describe('lib/doctor/Doctor', () => {
         },
     };
     beforeEach(() => {
+        // Mock config functions
+        const mockAccount = {
+            accountId: 123456,
+            accountType: 'STANDARD',
+            name: 'Test Account',
+            authType: 'personalaccesskey',
+            personalAccessKey: 'test-key',
+        };
+        getConfigDefaultAccount.mockReturnValue(mockAccount);
+        getConfigDefaultAccountIfExists.mockReturnValue(mockAccount);
         doctor = new Doctor({
             generateDiagnosticInfo: vi.fn().mockResolvedValue({
                 ...diagnosticInfo,

package/lib/importData.js

@@ -1,4 +1,4 @@
-import { getAccountConfig, getAccountId, getEnv, } from '@hubspot/local-dev-lib/config';
+import { getConfigAccountById, getConfigAccountEnvironment, getConfigAccountIfExists, } from '@hubspot/local-dev-lib/config';
 import { createImport } from '@hubspot/local-dev-lib/api/crm';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
 import { importDataTestAccountSelectPrompt } from './prompts/importDataTestAccountSelectPrompt.js';
@@ -7,7 +7,7 @@ import { isAppDeveloperAccount, isDeveloperTestAccount, isStandardAccount, } fro
 import { uiLogger } from './ui/logger.js';
 export async function handleImportData(targetAccountId, dataFileNames, importRequest) {
     try {
-        const baseUrl = getHubSpotWebsiteOrigin(getEnv());
+        const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(targetAccountId));
         const response = await createImport(targetAccountId, importRequest, dataFileNames);
         const importId = response.data.id;
         uiLogger.info(lib.importData.viewImportLink(baseUrl, targetAccountId, importId));
@@ -18,19 +18,20 @@ export async function handleImportData(targetAccountId, dataFileNames, importReq
     }
 }
 export async function handleTargetTestAccountSelectionFlow(derivedAccountId, userProvidedAccount) {
-    let targetAccountId = null;
+    let targetAccountId;
+    let testAccount;
     if (userProvidedAccount) {
-        targetAccountId = getAccountId(userProvidedAccount);
+        testAccount = getConfigAccountIfExists(userProvidedAccount);
+        targetAccountId = testAccount?.accountId;
     }
     // Only allow users to pass in test accounts
     if (targetAccountId) {
-        const testAccount = getAccountConfig(targetAccountId);
-        if (!testAccount || !isDeveloperTestAccount(testAccount)) {
+        if (testAccount && !isDeveloperTestAccount(testAccount)) {
             throw new Error(lib.importData.errors.notDeveloperTestAccount);
         }
     }
     else {
-        const targetProjectAccountConfig = getAccountConfig(derivedAccountId);
+        const targetProjectAccountConfig = getConfigAccountById(derivedAccountId);
         if (!targetProjectAccountConfig) {
             throw new Error(lib.importData.errors.noAccountConfig(derivedAccountId));
         }

package/lib/links.js

@@ -1,7 +1,7 @@
 import open from 'open';
-import { getEnv } from '@hubspot/local-dev-lib/config';
-import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
+import { getConfigAccountEnvironment } from '@hubspot/local-dev-lib/config';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
+import { ENVIRONMENTS } from '@hubspot/local-dev-lib/constants/environments';
 import { uiLogger } from './ui/logger.js';
 import { getTableContents, getTableHeader } from './ui/table.js';
 const COMMON_SITE_LINKS = {
@@ -75,7 +75,7 @@ const COMMON_SITE_LINKS = {
     },
 };
 export function getSiteLinksAsArray(accountId) {
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
     return Object.values(COMMON_SITE_LINKS)
         .sort((a, b) => (a.shortcut < b.shortcut ? -1 : 1))
         .map(l => ({ ...l, url: l.getUrl(accountId, baseUrl) }));
@@ -95,12 +95,12 @@ export function openLink(accountId, shortcut) {
         uiLogger.error(`We couldn't find a shortcut matching ${shortcut}.  Type 'hs open list' to see a list of available shortcuts`);
         return;
     }
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(getConfigAccountEnvironment(accountId));
     open(match.getUrl(accountId, baseUrl), { url: true });
     uiLogger.success(`We opened ${match.getUrl(accountId, baseUrl)} in your browser`);
 }
 export function getProductUpdatesUrl(rolloutId, accountId) {
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
+    const baseUrl = getHubSpotWebsiteOrigin(accountId ? getConfigAccountEnvironment(accountId) : ENVIRONMENTS.PROD);
     if (accountId) {
         return `${baseUrl}/product-updates/${accountId}/in-beta?rollout=${rolloutId}`;
     }

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

@@ -1,7 +1,7 @@
 import * as cliConfig from '@hubspot/local-dev-lib/config';
 import { isTargetedCommand, shouldLoadConfigForCommand, shouldRunAccountValidationForCommand, shouldRunConfigValidationForCommand, } from '../commandTargetingUtils.js';
 vi.mock('@hubspot/local-dev-lib/config');
-const configFileExistsSpy = vi.spyOn(cliConfig, 'configFileExists');
+const globalConfigFileExistsSpy = vi.spyOn(cliConfig, 'globalConfigFileExists');
 const targetCommandMap = {
     init: true,
     account: {
@@ -56,12 +56,12 @@ describe('lib/middleware/commandTargetingUtils', () => {
             expect(result).toBe(false);
         });
         it('should return false when the user is trying to migrate the global config', () => {
-            configFileExistsSpy.mockReturnValue(false);
+            globalConfigFileExistsSpy.mockReturnValue(false);
             const result = shouldLoadConfigForCommand(['config', 'migrate']);
             expect(result).toBe(false);
         });
         it('should return true when the global config file does exist', () => {
-            configFileExistsSpy.mockReturnValue(true);
+            globalConfigFileExistsSpy.mockReturnValue(true);
             const result = shouldLoadConfigForCommand(['account', 'use']);
             expect(result).toBe(true);
         });

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,5 +1,5 @@
 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';
@@ -16,7 +16,7 @@ const notifier = updateNotifier({
     shouldNotifyInNpmScript: true,
 });
 const CMS_CLI_PACKAGE_NAME = '@hubspot/cms-cli';
-function updateNotification() {
+async function updateNotification() {
     notifier.notify({
         message: pkg.name === CMS_CLI_PACKAGE_NAME
             ? lib.middleware.updateNotification.cmsUpdateNotification(CMS_CLI_PACKAGE_NAME)
@@ -32,6 +32,7 @@ function updateNotification() {
                 ? undefined
                 : lib.middleware.updateNotification.notifyTitle,
         },
+        isGlobal: await isGloballyInstalled('hs'),
     });
 }
 const SKIP_AUTO_UPDATE_COMMANDS = {
@@ -45,11 +46,18 @@ const preventAutoUpdateForCommand = (commandParts) => {
 export async function autoUpdateCLI(argv) {
     // This lets us back to default update-notifier behavior
     let showManualInstallHelp = true;
+    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('-')) {
@@ -88,6 +96,6 @@ export async function autoUpdateCLI(argv) {
         }
     }
     if (showManualInstallHelp) {
-        updateNotification();
+        await updateNotification();
     }
 }

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);
         }
     }